Added router to CHANGELOG

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index e960f575e544831349ec7b6f25cfeb9c18d46438..4942e4c8f562e6bcd3b2ae21e3a7e918be47e227 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -12,7 +12,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Module\Register;
 
-function friendica_init(App $a, Config\ConfigCache $config)
+function friendica_init(App $a)
 {
        if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
                $register_policies = [
@@ -28,27 +28,28 @@ function friendica_init(App $a, Config\ConfigCache $config)
                        $register_policy = $register_policies[$register_policy_int];
                }
 
-               $sql_extra = '';
-               if ($config->get('config', 'admin_nickname') !== null) {
-                       $sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
+               $condition = [];
+               $admin = false;
+               if (!empty(Config::get('config', 'admin_nickname'))) {
+                       $condition['nickname'] = Config::get('config', 'admin_nickname');
                }
                if (!empty(Config::get('config', 'admin_email'))) {
                        $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
-
-                       $r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", DBA::escape($adminlist[0]));
-                       $admin = [
-                               'name' => $r[0]['username'],
-                               'profile'=> System::baseUrl() . '/profile/' . $r[0]['nickname'],
-                       ];
-               } else {
-                       $admin = false;
+                       $condition['email'] = $adminlist[0];
+                       $administrator = DBA::selectFirst('user', ['username', 'nickname'], $condition);
+                       if (DBA::isResult($administrator)) {
+                               $admin = [
+                                       'name' => $administrator['username'],
+                                       'profile'=> System::baseUrl() . '/profile/' . $administrator['nickname'],
+                               ];
+                       }
                }
 
                $visible_addons = Addon::getVisibleList();
 
                Config::load('feature_lock');
                $locked_features = [];
-               $featureLock = $config->get('config', 'feature_lock');
+               $featureLock = Config::get('config', 'feature_lock');
                if (isset($featureLock)) {
                        foreach ($featureLock as $k => $v) {
                                if ($k === 'config_loaded') {