]> git.mxchange.org Git - friendica.git/blobdiff - mod/settings.php
Merge pull request #6372 from MrPetovan/bug/6334-escape-get-app
[friendica.git] / mod / settings.php
index ff969d65eb24d8654f98df9197498ec02a4c3890..f60f9f5b5c8a44f48bd6ceaff0a23284db64ab1b 100644 (file)
@@ -4,28 +4,33 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
+use Friendica\Module\Login;
 use Friendica\Protocol\Email;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
 function get_theme_config_file($theme)
 {
-       $a = get_app();
+       $a = \get_app();
        $base_theme = defaults($a->theme_info, 'extends');
 
        if (file_exists("view/theme/$theme/config.php")) {
@@ -46,8 +51,8 @@ function settings_init(App $a)
 
        // These lines provide the javascript needed by the acl selector
 
-       $tpl = get_markup_template('settings/head.tpl');
-       $a->page['htmlhead'] .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$ispublic' => L10n::t('everybody')
        ]);
 
@@ -60,6 +65,13 @@ function settings_init(App $a)
                ],
        ];
 
+       $tabs[] =       [
+               'label' => L10n::t('Profiles'),
+               'url'   => 'profiles',
+               'selected'      => (($a->argc == 1) && ($a->argv[0] === 'profiles')?'active':''),
+               'accesskey' => 'p',
+       ];
+
        if (Feature::get()) {
                $tabs[] =       [
                                        'label' => L10n::t('Additional features'),
@@ -119,8 +131,8 @@ function settings_init(App $a)
        ];
 
 
-       $tabtpl = get_markup_template("generic_links_widget.tpl");
-       $a->page['aside'] = replace_macros($tabtpl, [
+       $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
+       $a->page['aside'] = Renderer::replaceMacros($tabtpl, [
                '$title' => L10n::t('Settings'),
                '$class' => 'settings-widget',
                '$items' => $tabs,
@@ -134,28 +146,28 @@ function settings_post(App $a)
                return;
        }
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                return;
        }
 
-       if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+       if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
        $old_page_flags = $a->user['page-flags'];
 
-       if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) {
-               check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+       if (($a->argc > 1) && ($a->argv[1] === 'oauth') && !empty($_POST['remove'])) {
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
                $key = $_POST['remove'];
-               dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
-               goaway(System::baseUrl(true)."/settings/oauth/");
+               DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
+               $a->internalRedirect('settings/oauth/', true);
                return;
        }
 
-       if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) {
-               check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+       if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && !empty($_POST['submit'])) {
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
                $name     = defaults($_POST, 'name'    , '');
                $key      = defaults($_POST, 'key'     , '');
@@ -175,58 +187,58 @@ function settings_post(App $a)
                                                        icon='%s',
                                                        uid=%d
                                                WHERE client_id='%s'",
-                                       dbesc($key),
-                                       dbesc($secret),
-                                       dbesc($name),
-                                       dbesc($redirect),
-                                       dbesc($icon),
+                                       DBA::escape($key),
+                                       DBA::escape($secret),
+                                       DBA::escape($name),
+                                       DBA::escape($redirect),
+                                       DBA::escape($icon),
                                        local_user(),
-                                       dbesc($key)
+                                       DBA::escape($key)
                                );
                        } else {
                                q("INSERT INTO clients
                                                        (client_id, pw, name, redirect_uri, icon, uid)
                                                VALUES ('%s', '%s', '%s', '%s', '%s',%d)",
-                                       dbesc($key),
-                                       dbesc($secret),
-                                       dbesc($name),
-                                       dbesc($redirect),
-                                       dbesc($icon),
+                                       DBA::escape($key),
+                                       DBA::escape($secret),
+                                       DBA::escape($name),
+                                       DBA::escape($redirect),
+                                       DBA::escape($icon),
                                        local_user()
                                );
                        }
                }
-               goaway(System::baseUrl(true)."/settings/oauth/");
+               $a->internalRedirect('settings/oauth/', true);
                return;
        }
 
        if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
-               check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/addon', 'settings_addon');
 
                Addon::callHooks('addon_settings_post', $_POST);
                return;
        }
 
        if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-               check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
 
-               if (x($_POST, 'general-submit')) {
+               if (!empty($_POST['general-submit'])) {
                        PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
                        PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
                        PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
                        PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
                        PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
-               } elseif (x($_POST, 'imap-submit')) {
+               } elseif (!empty($_POST['imap-submit'])) {
 
-                       $mail_server       = ((x($_POST, 'mail_server')) ? $_POST['mail_server'] : '');
-                       $mail_port         = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : '');
-                       $mail_ssl          = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
-                       $mail_user         = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : '');
-                       $mail_pass         = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : '');
-                       $mail_action       = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : '');
-                       $mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
-                       $mail_replyto      = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : '');
-                       $mail_pubmail      = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+                       $mail_server       = defaults($_POST, 'mail_server', '');
+                       $mail_port         = defaults($_POST, 'mail_port', '');
+                       $mail_ssl          = (!empty($_POST['mail_ssl']) ? strtolower(trim($_POST['mail_ssl'])) : '');
+                       $mail_user         = defaults($_POST, 'mail_user', '');
+                       $mail_pass         = (!empty($_POST['mail_pass']) ? trim($_POST['mail_pass']) : '');
+                       $mail_action       = (!empty($_POST['mail_action']) ? trim($_POST['mail_action']) : '');
+                       $mail_movetofolder = (!empty($_POST['mail_movetofolder']) ? trim($_POST['mail_movetofolder']) : '');
+                       $mail_replyto      = defaults($_POST, 'mail_replyto', '');
+                       $mail_pubmail      = defaults($_POST, 'mail_pubmail', '');
 
 
                        $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
@@ -239,32 +251,32 @@ function settings_post(App $a)
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval(local_user())
                                );
-                               if (!DBM::is_result($r)) {
-                                       dba::insert('mailacct', ['uid' => local_user()]);
+                               if (!DBA::isResult($r)) {
+                                       DBA::insert('mailacct', ['uid' => local_user()]);
                                }
                                if (strlen($mail_pass)) {
                                        $pass = '';
                                        openssl_public_encrypt($mail_pass, $pass, $a->user['pubkey']);
-                                       dba::update('mailacct', ['pass' => bin2hex($pass)], ['uid' => local_user()]);
+                                       DBA::update('mailacct', ['pass' => bin2hex($pass)], ['uid' => local_user()]);
                                }
                                $r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
                                        `action` = %d, `movetofolder` = '%s',
                                        `mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d",
-                                       dbesc($mail_server),
+                                       DBA::escape($mail_server),
                                        intval($mail_port),
-                                       dbesc($mail_ssl),
-                                       dbesc($mail_user),
+                                       DBA::escape($mail_ssl),
+                                       DBA::escape($mail_user),
                                        intval($mail_action),
-                                       dbesc($mail_movetofolder),
-                                       dbesc($mail_replyto),
+                                       DBA::escape($mail_movetofolder),
+                                       DBA::escape($mail_replyto),
                                        intval($mail_pubmail),
                                        intval(local_user())
                                );
-                               logger("mail: updating mailaccount. Response: ".print_r($r, true));
+                               Logger::log("mail: updating mailaccount. Response: ".print_r($r, true));
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval(local_user())
                                );
-                               if (DBM::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $eacct = $r[0];
                                        $mb = Email::constructMailboxName($eacct);
 
@@ -290,7 +302,7 @@ function settings_post(App $a)
        }
 
        if (($a->argc > 1) && ($a->argv[1] === 'features')) {
-               check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features');
                foreach ($_POST as $k => $v) {
                        if (strpos($k, 'feature_') === 0) {
                                PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
@@ -301,19 +313,19 @@ function settings_post(App $a)
        }
 
        if (($a->argc > 1) && ($a->argv[1] === 'display')) {
-               check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
-
-               $theme             = x($_POST, 'theme')             ? notags(trim($_POST['theme']))        : $a->user['theme'];
-               $mobile_theme      = x($_POST, 'mobile_theme')      ? notags(trim($_POST['mobile_theme'])) : '';
-               $nosmile           = x($_POST, 'nosmile')           ? intval($_POST['nosmile'])            : 0;
-               $first_day_of_week = x($_POST, 'first_day_of_week') ? intval($_POST['first_day_of_week'])  : 0;
-               $noinfo            = x($_POST, 'noinfo')            ? intval($_POST['noinfo'])             : 0;
-               $infinite_scroll   = x($_POST, 'infinite_scroll')   ? intval($_POST['infinite_scroll'])    : 0;
-               $no_auto_update    = x($_POST, 'no_auto_update')    ? intval($_POST['no_auto_update'])     : 0;
-               $bandwidth_saver   = x($_POST, 'bandwidth_saver')   ? intval($_POST['bandwidth_saver'])    : 0;
-               $smart_threading   = x($_POST, 'smart_threading')   ? intval($_POST['smart_threading'])    : 0;
-               $nowarn_insecure   = x($_POST, 'nowarn_insecure')   ? intval($_POST['nowarn_insecure'])    : 0;
-               $browser_update    = x($_POST, 'browser_update')    ? intval($_POST['browser_update'])     : 0;
+               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
+
+               $theme             = !empty($_POST['theme'])             ? Strings::escapeTags(trim($_POST['theme']))        : $a->user['theme'];
+               $mobile_theme      = !empty($_POST['mobile_theme'])      ? Strings::escapeTags(trim($_POST['mobile_theme'])) : '';
+               $nosmile           = !empty($_POST['nosmile'])           ? intval($_POST['nosmile'])            : 0;
+               $first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week'])  : 0;
+               $noinfo            = !empty($_POST['noinfo'])            ? intval($_POST['noinfo'])             : 0;
+               $infinite_scroll   = !empty($_POST['infinite_scroll'])   ? intval($_POST['infinite_scroll'])    : 0;
+               $no_auto_update    = !empty($_POST['no_auto_update'])    ? intval($_POST['no_auto_update'])     : 0;
+               $bandwidth_saver   = !empty($_POST['bandwidth_saver'])   ? intval($_POST['bandwidth_saver'])    : 0;
+               $smart_threading   = !empty($_POST['smart_threading'])   ? intval($_POST['smart_threading'])    : 0;
+               $nowarn_insecure   = !empty($_POST['nowarn_insecure'])   ? intval($_POST['nowarn_insecure'])    : 0;
+               $browser_update    = !empty($_POST['browser_update'])    ? intval($_POST['browser_update'])     : 0;
                if ($browser_update != -1) {
                        $browser_update = $browser_update * 1000;
                        if ($browser_update < 10000) {
@@ -321,11 +333,11 @@ function settings_post(App $a)
                        }
                }
 
-               $itemspage_network = x($_POST, 'itemspage_network')  ? intval($_POST['itemspage_network'])  : 40;
+               $itemspage_network = !empty($_POST['itemspage_network'])  ? intval($_POST['itemspage_network'])  : 40;
                if ($itemspage_network > 100) {
                        $itemspage_network = 100;
                }
-               $itemspage_mobile_network = x($_POST, 'itemspage_mobile_network') ? intval($_POST['itemspage_mobile_network']) : 20;
+               $itemspage_mobile_network = !empty($_POST['itemspage_mobile_network']) ? intval($_POST['itemspage_mobile_network']) : 20;
                if ($itemspage_mobile_network > 100) {
                        $itemspage_mobile_network = 100;
                }
@@ -356,26 +368,26 @@ function settings_post(App $a)
                Theme::install($theme);
 
                $r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
-                               dbesc($theme),
+                               DBA::escape($theme),
                                intval(local_user())
                );
 
                Addon::callHooks('display_settings_post', $_POST);
-               goaway('settings/display');
+               $a->internalRedirect('settings/display');
                return; // NOTREACHED
        }
 
-       check_form_security_token_redirectOnErr('/settings', 'settings');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
 
-       if (x($_POST,'resend_relocate')) {
+       if (!empty($_POST['resend_relocate'])) {
                Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
                info(L10n::t("Relocate message has been send to your contacts"));
-               goaway('settings');
+               $a->internalRedirect('settings');
        }
 
        Addon::callHooks('settings_post', $_POST);
 
-       if (x($_POST, 'password') || x($_POST, 'confirm')) {
+       if (!empty($_POST['password']) || !empty($_POST['confirm'])) {
                $newpass = $_POST['password'];
                $confirm = $_POST['confirm'];
 
@@ -385,7 +397,7 @@ function settings_post(App $a)
                        $err = true;
                }
 
-               if (!x($newpass) || !x($confirm)) {
+               if (empty($newpass) || empty($confirm)) {
                        notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL);
                        $err = true;
                }
@@ -403,7 +415,7 @@ function settings_post(App $a)
 
                if (!$err) {
                        $result = User::updatePassword(local_user(), $newpass);
-                       if (DBM::is_result($result)) {
+                       if (DBA::isResult($result)) {
                                info(L10n::t('Password changed.') . EOL);
                        } else {
                                notice(L10n::t('Password update failed. Please try again.') . EOL);
@@ -411,35 +423,35 @@ function settings_post(App $a)
                }
        }
 
-       $username         = ((x($_POST, 'username'))   ? notags(trim($_POST['username']))     : '');
-       $email            = ((x($_POST, 'email'))      ? notags(trim($_POST['email']))        : '');
-       $timezone         = ((x($_POST, 'timezone'))   ? notags(trim($_POST['timezone']))     : '');
-       $language         = ((x($_POST, 'language'))   ? notags(trim($_POST['language']))     : '');
-
-       $defloc           = ((x($_POST, 'defloc'))     ? notags(trim($_POST['defloc']))       : '');
-       $openid           = ((x($_POST, 'openid_url')) ? notags(trim($_POST['openid_url']))   : '');
-       $maxreq           = ((x($_POST, 'maxreq'))     ? intval($_POST['maxreq'])             : 0);
-       $expire           = ((x($_POST, 'expire'))     ? intval($_POST['expire'])             : 0);
-       $def_gid          = ((x($_POST, 'group-selection')) ? intval($_POST['group-selection']) : 0);
-
-
-       $expire_items     = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items'])        : 0);
-       $expire_notes     = ((x($_POST, 'expire_notes')) ? intval($_POST['expire_notes'])        : 0);
-       $expire_starred   = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
-       $expire_photos    = ((x($_POST, 'expire_photos'))? intval($_POST['expire_photos'])       : 0);
-       $expire_network_only    = ((x($_POST, 'expire_network_only'))? intval($_POST['expire_network_only'])     : 0);
-
-       $allow_location   = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
-       $publish          = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
-       $net_publish      = (((x($_POST, 'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
-       $old_visibility   = (((x($_POST, 'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
-       $account_type     = (((x($_POST, 'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
-       $page_flags       = (((x($_POST, 'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
-       $blockwall        = (((x($_POST, 'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
-       $blocktags        = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
-       $unkmail          = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
-       $cntunkmail       = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
-       $suggestme        = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme'])  : 0);
+       $username         = (!empty($_POST['username'])   ? Strings::escapeTags(trim($_POST['username']))     : '');
+       $email            = (!empty($_POST['email'])      ? Strings::escapeTags(trim($_POST['email']))        : '');
+       $timezone         = (!empty($_POST['timezone'])   ? Strings::escapeTags(trim($_POST['timezone']))     : '');
+       $language         = (!empty($_POST['language'])   ? Strings::escapeTags(trim($_POST['language']))     : '');
+
+       $defloc           = (!empty($_POST['defloc'])     ? Strings::escapeTags(trim($_POST['defloc']))       : '');
+       $openid           = (!empty($_POST['openid_url']) ? Strings::escapeTags(trim($_POST['openid_url']))   : '');
+       $maxreq           = (!empty($_POST['maxreq'])     ? intval($_POST['maxreq'])             : 0);
+       $expire           = (!empty($_POST['expire'])     ? intval($_POST['expire'])             : 0);
+       $def_gid          = (!empty($_POST['group-selection']) ? intval($_POST['group-selection']) : 0);
+
+
+       $expire_items     = (!empty($_POST['expire_items']) ? intval($_POST['expire_items'])     : 0);
+       $expire_notes     = (!empty($_POST['expire_notes']) ? intval($_POST['expire_notes'])     : 0);
+       $expire_starred   = (!empty($_POST['expire_starred']) ? intval($_POST['expire_starred']) : 0);
+       $expire_photos    = (!empty($_POST['expire_photos'])? intval($_POST['expire_photos'])    : 0);
+       $expire_network_only    = (!empty($_POST['expire_network_only'])? intval($_POST['expire_network_only'])  : 0);
+
+       $allow_location   = ((!empty($_POST['allow_location']) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
+       $publish          = ((!empty($_POST['profile_in_directory']) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
+       $net_publish      = ((!empty($_POST['profile_in_netdirectory']) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
+       $old_visibility   = ((!empty($_POST['visibility']) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
+       $account_type     = ((!empty($_POST['account-type']) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
+       $page_flags       = ((!empty($_POST['page-flags']) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
+       $blockwall        = ((!empty($_POST['blockwall']) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
+       $blocktags        = ((!empty($_POST['blocktags']) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
+       $unkmail          = ((!empty($_POST['unkmail']) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+       $cntunkmail       = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0);
+       $suggestme        = (!empty($_POST['suggestme']) ? intval($_POST['suggestme'])  : 0);
        $hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
        $hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
 
@@ -448,40 +460,40 @@ function settings_post(App $a)
 
        $notify = 0;
 
-       if (x($_POST, 'notify1')) {
+       if (!empty($_POST['notify1'])) {
                $notify += intval($_POST['notify1']);
        }
-       if (x($_POST, 'notify2')) {
+       if (!empty($_POST['notify2'])) {
                $notify += intval($_POST['notify2']);
        }
-       if (x($_POST, 'notify3')) {
+       if (!empty($_POST['notify3'])) {
                $notify += intval($_POST['notify3']);
        }
-       if (x($_POST, 'notify4')) {
+       if (!empty($_POST['notify4'])) {
                $notify += intval($_POST['notify4']);
        }
-       if (x($_POST, 'notify5')) {
+       if (!empty($_POST['notify5'])) {
                $notify += intval($_POST['notify5']);
        }
-       if (x($_POST, 'notify6')) {
+       if (!empty($_POST['notify6'])) {
                $notify += intval($_POST['notify6']);
        }
-       if (x($_POST, 'notify7')) {
+       if (!empty($_POST['notify7'])) {
                $notify += intval($_POST['notify7']);
        }
-       if (x($_POST, 'notify8')) {
+       if (!empty($_POST['notify8'])) {
                $notify += intval($_POST['notify8']);
        }
 
        // Adjust the page flag if the account type doesn't fit to the page flag.
-       if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE])) {
-               $page_flags = PAGE_NORMAL;
-       } elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [PAGE_SOAPBOX])) {
-               $page_flags = PAGE_SOAPBOX;
-       } elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [PAGE_SOAPBOX])) {
-               $page_flags = PAGE_SOAPBOX;
-       } elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
-               $page_flags = PAGE_COMMUNITY;
+       if (($account_type == Contact::ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [Contact::PAGE_NORMAL, Contact::PAGE_SOAPBOX, Contact::PAGE_FREELOVE])) {
+               $page_flags = Contact::PAGE_NORMAL;
+       } elseif (($account_type == Contact::ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [Contact::PAGE_SOAPBOX])) {
+               $page_flags = Contact::PAGE_SOAPBOX;
+       } elseif (($account_type == Contact::ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [Contact::PAGE_SOAPBOX])) {
+               $page_flags = Contact::PAGE_SOAPBOX;
+       } elseif (($account_type == Contact::ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
+               $page_flags = Contact::PAGE_COMMUNITY;
        }
 
        $email_changed = false;
@@ -505,7 +517,7 @@ function settings_post(App $a)
                        $email = $a->user['email'];
                }
                //  check the email is valid
-               if (!valid_email($email)) {
+               if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
                        $err .= L10n::t('Invalid email.');
                }
                //  ensure new email is not the admin mail
@@ -527,19 +539,19 @@ function settings_post(App $a)
                date_default_timezone_set($timezone);
        }
 
-       $str_group_allow   = perms2str($_POST['group_allow']);
-       $str_contact_allow = perms2str($_POST['contact_allow']);
-       $str_group_deny    = perms2str($_POST['group_deny']);
-       $str_contact_deny  = perms2str($_POST['contact_deny']);
+       $str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
+       $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+       $str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
+       $str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
 
        $openidserver = $a->user['openidserver'];
-       //$openid = normalise_openid($openid);
+       //$openid = Strings::normaliseOpenID($openid);
 
        // If openid has changed or if there's an openid but no openidserver, try and discover it.
        if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
                if (Network::isUrlValid($openid)) {
-                       logger('updating openidserver');
-                       $open_id_obj = new LightOpenID($a->get_hostname());
+                       Logger::log('updating openidserver');
+                       $open_id_obj = new LightOpenID($a->getHostName());
                        $open_id_obj->identity = $openid;
                        $openidserver = $open_id_obj->discover($open_id_obj->identity);
                } else {
@@ -558,7 +570,7 @@ function settings_post(App $a)
        PConfig::set(local_user(), 'system', 'email_textonly', $email_textonly);
        PConfig::set(local_user(), 'system', 'detailed_notif', $detailed_notif);
 
-       if ($page_flags == PAGE_PRVGROUP) {
+       if ($page_flags == Contact::PAGE_PRVGROUP) {
                $hidewall = 1;
                if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
                        if ($def_gid) {
@@ -579,32 +591,32 @@ function settings_post(App $a)
                                `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d,
                                `unkmail` = %d, `cntunkmail` = %d, `language` = '%s'
                        WHERE `uid` = %d",
-                       dbesc($username),
-                       dbesc($email),
-                       dbesc($openid),
-                       dbesc($timezone),
-                       dbesc($str_contact_allow),
-                       dbesc($str_group_allow),
-                       dbesc($str_contact_deny),
-                       dbesc($str_group_deny),
+                       DBA::escape($username),
+                       DBA::escape($email),
+                       DBA::escape($openid),
+                       DBA::escape($timezone),
+                       DBA::escape($str_contact_allow),
+                       DBA::escape($str_group_allow),
+                       DBA::escape($str_contact_deny),
+                       DBA::escape($str_group_deny),
                        intval($notify),
                        intval($page_flags),
                        intval($account_type),
-                       dbesc($defloc),
+                       DBA::escape($defloc),
                        intval($allow_location),
                        intval($maxreq),
                        intval($expire),
-                       dbesc($openidserver),
+                       DBA::escape($openidserver),
                        intval($def_gid),
                        intval($blockwall),
                        intval($hidewall),
                        intval($blocktags),
                        intval($unkmail),
                        intval($cntunkmail),
-                       dbesc($language),
+                       DBA::escape($language),
                        intval(local_user())
        );
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                info(L10n::t('Settings updated.') . EOL);
        }
 
@@ -618,7 +630,7 @@ function settings_post(App $a)
                `hide-friends` = %d
                WHERE `is-default` = 1 AND `uid` = %d",
                intval($publish),
-               dbesc($username),
+               DBA::escape($username),
                intval($net_publish),
                intval($hide_friends),
                intval(local_user())
@@ -639,7 +651,7 @@ function settings_post(App $a)
        // Update the global contact for the user
        GContact::updateForUser(local_user());
 
-       goaway('settings');
+       $a->internalRedirect('settings');
        return; // NOTREACHED
 }
 
@@ -651,19 +663,19 @@ function settings_content(App $a)
 
        if (!local_user()) {
                //notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
        if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
                if (($a->argc > 2) && ($a->argv[2] === 'add')) {
-                       $tpl = get_markup_template('settings/oauth_edit.tpl');
-                       $o .= replace_macros($tpl, [
-                               '$form_security_token' => get_form_security_token("settings_oauth"),
+                       $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
+                               '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                                '$title'        => L10n::t('Add application'),
                                '$submit'       => L10n::t('Save Settings'),
                                '$cancel'       => L10n::t('Cancel'),
@@ -678,18 +690,18 @@ function settings_content(App $a)
 
                if (($a->argc > 3) && ($a->argv[2] === 'edit')) {
                        $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
-                                       dbesc($a->argv[3]),
+                                       DBA::escape($a->argv[3]),
                                        local_user());
 
-                       if (!DBM::is_result($r)) {
+                       if (!DBA::isResult($r)) {
                                notice(L10n::t("You can't edit this application."));
                                return;
                        }
                        $app = $r[0];
 
-                       $tpl = get_markup_template('settings/oauth_edit.tpl');
-                       $o .= replace_macros($tpl, [
-                               '$form_security_token' => get_form_security_token("settings_oauth"),
+                       $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
+                               '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                                '$title'        => L10n::t('Add application'),
                                '$submit'       => L10n::t('Update'),
                                '$cancel'       => L10n::t('Cancel'),
@@ -703,14 +715,14 @@ function settings_content(App $a)
                }
 
                if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
-                       check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+                       BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
 
-                       dba::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
-                       goaway(System::baseUrl(true)."/settings/oauth/");
+                       DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
+                       $a->internalRedirect('settings/oauth/', true);
                        return;
                }
 
-               /// @TODO validate result with DBM::is_result()
+               /// @TODO validate result with DBA::isResult()
                $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
                                FROM clients
                                LEFT JOIN tokens ON clients.client_id=tokens.client_id
@@ -719,10 +731,10 @@ function settings_content(App $a)
                                local_user());
 
 
-               $tpl = get_markup_template('settings/oauth.tpl');
-               $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_oauth"),
-                       '$baseurl'      => System::baseUrl(true),
+               $tpl = Renderer::getMarkupTemplate('settings/oauth.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
+                       '$baseurl'      => $a->getBaseURL(true),
                        '$title'        => L10n::t('Connected Apps'),
                        '$add'          => L10n::t('Add application'),
                        '$edit'         => L10n::t('Edit'),
@@ -739,16 +751,16 @@ function settings_content(App $a)
                $settings_addons = "";
 
                $r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        $settings_addons = L10n::t('No Addon settings configured');
                }
 
                Addon::callHooks('addon_settings', $settings_addons);
 
 
-               $tpl = get_markup_template('settings/addons.tpl');
-               $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_addon"),
+               $tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
                        '$title'        => L10n::t('Addon Settings'),
                        '$settings_addons' => $settings_addons
                ]);
@@ -767,9 +779,9 @@ function settings_content(App $a)
                        }
                }
 
-               $tpl = get_markup_template('settings/features.tpl');
-               $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_features"),
+               $tpl = Renderer::getMarkupTemplate('settings/features.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_features"),
                        '$title'               => L10n::t('Additional Features'),
                        '$features'            => $arr,
                        '$submit'              => L10n::t('Save Settings'),
@@ -784,8 +796,8 @@ function settings_content(App $a)
                $default_group             = PConfig::get(local_user(), 'ostatus', 'default_group');
                $legacy_contact            = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
 
-               if (x($legacy_contact)) {
-                       /// @todo Isn't it supposed to be a goaway() call?
+               if (!empty($legacy_contact)) {
+                       /// @todo Isn't it supposed to be a $a->internalRedirect() call?
                        $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
                }
 
@@ -812,23 +824,23 @@ function settings_content(App $a)
                        $r = null;
                }
 
-               $mail_server       = ((DBM::is_result($r)) ? $r[0]['server'] : '');
-               $mail_port         = ((DBM::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
-               $mail_ssl          = ((DBM::is_result($r)) ? $r[0]['ssltype'] : '');
-               $mail_user         = ((DBM::is_result($r)) ? $r[0]['user'] : '');
-               $mail_replyto      = ((DBM::is_result($r)) ? $r[0]['reply_to'] : '');
-               $mail_pubmail      = ((DBM::is_result($r)) ? $r[0]['pubmail'] : 0);
-               $mail_action       = ((DBM::is_result($r)) ? $r[0]['action'] : 0);
-               $mail_movetofolder = ((DBM::is_result($r)) ? $r[0]['movetofolder'] : '');
-               $mail_chk          = ((DBM::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
+               $mail_server       = ((DBA::isResult($r)) ? $r[0]['server'] : '');
+               $mail_port         = ((DBA::isResult($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+               $mail_ssl          = ((DBA::isResult($r)) ? $r[0]['ssltype'] : '');
+               $mail_user         = ((DBA::isResult($r)) ? $r[0]['user'] : '');
+               $mail_replyto      = ((DBA::isResult($r)) ? $r[0]['reply_to'] : '');
+               $mail_pubmail      = ((DBA::isResult($r)) ? $r[0]['pubmail'] : 0);
+               $mail_action       = ((DBA::isResult($r)) ? $r[0]['action'] : 0);
+               $mail_movetofolder = ((DBA::isResult($r)) ? $r[0]['movetofolder'] : '');
+               $mail_chk          = ((DBA::isResult($r)) ? $r[0]['last_check'] : DBA::NULL_DATETIME);
 
 
-               $tpl = get_markup_template('settings/connectors.tpl');
+               $tpl = Renderer::getMarkupTemplate('settings/connectors.tpl');
 
                $mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
 
-               $o .= replace_macros($tpl, [
-                       '$form_security_token' => get_form_security_token("settings_connectors"),
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"),
 
                        '$title'        => L10n::t('Social Networks'),
 
@@ -945,10 +957,10 @@ function settings_content(App $a)
                        $theme_config = theme_content($a);
                }
 
-               $tpl = get_markup_template('settings/display.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('settings/display.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$ptitle'       => L10n::t('Display Settings'),
-                       '$form_security_token' => get_form_security_token("settings_display"),
+                       '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"),
                        '$submit'       => L10n::t('Save Settings'),
                        '$baseurl' => System::baseUrl(true),
                        '$uid' => local_user(),
@@ -975,11 +987,6 @@ function settings_content(App $a)
                        '$theme_config' => $theme_config,
                ]);
 
-               $tpl = get_markup_template('settings/display_end.tpl');
-               $a->page['end'] .= replace_macros($tpl, [
-                       '$theme'        => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes]
-               ]);
-
                return $o;
        }
 
@@ -988,8 +995,8 @@ function settings_content(App $a)
         * ACCOUNT SETTINGS
         */
 
-       $profile = dba::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
-       if (!DBM::is_result($profile)) {
+       $profile = DBA::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
+       if (!DBA::isResult($profile)) {
                notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);
                return;
        }
@@ -1022,57 +1029,57 @@ function settings_content(App $a)
 
        // Set the account type to "Community" when the page is a community page but the account type doesn't fit
        // This is only happening on the first visit after the update
-       if (in_array($a->user['page-flags'], [PAGE_COMMUNITY, PAGE_PRVGROUP]) &&
-               ($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY))
-               $a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY;
+       if (in_array($a->user['page-flags'], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]) &&
+               ($a->user['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY))
+               $a->user['account-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
 
-       $pageset_tpl = get_markup_template('settings/pagetypes.tpl');
+       $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl');
 
-       $pagetype = replace_macros($pageset_tpl, [
+       $pagetype = Renderer::replaceMacros($pageset_tpl, [
                '$account_types'        => L10n::t("Account Types"),
                '$user'                 => L10n::t("Personal Page Subtypes"),
                '$community'            => L10n::t("Community Forum Subtypes"),
                '$account_type'         => $a->user['account-type'],
-               '$type_person'          => ACCOUNT_TYPE_PERSON,
-               '$type_organisation'    => ACCOUNT_TYPE_ORGANISATION,
-               '$type_news'            => ACCOUNT_TYPE_NEWS,
-               '$type_community'       => ACCOUNT_TYPE_COMMUNITY,
+               '$type_person'          => Contact::ACCOUNT_TYPE_PERSON,
+               '$type_organisation'    => Contact::ACCOUNT_TYPE_ORGANISATION,
+               '$type_news'            => Contact::ACCOUNT_TYPE_NEWS,
+               '$type_community'       => Contact::ACCOUNT_TYPE_COMMUNITY,
 
-               '$account_person'       => ['account-type', L10n::t('Personal Page'), ACCOUNT_TYPE_PERSON,
+               '$account_person'       => ['account-type', L10n::t('Personal Page'), Contact::ACCOUNT_TYPE_PERSON,
                                                                        L10n::t('Account for a personal profile.'),
-                                                                       ($a->user['account-type'] == ACCOUNT_TYPE_PERSON)],
+                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_PERSON)],
 
-               '$account_organisation' => ['account-type', L10n::t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
+               '$account_organisation' => ['account-type', L10n::t('Organisation Page'), Contact::ACCOUNT_TYPE_ORGANISATION,
                                                                        L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)],
+                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_ORGANISATION)],
 
-               '$account_news'         => ['account-type', L10n::t('News Page'), ACCOUNT_TYPE_NEWS,
+               '$account_news'         => ['account-type', L10n::t('News Page'), Contact::ACCOUNT_TYPE_NEWS,
                                                                        L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['account-type'] == ACCOUNT_TYPE_NEWS)],
+                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_NEWS)],
 
-               '$account_community'    => ['account-type', L10n::t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
+               '$account_community'    => ['account-type', L10n::t('Community Forum'), Contact::ACCOUNT_TYPE_COMMUNITY,
                                                                        L10n::t('Account for community discussions.'),
-                                                                       ($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)],
+                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY)],
 
-               '$page_normal'          => ['page-flags', L10n::t('Normal Account Page'), PAGE_NORMAL,
+               '$page_normal'          => ['page-flags', L10n::t('Normal Account Page'), Contact::PAGE_NORMAL,
                                                                        L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
-                                                                       ($a->user['page-flags'] == PAGE_NORMAL)],
+                                                                       ($a->user['page-flags'] == Contact::PAGE_NORMAL)],
 
-               '$page_soapbox'         => ['page-flags', L10n::t('Soapbox Page'), PAGE_SOAPBOX,
+               '$page_soapbox'         => ['page-flags', L10n::t('Soapbox Page'), Contact::PAGE_SOAPBOX,
                                                                        L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['page-flags'] == PAGE_SOAPBOX)],
+                                                                       ($a->user['page-flags'] == Contact::PAGE_SOAPBOX)],
 
-               '$page_community'       => ['page-flags', L10n::t('Public Forum'), PAGE_COMMUNITY,
+               '$page_community'       => ['page-flags', L10n::t('Public Forum'), Contact::PAGE_COMMUNITY,
                                                                        L10n::t('Automatically approves all contact requests.'),
-                                                                       ($a->user['page-flags'] == PAGE_COMMUNITY)],
+                                                                       ($a->user['page-flags'] == Contact::PAGE_COMMUNITY)],
 
-               '$page_freelove'        => ['page-flags', L10n::t('Automatic Friend Page'), PAGE_FREELOVE,
+               '$page_freelove'        => ['page-flags', L10n::t('Automatic Friend Page'), Contact::PAGE_FREELOVE,
                                                                        L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'),
-                                                                       ($a->user['page-flags'] == PAGE_FREELOVE)],
+                                                                       ($a->user['page-flags'] == Contact::PAGE_FREELOVE)],
 
-               '$page_prvgroup'        => ['page-flags', L10n::t('Private Forum [Experimental]'), PAGE_PRVGROUP,
+               '$page_prvgroup'        => ['page-flags', L10n::t('Private Forum [Experimental]'), Contact::PAGE_PRVGROUP,
                                                                        L10n::t('Requires manual approval of contact requests.'),
-                                                                       ($a->user['page-flags'] == PAGE_PRVGROUP)],
+                                                                       ($a->user['page-flags'] == Contact::PAGE_PRVGROUP)],
 
 
        ]);
@@ -1085,44 +1092,44 @@ function settings_content(App $a)
                $openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
        }
 
-       $opt_tpl = get_markup_template("field_yesno.tpl");
+       $opt_tpl = Renderer::getMarkupTemplate("field_yesno.tpl");
        if (Config::get('system', 'publish_all')) {
                $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
        } else {
-               $profile_in_dir = replace_macros($opt_tpl, [
+               $profile_in_dir = Renderer::replaceMacros($opt_tpl, [
                        '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]]
                ]);
        }
 
        if (strlen(Config::get('system', 'directory'))) {
-               $profile_in_net_dir = replace_macros($opt_tpl, [
+               $profile_in_net_dir = Renderer::replaceMacros($opt_tpl, [
                        '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('Your profile will be published in the global friendica directories (e.g. <a href="%s">%s</a>). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]]
                ]);
        } else {
                $profile_in_net_dir = '';
        }
 
-       $hide_friends = replace_macros($opt_tpl, [
+       $hide_friends = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], L10n::t('Your contact list won\'t be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $hide_wall = replace_macros($opt_tpl, [
+       $hide_wall = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['hidewall', L10n::t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], L10n::t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $blockwall = replace_macros($opt_tpl, [
+       $blockwall = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $blocktags = replace_macros($opt_tpl, [
+       $blocktags = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('Your contacts can add additional tags to your posts.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $suggestme = replace_macros($opt_tpl, [
+       $suggestme = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica may suggest new members to add you as a contact.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $unkmail = replace_macros($opt_tpl, [
+       $unkmail = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('Friendica network users may send you private messages even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
@@ -1130,14 +1137,14 @@ function settings_content(App $a)
                info(L10n::t('Profile is <strong>not published</strong>.') . EOL);
        }
 
-       $tpl_addr = get_markup_template('settings/nick_set.tpl');
+       $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl');
 
-       $prof_addr = replace_macros($tpl_addr,[
-               '$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
-               '$basepath' => $a->get_hostname()
+       $prof_addr = Renderer::replaceMacros($tpl_addr,[
+               '$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->getHostName() . $a->getURLPath(), System::baseUrl() . '/profile/' . $nickname),
+               '$basepath' => $a->getHostName()
        ]);
 
-       $stpl = get_markup_template('settings/settings.tpl');
+       $stpl = Renderer::getMarkupTemplate('settings/settings.tpl');
 
        $expire_arr = [
                'days' => ['expire',  L10n::t("Automatically expire posts after this many days:"), $expire, L10n::t('If empty, posts will not expire. Expired posts will be deleted')],
@@ -1176,13 +1183,13 @@ function settings_content(App $a)
        $lang_choices = L10n::getAvailableLanguages();
 
        /// @TODO Fix indending (or so)
-       $o .= replace_macros($stpl, [
+       $o .= Renderer::replaceMacros($stpl, [
                '$ptitle'       => L10n::t('Account Settings'),
 
                '$submit'       => L10n::t('Save Settings'),
                '$baseurl' => System::baseUrl(true),
                '$uid' => local_user(),
-               '$form_security_token' => get_form_security_token("settings"),
+               '$form_security_token' => BaseModule::getFormSecurityToken("settings"),
                '$nickname_block' => $prof_addr,
 
                '$h_pass'       => L10n::t('Password Settings'),