From 762a78661109d28dbc29a15b379b342938b35f40 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 Jul 2018 17:46:30 -0400 Subject: [PATCH] Replace direct accesses to App->config by Config::get/set calls --- boot.php | 24 +--- include/dba.php | 23 ++- include/enotify.php | 8 +- mod/admin.php | 23 ++- mod/bookmarklet.php | 3 +- mod/friendica.php | 17 +-- mod/home.php | 6 +- mod/install.php | 3 +- mod/invite.php | 4 +- mod/lostpass.php | 4 +- mod/nodeinfo.php | 4 +- mod/openid.php | 2 +- mod/ping.php | 2 +- mod/profile_photo.php | 155 +++++++++++---------- mod/register.php | 22 +-- mod/regmod.php | 5 +- mod/removeme.php | 6 +- mod/settings.php | 5 +- mod/statistics_json.php | 4 +- mod/uimport.php | 4 +- src/Content/Nav.php | 2 +- src/Content/Text/BBCode.php | 4 +- src/Core/Console/AutomaticInstallation.php | 24 ++-- src/Database/DBStructure.php | 2 +- src/Model/Profile.php | 2 +- src/Model/User.php | 4 +- src/Module/Login.php | 4 +- src/Protocol/OStatus.php | 2 +- view/theme/frio/theme.php | 2 +- 29 files changed, 180 insertions(+), 190 deletions(-) diff --git a/boot.php b/boot.php index 728f36b16e..8f25c2b931 100644 --- a/boot.php +++ b/boot.php @@ -774,7 +774,7 @@ function run_update_function($x) /** * @brief Synchronise addons: * - * $a->config['system']['addon'] contains a comma-separated list of names + * system.addon contains a comma-separated list of names * of addons which are used on this system. * Go through the database list of already installed addons, and if we have * an entry, but it isn't in the config list, call the uninstall procedure @@ -957,17 +957,6 @@ function info($s) } } -/** - * @brief Wrapper around config to limit the text length of an incoming message - * - * @return int - */ -function get_max_import_size() -{ - $a = get_app(); - return (x($a->config, 'max_import_size') ? $a->config['max_import_size'] : 0); -} - function feed_birthday($uid, $tz) { /** @@ -1023,14 +1012,11 @@ function is_site_admin() { $a = get_app(); - $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); + $admin_email = Config::get('config', 'admin_email'); - //if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email'])) - /// @TODO This if() + 2 returns can be shrinked into one return - if (local_user() && x($a->user, 'email') && x($a->config, 'admin_email') && in_array($a->user['email'], $adminlist)) { - return true; - } - return false; + $adminlist = explode(',', str_replace(' ', '', $admin_email)); + + return local_user() && $admin_email && in_array(defaults($a->user, 'email', ''), $adminlist); } /** diff --git a/include/dba.php b/include/dba.php index 8214501e9b..0d8eeef3d5 100644 --- a/include/dba.php +++ b/include/dba.php @@ -184,7 +184,7 @@ class dba { private static function logIndex($query) { $a = get_app(); - if (empty($a->config["system"]["db_log_index"])) { + if (empty(Config::get('system', 'db_log_index'))) { return; } @@ -203,18 +203,18 @@ class dba { return; } - $watchlist = explode(',', $a->config["system"]["db_log_index_watch"]); - $blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]); + $watchlist = explode(',', Config::get('system', 'db_log_index_watch')); + $blacklist = explode(',', Config::get('system', 'db_log_index_blacklist')); while ($row = dba::fetch($r)) { - if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) { + if ((intval(Config::get('system', 'db_loglimit_index')) > 0)) { $log = (in_array($row['key'], $watchlist) && - ($row['rows'] >= intval($a->config["system"]["db_loglimit_index"]))); + ($row['rows'] >= intval(Config::get('system', 'db_loglimit_index')))); } else { $log = false; } - if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) && ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) { + if ((intval(Config::get('system', 'db_loglimit_index_high')) > 0) && ($row['rows'] >= intval(Config::get('system', 'db_loglimit_index_high')))) { $log = true; } @@ -224,7 +224,7 @@ class dba { if ($log) { $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log_index"], DateTimeFormat::utcNow()."\t". + @file_put_contents(Config::get('system', 'db_log_index'), DateTimeFormat::utcNow()."\t". $row['key']."\t".$row['rows']."\t".$row['Extra']."\t". basename($backtrace[1]["file"])."\t". $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". @@ -384,7 +384,7 @@ class dba { $orig_sql = $sql; - if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) { + if (Config::get('system', 'db_callstack')) { $sql = "/*".System::callstack()." */ ".$sql; } @@ -545,16 +545,15 @@ class dba { $a->save_timestamp($stamp1, 'database'); - if (x($a->config,'system') && x($a->config['system'], 'db_log')) { - + if (Config::get('system', 'db_log')) { $stamp2 = microtime(true); $duration = (float)($stamp2 - $stamp1); - if (($duration > $a->config["system"]["db_loglimit"])) { + if (($duration > Config::get('system', 'db_loglimit'))) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t". + @file_put_contents(Config::get('system', 'db_log'), DateTimeFormat::utcNow()."\t".$duration."\t". basename($backtrace[1]["file"])."\t". $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". substr(self::replaceParameters($sql, $args), 0, 2000)."\n", FILE_APPEND); diff --git a/include/enotify.php b/include/enotify.php index a19693816f..2d4cbdadb5 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -33,11 +33,11 @@ function notification($params) $product = FRIENDICA_PLATFORM; $siteurl = System::baseUrl(true); $thanks = L10n::t('Thank You,'); - $sitename = $a->config['sitename']; - if (empty($a->config['admin_name'])) { - $site_admin = L10n::t('%s Administrator', $sitename); + $sitename = Config::get('config', 'sitename'); + if (Config::get('config', 'admin_name')) { + $site_admin = L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename); } else { - $site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename); + $site_admin = L10n::t('%s Administrator', $sitename); } $sender_name = $sitename; diff --git a/mod/admin.php b/mod/admin.php index 1209ad92bc..c90eb3c5eb 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1384,8 +1384,8 @@ function admin_page_site(App $a) "develop" => L10n::t("check the development version") ]; - if ($a->config['hostname'] == "") { - $a->config['hostname'] = $a->get_hostname(); + if (empty(Config::get('config', 'hostname'))) { + Config::set('config', 'hostname', $a->get_hostname()); } $diaspora_able = ($a->get_path() == ""); @@ -1412,9 +1412,9 @@ function admin_page_site(App $a) '$relocate' => L10n::t('Relocate - WARNING: advanced function. Could make this server unreachable.'), '$baseurl' => System::baseUrl(true), // name, label, value, help string, extra data... - '$sitename' => ['sitename', L10n::t("Site name"), $a->config['sitename'],''], - '$hostname' => ['hostname', L10n::t("Host name"), $a->config['hostname'], ""], - '$sender_email' => ['sender_email', L10n::t("Sender Email"), $a->config['sender_email'], L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"], + '$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''], + '$hostname' => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""], + '$sender_email' => ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"], '$banner' => ['banner', L10n::t("Banner/Logo"), $banner, ""], '$shortcut_icon' => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system','shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")], '$touch_icon' => ['touch_icon', L10n::t("Touch icon"), Config::get('system','touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")], @@ -1430,9 +1430,9 @@ function admin_page_site(App $a) '$maximagelength' => ['maximagelength', L10n::t("Maximum image length"), Config::get('system','max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")], '$jpegimagequality' => ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system','jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")], - '$register_policy' => ['register_policy', L10n::t("Register policy"), $a->config['register_policy'], "", $register_choices], + '$register_policy' => ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices], '$daily_registrations' => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")], - '$register_text' => ['register_text', L10n::t("Register text"), $a->config['register_text'], L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")], + '$register_text' => ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")], '$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')], '$abandon_days' => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], '$allowed_sites' => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")], @@ -1670,13 +1670,13 @@ function admin_page_users_post(App $a) Thank you and welcome to %4$s.')); - $preamble = sprintf($preamble, $user['username'], $a->config['sitename']); - $body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], $a->config['sitename']); + $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename')); + $body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], Config::get('config', 'sitename')); notification([ 'type' => SYSTEM_EMAIL, 'to_email' => $user['email'], - 'subject' => L10n::t('Registration details for %s', $a->config['sitename']), + 'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')), 'preamble' => $preamble, 'body' => $body]); } @@ -1801,7 +1801,7 @@ function admin_page_users(App $a) ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", intval($a->pager['start']), intval($a->pager['itemspage']) ); - $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); + $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))); $_setup_users = function ($e) use ($adminlist) { $page_types = [ PAGE_NORMAL => L10n::t('Normal Account Page'), @@ -1828,7 +1828,6 @@ function admin_page_users(App $a) $e['register_date'] = Temporal::getRelativeDate($e['register_date']); $e['login_date'] = Temporal::getRelativeDate($e['login_date']); $e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']); - //$e['is_admin'] = ($e['email'] === $a->config['admin_email']); $e['is_admin'] = in_array($e['email'], $adminlist); $e['is_deletable'] = (intval($e['uid']) != local_user()); $e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False); diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php index 9ae3e28f08..88097eb910 100644 --- a/mod/bookmarklet.php +++ b/mod/bookmarklet.php @@ -5,6 +5,7 @@ use Friendica\App; use Friendica\Core\ACL; +use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Module\Login; @@ -21,7 +22,7 @@ function bookmarklet_content(App $a) { if (!local_user()) { $o = '

' . L10n::t('Login') . '

'; - $o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true); + $o .= Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? false : true); return $o; } diff --git a/mod/friendica.php b/mod/friendica.php index 9d4bdd801c..b3cea56dc6 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -2,11 +2,12 @@ /** * @file mod/friendica.php */ + use Friendica\App; use Friendica\Core\Addon; -use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\System; use Friendica\Database\DBM; function friendica_init(App $a) @@ -16,10 +17,10 @@ function friendica_init(App $a) $sql_extra = ''; if (x($a->config, 'admin_nickname')) { - $sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc($a->config['admin_nickname'])); + $sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc(Config::get('config', 'admin_nickname'))); } - if (isset($a->config['admin_email']) && $a->config['admin_email']!='') { - $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); + 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", dbesc($adminlist[0])); $admin = [ @@ -55,13 +56,13 @@ function friendica_init(App $a) $data = [ 'version' => FRIENDICA_VERSION, 'url' => System::baseUrl(), - 'addons' => $visible_addons, + 'addons' => $visible_addons, 'locked_features' => $locked_features, - 'register_policy' => $register_policy[$a->config['register_policy']], + 'register_policy' => $register_policy[Config::get('config', 'register_policy')], 'admin' => $admin, - 'site_name' => $a->config['sitename'], + 'site_name' => Config::get('config', 'sitename'), 'platform' => FRIENDICA_PLATFORM, - 'info' => ((x($a->config, 'info')) ? $a->config['info'] : ''), + 'info' => Config::get('config', 'info'), 'no_scrape_url' => System::baseUrl().'/noscrape' ]; diff --git a/mod/home.php b/mod/home.php index 206a1827ea..c386763ca3 100644 --- a/mod/home.php +++ b/mod/home.php @@ -36,7 +36,7 @@ function home_content(App $a) { } $customhome = false; - $defaultheader = '

'.((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "").'

'; + $defaultheader = '

' . (Config::get('config', 'sitename') ? L10n::t('Welcome to %s', Config::get('config', 'sitename')) : '') . '

'; $homefilepath = $a->basepath . "/home.html"; $cssfilepath = $a->basepath . "/home.css"; @@ -45,9 +45,9 @@ function home_content(App $a) { if (file_exists($cssfilepath)) { $a->page['htmlhead'] .= ''; } - } + } - $login = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1); + $login = Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? 0 : 1); $content = ''; Addon::callHooks("home_content",$content); diff --git a/mod/install.php b/mod/install.php index 6962ff2dda..0f08b0fd8b 100644 --- a/mod/install.php +++ b/mod/install.php @@ -22,7 +22,8 @@ function install_init(App $a) { // We overwrite current theme css, because during install we could not have a working mod_rewrite // so we could not have a css at all. Here we set a static css file for the install procedure pages - $a->config['system']['theme'] = "../install"; + + $a->setConfigValue('system', 'value', '../install'); $a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css"; Install::setInstallMode(); diff --git a/mod/invite.php b/mod/invite.php index 813dbf7044..bea479a8f7 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -126,14 +126,14 @@ function invite_content(App $a) { $dirloc = Config::get('system', 'directory'); if (strlen($dirloc)) { - if ($a->config['register_policy'] == REGISTER_CLOSED) { + if (Config::get('config', 'register_policy') === REGISTER_CLOSED) { $linktxt = L10n::t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.', $dirloc . '/servers'); } else { $linktxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', System::baseUrl()) . "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.', $dirloc . '/servers'); } } else { // there is no global directory URL defined - if ($a->config['register_policy'] == REGISTER_CLOSED) { + if (Config::get('config', 'register_policy') === REGISTER_CLOSED) { $o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); return $o; } else { diff --git a/mod/lostpass.php b/mod/lostpass.php index af4518ca16..0d22252bdc 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -39,7 +39,7 @@ function lostpass_post(App $a) info(L10n::t('Password reset request issued. Check your email.') . EOL); } - $sitename = $a->config['sitename']; + $sitename = Config::get('config', 'sitename'); $resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token; $preamble = deindent(L10n::t(' @@ -145,7 +145,7 @@ function lostpass_generate_password($user) info("Your password has been reset." . EOL); - $sitename = $a->config['sitename']; + $sitename = Config::get('config', 'sitename'); $preamble = deindent(L10n::t(' Dear %1$s, Your password has been changed as requested. Please retain this diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php index 1b9dce5f55..74645bc66d 100644 --- a/mod/nodeinfo.php +++ b/mod/nodeinfo.php @@ -61,9 +61,9 @@ function nodeinfo_init(App $a) { $nodeinfo['usage'] = []; - $nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0); + $nodeinfo['openRegistrations'] = Config::get('config', 'register_policy') !== REGISTER_CLOSED; - $nodeinfo['metadata'] = ['nodeName' => $a->config['sitename']]; + $nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')]; if (Config::get('system', 'nodeinfo')) { diff --git a/mod/openid.php b/mod/openid.php index 2c284f76d8..7be8544cd9 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -62,7 +62,7 @@ function openid_content(App $a) { // Successful OpenID login - but we can't match it to an existing account. // New registration? - if ($a->config['register_policy'] == REGISTER_CLOSED) { + if (Config::get('config', 'register_policy') === REGISTER_CLOSED) { notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL); goaway(System::baseUrl()); } diff --git a/mod/ping.php b/mod/ping.php index 196758b0df..7153752b05 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -200,7 +200,7 @@ function ping_init(App $a) ); $mail_count = count($mails); - if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) { + if (Config::get('config', 'register_policy') === REGISTER_APPROVE && is_site_admin()) { $regs = q( "SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created` FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid` diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 1a80b539db..a1428adc87 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -13,54 +13,52 @@ use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Model\Profile; use Friendica\Object\Image; -use Friendica\Util\DateTimeFormat; function profile_photo_init(App $a) { - if (! local_user()) { + if (!local_user()) { return; } Profile::load($a, $a->user['nickname']); } -function profile_photo_post(App $a) { +function profile_photo_post(App $a) +{ - if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL ); + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); - if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) { + if ((x($_POST, 'cropfinal')) && ($_POST['cropfinal'] == 1)) { // unless proven otherwise $is_default_profile = 1; - if($_REQUEST['profile']) { - $r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1", - intval($_REQUEST['profile']), + if ($_REQUEST['profile']) { + $r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1", intval($_REQUEST['profile']), intval(local_user()) ); - if (DBM::is_result($r) && (! intval($r[0]['is-default']))) - $is_default_profile = 0; + if (DBM::is_result($r) && (!intval($r[0]['is-default']))) $is_default_profile = 0; } // phase 2 - we have finished cropping - if($a->argc != 2) { - notice(L10n::t('Image uploaded but image cropping failed.') . EOL ); + if ($a->argc != 2) { + notice(L10n::t('Image uploaded but image cropping failed.') . EOL); return; } $image_id = $a->argv[1]; - if(substr($image_id,-2,1) == '-') { - $scale = substr($image_id,-1,1); - $image_id = substr($image_id,0,-2); + if (substr($image_id, -2, 1) == '-') { + $scale = substr($image_id, -1, 1); + $image_id = substr($image_id, 0, -2); } @@ -69,10 +67,8 @@ function profile_photo_post(App $a) { $srcW = $_POST['xfinal'] - $srcX; $srcH = $_POST['yfinal'] - $srcY; - $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", - dbesc($image_id), - dbesc(local_user()), - intval($scale)); + $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", dbesc($image_id), + dbesc(local_user()), intval($scale)); if (DBM::is_result($r)) { @@ -80,9 +76,10 @@ function profile_photo_post(App $a) { $Image = new Image($base_image['data'], $base_image['type']); if ($Image->isValid()) { - $Image->crop(175,$srcX,$srcY,$srcW,$srcH); + $Image->crop(175, $srcX, $srcY, $srcW, $srcH); - $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 4, $is_default_profile); + $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], + L10n::t('Profile Photos'), 4, $is_default_profile); if ($r === false) { notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL); @@ -90,7 +87,8 @@ function profile_photo_post(App $a) { $Image->scaleDown(80); - $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 5, $is_default_profile); + $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], + L10n::t('Profile Photos'), 5, $is_default_profile); if ($r === false) { notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL); @@ -98,7 +96,8 @@ function profile_photo_post(App $a) { $Image->scaleDown(48); - $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 6, $is_default_profile); + $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], + L10n::t('Profile Photos'), 6, $is_default_profile); if ($r === false) { notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL); @@ -108,15 +107,13 @@ function profile_photo_post(App $a) { if ($is_default_profile) { $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d", - dbesc($base_image['resource-id']), - intval(local_user()) + dbesc($base_image['resource-id']), intval(local_user()) ); } else { $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d", dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()), dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()), - intval($_REQUEST['profile']), - intval(local_user()) + intval($_REQUEST['profile']), intval(local_user()) ); } @@ -125,7 +122,7 @@ function profile_photo_post(App $a) { info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); // Update global directory in background $url = System::baseUrl() . '/profile/' . $a->user['nickname']; - if ($url && strlen(Config::get('system','directory'))) { + if ($url && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, "Directory", $url); } @@ -139,7 +136,7 @@ function profile_photo_post(App $a) { return; // NOTREACHED } - $src = $_FILES['userfile']['tmp_name']; + $src = $_FILES['userfile']['tmp_name']; $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); $filetype = $_FILES['userfile']['type']; @@ -158,7 +155,7 @@ function profile_photo_post(App $a) { $imagedata = @file_get_contents($src); $ph = new Image($imagedata, $filetype); - if (! $ph->isValid()) { + if (!$ph->isValid()) { notice(L10n::t('Unable to process image.') . EOL); @unlink($src); return; @@ -166,25 +163,28 @@ function profile_photo_post(App $a) { $ph->orient($src); @unlink($src); - return profile_photo_crop_ui_head($a, $ph); + profile_photo_crop_ui_head($a, $ph); } +function profile_photo_content(App $a) +{ -function profile_photo_content(App $a) { - - if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL ); + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } $newuser = false; - if($a->argc == 2 && $a->argv[1] === 'new') + if ($a->argc == 2 && $a->argv[1] === 'new') { $newuser = true; + } - if( $a->argv[1]=='use'){ - if ($a->argc<3){ - notice(L10n::t('Permission denied.') . EOL ); + $imagecrop = []; + + if ($a->argv[1] == 'use') { + if ($a->argc < 3) { + notice(L10n::t('Permission denied.') . EOL); return; }; @@ -192,36 +192,32 @@ function profile_photo_content(App $a) { $resource_id = $a->argv[2]; //die(":".local_user()); - $r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", - intval(local_user()), + $r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()), dbesc($resource_id) - ); - if (!DBM::is_result($r)){ - notice(L10n::t('Permission denied.') . EOL ); + ); + if (!DBM::is_result($r)) { + notice(L10n::t('Permission denied.') . EOL); return; } $havescale = false; foreach ($r as $rr) { - if($rr['scale'] == 5) - $havescale = true; + if ($rr['scale'] == 5) $havescale = true; } // set an already uloaded photo as profile photo // if photo is in 'Profile Photos', change it in db - if (($r[0]['album']== L10n::t('Profile Photos')) && ($havescale)){ - $r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", - intval(local_user())); + if (($r[0]['album'] == L10n::t('Profile Photos')) && ($havescale)) { + $r = q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user())); - $r=q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", - intval(local_user()), + $r = q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()), dbesc($resource_id) - ); + ); Contact::updateSelfFromUserID(local_user(), true); // Update global directory in background $url = $_SESSION['my_url']; - if ($url && strlen(Config::get('system','directory'))) { + if ($url && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, "Directory", $url); } @@ -229,7 +225,7 @@ function profile_photo_content(App $a) { return; // NOTREACHED } $ph = new Image($r[0]['data'], $r[0]['type']); - profile_photo_crop_ui_head($a, $ph); + $imagecrop = profile_photo_crop_ui_head($a, $ph); // go ahead as we have jus uploaded a new photo to crop } @@ -238,11 +234,11 @@ function profile_photo_content(App $a) { ); - if(! x($a->config,'imagecrop')) { - + if (!empty($imagecrop)) { $tpl = get_markup_template('profile_photo.tpl'); - $o = replace_macros($tpl,[ + $o = replace_macros($tpl, + [ '$user' => $a->user['nickname'], '$lbl_upfile' => L10n::t('Upload File:'), '$lbl_profiles' => L10n::t('Select a profile:'), @@ -250,23 +246,24 @@ function profile_photo_content(App $a) { '$submit' => L10n::t('Upload'), '$profiles' => $profiles, '$form_security_token' => get_form_security_token("profile_photo"), - '$select' => sprintf('%s %s', L10n::t('or'), ($newuser) ? '' . L10n::t('skip this step') . '' : '' . L10n::t('select a photo from your photo albums') . '') + '$select' => sprintf('%s %s', L10n::t('or'), + ($newuser) ? '' . L10n::t('skip this step') . '' : '' . L10n::t('select a photo from your photo albums') . '') ]); return $o; - } - else { - $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext']; + } else { + $filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext']; $tpl = get_markup_template("cropbody.tpl"); - $o = replace_macros($tpl,[ - '$filename' => $filename, - '$profile' => intval($_REQUEST['profile']), - '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'], + $o = replace_macros($tpl, + [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => $imagecrop['hash'] . '-' . $imagecrop['resolution'], '$image_url' => System::baseUrl() . '/photo/' . $filename, - '$title' => L10n::t('Crop Image'), - '$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'), + '$title' => L10n::t('Crop Image'), + '$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'), '$form_security_token' => get_form_security_token("profile_photo"), - '$done' => L10n::t('Done Editing') + '$done' => L10n::t('Done Editing') ]); return $o; } @@ -274,10 +271,10 @@ function profile_photo_content(App $a) { return; // NOTREACHED } - -function profile_photo_crop_ui_head(App $a, Image $Image) { - $max_length = Config::get('system','max_image_length'); - if (! $max_length) { +function profile_photo_crop_ui_head(App $a, Image $Image) +{ + $max_length = Config::get('system', 'max_image_length'); + if (!$max_length) { $max_length = MAX_IMAGE_LENGTH; } if ($max_length > 0) { @@ -318,10 +315,14 @@ function profile_photo_crop_ui_head(App $a, Image $Image) { } } - $a->config['imagecrop'] = $hash; - $a->config['imagecrop_resolution'] = $smallest; - $a->config['imagecrop_ext'] = $Image->getExt(); $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []); $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []); - return; + + $imagecrop = [ + 'hash' => $hash, + 'resolution' => $smallest, + 'ext' => $Image->getExt(), + ]; + + return $imagecrop; } diff --git a/mod/register.php b/mod/register.php index 6b4f2b1f5c..75f2ec8532 100644 --- a/mod/register.php +++ b/mod/register.php @@ -37,7 +37,7 @@ function register_post(App $a) } } - switch ($a->config['register_policy']) { + switch (Config::get('config', 'register_policy')) { case REGISTER_OPEN: $blocked = 0; $verified = 1; @@ -50,7 +50,7 @@ function register_post(App $a) default: case REGISTER_CLOSED: - if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) { + if (empty($_SESSION['authenticated']) && empty($_SESSION['administrator'])) { notice(L10n::t('Permission denied.') . EOL); return; } @@ -76,7 +76,7 @@ function register_post(App $a) $user = $result['user']; - if ($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { + if ($netpublish && Config::get('config', 'register_policy') !== REGISTER_APPROVE) { $url = System::baseUrl() . '/profile/' . $user['nickname']; Worker::add(PRIORITY_LOW, "Directory", $url); } @@ -85,7 +85,7 @@ function register_post(App $a) $num_invites = Config::get('system', 'number_invites'); $invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : ''); - if ($a->config['register_policy'] == REGISTER_OPEN) { + if (Config::get('config', 'register_policy') === REGISTER_OPEN) { if ($using_invites && $invite_id) { q("delete * from register where hash = '%s' limit 1", dbesc($invite_id)); PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites); @@ -94,7 +94,7 @@ function register_post(App $a) // Only send a password mail when the password wasn't manually provided if (!x($_POST, 'password1') || !x($_POST, 'confirm')) { $res = User::sendRegisterOpenEmail( - $user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']); + $user['email'], Config::get('config', 'sitename'), System::baseUrl(), $user['username'], $result['password']); if ($res) { info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL); @@ -111,8 +111,8 @@ function register_post(App $a) info(L10n::t('Registration successful.') . EOL); goaway(System::baseUrl()); } - } elseif ($a->config['register_policy'] == REGISTER_APPROVE) { - if (!strlen($a->config['admin_email'])) { + } elseif (Config::get('config', 'register_policy') === REGISTER_APPROVE) { + if (!strlen(Config::get('config', 'admin_email'))) { notice(L10n::t('Your registration can not be processed.') . EOL); goaway(System::baseUrl()); } @@ -134,7 +134,7 @@ function register_post(App $a) } // send email to admins - $admin_mail_list = "'" . implode("','", array_map("dbesc", explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'"; + $admin_mail_list = "'" . implode("','", array_map("dbesc", explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))))) . "'"; $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)", $admin_mail_list ); @@ -158,7 +158,7 @@ function register_post(App $a) } // send notification to the user, that the registration is pending User::sendRegisterPendingEmail( - $user['email'], $a->config['sitename'], $user['username']); + $user['email'], Config::get('config', 'sitename'), $user['username']); info(L10n::t('Your registration is pending approval by the site owner.') . EOL); goaway(System::baseUrl()); @@ -179,7 +179,7 @@ function register_content(App $a) return; } - if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { + if ((!local_user()) && (Config::get('config', 'register_policy') === REGISTER_CLOSED)) { notice("Permission denied." . EOL); return; } @@ -258,7 +258,7 @@ function register_content(App $a) $o = replace_macros($tpl, [ '$oidhtml' => $oidhtml, '$invitations' => Config::get('system', 'invitation_only'), - '$permonly' => $a->config['register_policy'] == REGISTER_APPROVE, + '$permonly' => Config::get('config', 'register_policy') === REGISTER_APPROVE, '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')], '$invite_desc' => L10n::t('Membership on this site is by invitation only.'), '$invite_label' => L10n::t('Your invitation code: '), diff --git a/mod/regmod.php b/mod/regmod.php index aa64986d06..083465984f 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -2,6 +2,7 @@ /** * @file mod/regmod.php */ + use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; @@ -57,7 +58,7 @@ function user_allow($hash) $res = User::sendRegisterOpenEmail( $user[0]['email'], - $a->config['sitename'], + Config::get('config', 'sitename'), System::baseUrl(), $user[0]['username'], $register[0]['password']); @@ -100,7 +101,7 @@ function regmod_content(App $a) if (!local_user()) { info(L10n::t('Please login.') . EOL); - $o = '

' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1); + $o = '

' . Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? 0 : 1); return $o; } diff --git a/mod/removeme.php b/mod/removeme.php index 2db63d8d8e..dd0ca0f81f 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -2,11 +2,13 @@ /** * @file mod/removeme.php */ + use Friendica\App; +use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; -use Friendica\Model\User; use Friendica\Database\DBM; +use Friendica\Model\User; require_once 'include/enotify.php'; @@ -34,7 +36,7 @@ function removeme_post(App $a) // send notification to admins so that they can clean um the backups // send email to admins - $admin_mails = explode(",", str_replace(" ", "", $a->config['admin_email'])); + $admin_mails = explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))); foreach ($admin_mails as $mail) { $admin = dba::selectFirst('user', ['uid', 'language', 'email'], ['email' => $mail]); if (!DBM::is_result($admin)) { diff --git a/mod/settings.php b/mod/settings.php index d7e8b7b459..34e9ce41ec 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -511,9 +511,8 @@ function settings_post(App $a) $err .= L10n::t('Invalid email.'); } // ensure new email is not the admin mail - //if ((x($a->config, 'admin_email')) && (strcasecmp($email, $a->config['admin_email']) == 0)) { - if (x($a->config, 'admin_email')) { - $adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email']))); + if (Config::get('config', 'admin_email')) { + $adminlist = explode(",", str_replace(" ", "", strtolower(Config::get('config', 'admin_email')))); if (in_array(strtolower($email), $adminlist)) { $err .= L10n::t('Cannot change to that email.'); $email = $a->user['email']; diff --git a/mod/statistics_json.php b/mod/statistics_json.php index c035c1c05a..0dbe0ea492 100644 --- a/mod/statistics_json.php +++ b/mod/statistics_json.php @@ -17,10 +17,10 @@ function statistics_json_init(App $a) { } $statistics = [ - "name" => $a->config["sitename"], + "name" => Config::get('config', 'sitename'), "network" => FRIENDICA_PLATFORM, "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION, - "registrations_open" => ($a->config['register_policy'] != 0), + "registrations_open" => Config::get('config', 'register_policy') !== REGISTER_CLOSED, "total_users" => Config::get('nodeinfo', 'total_users'), "active_users_halfyear" => Config::get('nodeinfo', 'active_users_halfyear'), "active_users_monthly" => Config::get('nodeinfo', 'active_users_monthly'), diff --git a/mod/uimport.php b/mod/uimport.php index 7d6805e7c7..660544b471 100644 --- a/mod/uimport.php +++ b/mod/uimport.php @@ -11,7 +11,7 @@ use Friendica\Core\UserImport; function uimport_post(App $a) { - switch ($a->config['register_policy']) { + switch (Config::get('config', 'register_policy')) { case REGISTER_OPEN: $blocked = 0; $verified = 1; @@ -42,7 +42,7 @@ function uimport_post(App $a) function uimport_content(App $a) { - if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { + if ((!local_user()) && (Config::get('config', 'register_policy') === REGISTER_CLOSED)) { notice("Permission denied." . EOL); return; } diff --git a/src/Content/Nav.php b/src/Content/Nav.php index b0fe8a14e6..93090c06ec 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -124,7 +124,7 @@ class Nav $nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')]; } - if (($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) { + if ((Config::get('config', 'register_policy') === REGISTER_OPEN) && (! local_user()) && (! remote_user())) { $nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')]; } diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index de3877d3f1..8237714ab6 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1,5 +1,4 @@ extractErrors($checkResults['basic']); if ($errorMessage !== '') { - throw new \RuntimeException($errorMessage); + throw new RuntimeException($errorMessage); } $this->out(" Complete!\n\n"); @@ -75,7 +77,7 @@ HELP; $errorMessage = $this->extractErrors($checkResults['db']); if ($errorMessage !== '') { - throw new \RuntimeException($errorMessage); + throw new RuntimeException($errorMessage); } $this->out(" Complete!\n\n"); @@ -86,15 +88,15 @@ HELP; $checkResults['data'] = Install::installDatabaseStructure(); if ($checkResults['data'] !== '') { - throw new \RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n"); + throw new RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n"); } $this->out(" Complete!\n\n"); // Install theme $this->out("Installing theme\n"); - if (!empty($a->config['system']['theme'])) { - Theme::install($a->config['system']['theme']); + if (!empty(Config::get('system', 'theme'))) { + Theme::install(Config::get('system', 'theme')); $this->out(" Complete\n\n"); } else { $this->out(" Theme setting is empty. Please check the file htconfig.php\n\n"); @@ -103,7 +105,7 @@ HELP; // Copy config file $this->out("Saving config file...\n"); if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) { - throw new \RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '.htconfig.php' manually.\n"); + throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '.htconfig.php' manually.\n"); } $this->out(" Complete!\n\n"); $this->out("\nInstallation is finished\n"); @@ -125,10 +127,10 @@ HELP; Install::checkSmarty3($checks); Install::checkKeys($checks); - if (!empty($app->config['php_path'])) { - Install::checkPHP($app->config['php_path'], $checks); + if (!empty(Config::get('config', 'php_path'))) { + Install::checkPHP(Config::get('config', 'php_path'), $checks); } else { - throw new \RuntimeException(" ERROR: The php_path is not set in the config. Please check the file .htconfig.php.\n"); + throw new RuntimeException(" ERROR: The php_path is not set in the config.\n"); } $this->out(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n"); diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index 00ab09ccf2..ee46c2b4cb 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -53,7 +53,7 @@ class DBStructure $a = get_app(); //send the administrators an e-mail - $admin_mail_list = "'".implode("','", array_map('dbesc', explode(",", str_replace(" ", "", $a->config['admin_email']))))."'"; + $admin_mail_list = "'".implode("','", array_map('dbesc', explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))))."'"; $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)", $admin_mail_list ); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index c16fb745a7..92355b216e 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -138,7 +138,7 @@ class Profile $a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme'); $a->profile['network'] = NETWORK_DFRN; - $a->page['title'] = $a->profile['name'] . ' @ ' . $a->config['sitename']; + $a->page['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename'); if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) { $_SESSION['theme'] = $a->profile['theme']; diff --git a/src/Model/User.php b/src/Model/User.php index dc5702b605..57a3ecb50d 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -454,8 +454,8 @@ class User // Disallow somebody creating an account using openid that uses the admin email address, // since openid bypasses email verification. We'll allow it if there is not yet an admin account. - if (x($a->config, 'admin_email') && strlen($openid_url)) { - $adminlist = explode(',', str_replace(' ', '', strtolower($a->config['admin_email']))); + if (Config::get('config', 'admin_email') && strlen($openid_url)) { + $adminlist = explode(',', str_replace(' ', '', strtolower(Config::get('config', 'admin_email')))); if (in_array(strtolower($email), $adminlist)) { throw new Exception(L10n::t('Cannot use that email.')); } diff --git a/src/Module/Login.php b/src/Module/Login.php index 4df03f26dc..46cb3a85d2 100644 --- a/src/Module/Login.php +++ b/src/Module/Login.php @@ -43,7 +43,7 @@ class Login extends BaseModule goaway(self::getApp()->get_baseurl()); } - return self::form(self::getApp()->get_baseurl(), $a->config['register_policy'] != REGISTER_CLOSED); + return self::form(self::getApp()->get_baseurl(), Config::get('config', 'register_policy') !== REGISTER_CLOSED); } public static function post() @@ -266,7 +266,7 @@ class Login extends BaseModule * @param string $return_url The url relative to the base the user should be sent * back to after login completes * @param bool $register If $register == true provide a registration link. - * This will most always depend on the value of $a->config['register_policy']. + * This will most always depend on the value of config.register_policy. * @param array $hiddens optional * * @return string Returns the complete html for inserting into the page diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 36f3faf2de..f4b299761d 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1269,7 +1269,7 @@ class OStatus XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]); XML::addElement($doc, $root, "title", $title); - XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"])); + XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], Config::get('config', 'sitename'))); XML::addElement($doc, $root, "logo", $owner["photo"]); XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM)); diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 9d2b77d1f1..f2cbb7e6ac 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -268,7 +268,7 @@ function frio_remote_nav($a, &$nav) $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')]; $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')]; $nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; - $nav['sitename'] = $a->config['sitename']; + $nav['sitename'] = Config::get('config', 'sitename'); } }