]> git.mxchange.org Git - friendica.git/blobdiff - mod/admin.php
Use short form array syntax everywhere
[friendica.git] / mod / admin.php
index 7bb683fe8dde68f7c0da6fc8a4ac60a94e1f5c3b..fc3fb5819aca5bd9576d64a63078eb19d0f044cf 100644 (file)
@@ -1,20 +1,25 @@
 <?php
-
- /**
+/**
  * @file mod/admin.php
  *
  * @brief Friendica admin
  */
 
 use Friendica\App;
-use Friendica\Core\System;
+use Friendica\Content\Feature;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Config;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Database\DBStructure;
+use Friendica\Model\Contact;
+use Friendica\Model\User;
+use Friendica\Module\Login;
 
-require_once("include/enotify.php");
-require_once("include/text.php");
-require_once('include/items.php');
+require_once 'include/enotify.php';
+require_once 'include/text.php';
+require_once 'include/items.php';
 
 /**
  * @brief Process send data from the admin panels subpages
@@ -29,20 +34,19 @@ require_once('include/items.php');
  * @param App $a
  *
  */
-function admin_post(App $a) {
-
-
+function admin_post(App $a)
+{
        if (!is_site_admin()) {
                return;
        }
 
        // do not allow a page manager to access the admin panel at all.
 
-       if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
                return;
        }
 
-       // urls
+       $return_path = 'admin';
        if ($a->argc > 1) {
                switch ($a->argv[1]) {
                        case 'site':
@@ -53,15 +57,14 @@ function admin_post(App $a) {
                                break;
                        case 'plugins':
                                if ($a->argc > 2 &&
-                                       is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")) {
-                                               @include_once("addon/".$a->argv[2]."/".$a->argv[2].".php");
-                                               if (function_exists($a->argv[2].'_plugin_admin_post')) {
-                                                       $func = $a->argv[2].'_plugin_admin_post';
-                                                       $func($a);
-                                               }
+                                       is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) {
+                                       @include_once("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php");
+                                       if (function_exists($a->argv[2] . '_plugin_admin_post')) {
+                                               $func = $a->argv[2] . '_plugin_admin_post';
+                                               $func($a);
+                                       }
                                }
-                               goaway('admin/plugins/'.$a->argv[2]);
-                               return; // NOTREACHED
+                               $return_path = 'admin/plugins/' . $a->argv[2];
                                break;
                        case 'themes':
                                if ($a->argc < 2) {
@@ -74,36 +77,31 @@ function admin_post(App $a) {
 
                                $theme = $a->argv[2];
                                if (is_file("view/theme/$theme/config.php")) {
-                                       function __call_theme_admin_post(App $a, $theme) {
-                                               $orig_theme = $a->theme;
-                                               $orig_page = $a->page;
-                                               $orig_session_theme = $_SESSION['theme'];
-                                               require_once("view/theme/$theme/theme.php");
-                                               require_once("view/theme/$theme/config.php");
-                                               $_SESSION['theme'] = $theme;
-
-
-                                               $init = $theme."_init";
-                                               if (function_exists($init)) {
-                                                       $init($a);
-                                               }
-                                               if (function_exists("theme_admin_post")) {
-                                                       $admin_form = theme_admin_post($a);
-                                               }
-
-                                               $_SESSION['theme'] = $orig_session_theme;
-                                               $a->theme = $orig_theme;
-                                               $a->page = $orig_page;
-                                               return $admin_form;
+                                       $orig_theme = $a->theme;
+                                       $orig_page = $a->page;
+                                       $orig_session_theme = $_SESSION['theme'];
+                                       require_once "view/theme/$theme/theme.php";
+                                       require_once "view/theme/$theme/config.php";
+                                       $_SESSION['theme'] = $theme;
+
+                                       $init = $theme . '_init';
+                                       if (function_exists($init)) {
+                                               $init($a);
                                        }
-                                       __call_theme_admin_post($a, $theme);
+                                       if (function_exists('theme_admin_post')) {
+                                               theme_admin_post($a);
+                                       }
+
+                                       $_SESSION['theme'] = $orig_session_theme;
+                                       $a->theme = $orig_theme;
+                                       $a->page = $orig_page;
                                }
+
                                info(t('Theme settings updated.'));
                                if (is_ajax()) {
                                        return;
                                }
-                               goaway('admin/themes/'.$theme);
-                               return;
+                               $return_path = 'admin/themes/' . $theme;
                                break;
                        case 'features':
                                admin_page_features_post($a);
@@ -111,8 +109,8 @@ function admin_post(App $a) {
                        case 'logs':
                                admin_page_logs_post($a);
                                break;
-                       case 'dbsync':
-                               admin_page_dbsync_post($a);
+                       case 'contactblock':
+                               admin_page_contactblock_post($a);
                                break;
                        case 'blocklist':
                                admin_page_blocklist_post($a);
@@ -123,7 +121,7 @@ function admin_post(App $a) {
                }
        }
 
-       goaway('admin');
+       goaway($return_path);
        return; // NOTREACHED
 }
 
@@ -144,13 +142,13 @@ function admin_post(App $a) {
  * @param App $a
  * @return string
  */
-function admin_content(App $a) {
-
+function admin_content(App $a)
+{
        if (!is_site_admin()) {
-               return login(false);
+               return Login::form();
        }
 
-       if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
                return "";
        }
 
@@ -159,47 +157,47 @@ function admin_content(App $a) {
        //      $toDelete = new APCIterator('user', APC_ITER_VALUE);
        //      apc_delete($toDelete);
        //}
-
        // Header stuff
-       $a->page['htmlhead'] .= replace_macros(get_markup_template('admin_settings_head.tpl'), array());
+       $a->page['htmlhead'] .= replace_macros(get_markup_template('admin/settings_head.tpl'), []);
 
        /*
         * Side bar links
         */
-       $aside_tools = array();
+       $aside_tools = [];
        // array(url, name, extra css classes)
        // not part of $aside to make the template more adjustable
-       $aside_sub = array(
-               'site'   =>     array("admin/site/", t("Site") , "site"),
-               'users'  =>     array("admin/users/", t("Users") , "users"),
-               'plugins'=>     array("admin/plugins/", t("Plugins") , "plugins"),
-               'themes' =>     array("admin/themes/", t("Themes") , "themes"),
-               'features' =>   array("admin/features/", t("Additional features") , "features"),
-               'dbsync' =>     array("admin/dbsync/", t('DB updates'), "dbsync"),
-               'queue'  =>     array("admin/queue/", t('Inspect Queue'), "queue"),
-               'blocklist' => array("admin/blocklist/", t('Server Blocklist'), "blocklist"),
-               'federation' => array("admin/federation/", t('Federation Statistics'), "federation"),
-               'deleteitem' => array("admin/deleteitem/", t('Delete Item'), 'deleteitem'),
-       );
+       $aside_sub = [
+               'site'         => ["admin/site/"        , t("Site")                 , "site"],
+               'users'        => ["admin/users/"       , t("Users")                , "users"],
+               'plugins'      => ["admin/plugins/"     , t("Plugins")              , "plugins"],
+               'themes'       => ["admin/themes/"      , t("Themes")               , "themes"],
+               'features'     => ["admin/features/"    , t("Additional features")  , "features"],
+               'dbsync'       => ["admin/dbsync/"      , t('DB updates')           , "dbsync"],
+               'queue'        => ["admin/queue/"       , t('Inspect Queue')        , "queue"],
+               'contactblock' => ["admin/contactblock/", t('Contact Blocklist')    , "contactblock"],
+               'blocklist'    => ["admin/blocklist/"   , t('Server Blocklist')     , "blocklist"],
+               'federation'   => ["admin/federation/"  , t('Federation Statistics'), "federation"],
+               'deleteitem'   => ["admin/deleteitem/"  , t('Delete Item')          , 'deleteitem'],
+       ];
 
        /* get plugins admin page */
 
        $r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
-       $aside_tools['plugins_admin']=array();
+       $aside_tools['plugins_admin'] = [];
        foreach ($r as $h) {
-               $plugin =$h['name'];
-               $aside_tools['plugins_admin'][] = array("admin/plugins/".$plugin, $plugin, "plugin");
+               $plugin = $h['name'];
+               $aside_tools['plugins_admin'][] = ["admin/plugins/" . $plugin, $plugin, "plugin"];
                // temp plugins with admin
                $a->plugins_admin[] = $plugin;
        }
 
-       $aside_tools['logs'] = array("admin/logs/", t("Logs"), "logs");
-       $aside_tools['viewlogs'] = array("admin/viewlogs/", t("View Logs"), 'viewlogs');
-       $aside_tools['diagnostics_probe'] = array('probe/', t('probe address'), 'probe');
-       $aside_tools['diagnostics_webfinger'] = array('webfinger/', t('check webfinger'), 'webfinger');
+       $aside_tools['logs'] = ["admin/logs/", t("Logs"), "logs"];
+       $aside_tools['viewlogs'] = ["admin/viewlogs/", t("View Logs"), 'viewlogs'];
+       $aside_tools['diagnostics_probe'] = ['probe/', t('probe address'), 'probe'];
+       $aside_tools['diagnostics_webfinger'] = ['webfinger/', t('check webfinger'), 'webfinger'];
 
-       $t = get_markup_template("admin_aside.tpl");
-       $a->page['aside'] .= replace_macros($t, array(
+       $t = get_markup_template('admin/aside.tpl');
+       $a->page['aside'] .= replace_macros($t, [
                '$admin' => $aside_tools,
                '$subpages' => $aside_sub,
                '$admtxt' => t('Admin'),
@@ -207,14 +205,10 @@ function admin_content(App $a) {
                '$logtxt' => t('Logs'),
                '$diagnosticstxt' => t('diagnostics'),
                '$h_pending' => t('User registrations waiting for confirmation'),
-               '$admurl'=> "admin/"
-       ));
-
+               '$admurl' => "admin/"
+       ]);
 
-
-       /*
-        * Page content
-        */
+       // Page content
        $o = '';
        // urls
        if ($a->argc > 1) {
@@ -249,6 +243,9 @@ function admin_content(App $a) {
                        case 'federation':
                                $o = admin_page_federation($a);
                                break;
+                       case 'contactblock':
+                               $o = admin_page_contactblock($a);
+                               break;
                        case 'blocklist':
                                $o = admin_page_blocklist($a);
                                break;
@@ -282,27 +279,28 @@ function admin_content(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_blocklist(App $a) {
+function admin_page_blocklist(App $a)
+{
        $blocklist = Config::get('system', 'blocklist');
-       $blocklistform = array();
+       $blocklistform = [];
        if (is_array($blocklist)) {
-               foreach($blocklist as $id => $b) {
-                       $blocklistform[] = array(
-                               'domain' => array("domain[$id]", t('Blocked domain'), $b['domain'], '', t('The blocked domain'), 'required', '', ''),
-                               'reason' => array("reason[$id]", t("Reason for the block"), $b['reason'], t('The reason why you blocked this domain.').'('.$b['domain'].')', 'required', '', ''),
-                               'delete' => array("delete[$id]", t("Delete domain").' ('.$b['domain'].')', False , t("Check to delete this entry from the blocklist"))
-                       );
+               foreach ($blocklist as $id => $b) {
+                       $blocklistform[] = [
+                               'domain' => ["domain[$id]", t('Blocked domain'), $b['domain'], '', t('The blocked domain'), 'required', '', ''],
+                               'reason' => ["reason[$id]", t("Reason for the block"), $b['reason'], t('The reason why you blocked this domain.') . '(' . $b['domain'] . ')', 'required', '', ''],
+                               'delete' => ["delete[$id]", t("Delete domain") . ' (' . $b['domain'] . ')', False, t("Check to delete this entry from the blocklist")]
+                       ];
                }
        }
-       $t = get_markup_template("admin_blocklist.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/blocklist.tpl');
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Server Blocklist'),
                '$intro' => t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'),
                '$public' => t('The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'),
                '$addtitle' => t('Add new entry to block list'),
-               '$newdomain' => array('newentry_domain', t('Server Domain'), '', t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''),
-               '$newreason' => array('newentry_reason', t('Block reason'), '', t('The reason why you blocked this domain.'), 'required', '', ''),
+               '$newdomain' => ['newentry_domain', t('Server Domain'), '', t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''],
+               '$newreason' => ['newentry_reason', t('Block reason'), '', t('The reason why you blocked this domain.'), 'required', '', ''],
                '$submit' => t('Add Entry'),
                '$savechanges' => t('Save changes to the blocklist'),
                '$currenttitle' => t('Current Entries in the Blocklist'),
@@ -312,8 +310,8 @@ function admin_page_blocklist(App $a) {
                '$entries' => $blocklistform,
                '$baseurl' => System::baseUrl(true),
                '$confirm_delete' => t('Delete entry from blocklist?'),
-               '$form_security_token'  => get_form_security_token("admin_blocklist")
-       ));
+               '$form_security_token' => get_form_security_token("admin_blocklist")
+       ]);
 }
 
 /**
@@ -321,8 +319,9 @@ function admin_page_blocklist(App $a) {
  *
  * @param App $a
  */
-function admin_page_blocklist_post(App $a) {
-       if (!x($_POST,"page_blocklist_save") && (!x($_POST['page_blocklist_edit']))) {
+function admin_page_blocklist_post(App $a)
+{
+       if (!x($_POST, "page_blocklist_save") && (!x($_POST['page_blocklist_edit']))) {
                return;
        }
 
@@ -331,34 +330,114 @@ function admin_page_blocklist_post(App $a) {
        if (x($_POST['page_blocklist_save'])) {
                //  Add new item to blocklist
                $blocklist = Config::get('system', 'blocklist');
-               $blocklist[] = array(
+               $blocklist[] = [
                        'domain' => notags(trim($_POST['newentry_domain'])),
                        'reason' => notags(trim($_POST['newentry_reason']))
-               );
+               ];
                Config::set('system', 'blocklist', $blocklist);
-               info(t('Server added to blocklist.').EOL);
+               info(t('Server added to blocklist.') . EOL);
        } else {
                // Edit the entries from blocklist
-               $blocklist = array();
+               $blocklist = [];
                foreach ($_POST['domain'] as $id => $domain) {
                        // Trimming whitespaces as well as any lingering slashes
                        $domain = notags(trim($domain, "\x00..\x1F/"));
                        $reason = notags(trim($_POST['reason'][$id]));
                        if (!x($_POST['delete'][$id])) {
-                               $blocklist[] = array(
+                               $blocklist[] = [
                                        'domain' => $domain,
                                        'reason' => $reason
-                               );
+                               ];
                        }
                }
                Config::set('system', 'blocklist', $blocklist);
-               info(t('Site blocklist updated.').EOL);
+               info(t('Site blocklist updated.') . EOL);
        }
        goaway('admin/blocklist');
 
        return; // NOTREACHED
 }
 
+/**
+ * @brief Process data send by the contact block admin page
+ *
+ * @param App $a
+ */
+function admin_page_contactblock_post(App $a)
+{
+       $contact_url = x($_POST, 'contact_url') ? $_POST['contact_url'] : '';
+       $contacts    = x($_POST, 'contacts')    ? $_POST['contacts']    : [];
+
+       check_form_security_token_redirectOnErr('/admin/contactblock', 'admin_contactblock');
+
+       if (x($_POST, 'page_contactblock_block')) {
+               $contact_id = Contact::getIdForURL($contact_url, 0);
+               if ($contact_id) {
+                       Contact::block($contact_id);
+                       notice(t('The contact has been blocked from the node'));
+               } else {
+                       notice(t('Could not find any contact entry for this URL (%s)', $contact_url));
+               }
+       }
+       if (x($_POST, 'page_contactblock_unblock')) {
+               foreach ($contacts as $uid) {
+                       Contact::unblock($uid);
+               }
+               notice(tt("%s contact unblocked", "%s contacts unblocked", count($contacts)));
+       }
+       goaway('admin/contactblock');
+       return; // NOTREACHED
+}
+
+/**
+ * @brief Admin panel for server-wide contact block
+ *
+ * @param App $a
+ * @return string
+ */
+function admin_page_contactblock(App $a)
+{
+       $condition = ['uid' => 0, 'blocked' => true];
+
+       $total = dba::count('contact', $condition);
+
+       $a->set_pager_total($total);
+       $a->set_pager_itemspage(30);
+
+       $statement = dba::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
+
+       $contacts = dba::inArray($statement);
+
+       $t = get_markup_template('admin/contactblock.tpl');
+       $o = replace_macros($t, [
+               // strings //
+               '$title'       => t('Administration'),
+               '$page'        => t('Remote Contact Blocklist'),
+               '$description' => t('This page allows you to prevent any message from a remote contact to reach your node.'),
+               '$submit'      => t('Block Remote Contact'),
+               '$select_all'  => t('select all'),
+               '$select_none' => t('select none'),
+               '$block'       => t('Block'),
+               '$unblock'     => t('Unblock'),
+               '$no_data'     => t('No remote contact is blocked from this node.'),
+
+               '$h_contacts'  => t('Blocked Remote Contacts'),
+               '$h_newblock'  => t('Block New Remote Contact'),
+               '$th_contacts' => [t('Photo'), t('Name'), t('Address'), t('Profile URL')],
+
+               '$form_security_token' => get_form_security_token("admin_contactblock"),
+
+               // values //
+               '$baseurl'    => System::baseUrl(true),
+
+               '$contacts'   => $contacts,
+               '$total_contacts' => tt('%s total blocked contact', '%s total blocked contacts', $total),
+               '$paginate'   => paginate($a),
+               '$contacturl' => ['contact_url', t("Profile URL"), '', t("URL of the remote contact to block.")],
+       ]);
+       return $o;
+}
+
 /**
  * @brief Subpage where the admin can delete an item from their node given the GUID
  *
@@ -369,20 +448,22 @@ function admin_page_blocklist_post(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_deleteitem(App $a) {
-       $t = get_markup_template("admin_deleteitem.tpl");
+function admin_page_deleteitem(App $a)
+{
+       $t = get_markup_template('admin/deleteitem.tpl');
 
-       return replace_macros($t, array(
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Delete Item'),
                '$submit' => t('Delete this Item'),
                '$intro1' => t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'),
                '$intro2' => t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'),
-               '$deleteitemguid' => array('deleteitemguid', t("GUID"), '', t("The GUID of the item you want to delete."), 'required', 'autofocus'),
+               '$deleteitemguid' => ['deleteitemguid', t("GUID"), '', t("The GUID of the item you want to delete."), 'required', 'autofocus'],
                '$baseurl' => System::baseUrl(),
-               '$form_security_token'  => get_form_security_token("admin_deleteitem")
-       ));
+               '$form_security_token' => get_form_security_token("admin_deleteitem")
+       ]);
 }
+
 /**
  * @brief Process send data from Admin Delete Item Page
  *
@@ -391,7 +472,8 @@ function admin_page_deleteitem(App $a) {
  *
  * @param App $a
  */
-function admin_page_deleteitem_post(App $a) {
+function admin_page_deleteitem_post(App $a)
+{
        if (!x($_POST['page_deleteitem_submit'])) {
                return;
        }
@@ -403,19 +485,19 @@ function admin_page_deleteitem_post(App $a) {
                // The GUID should not include a "/", so if there is one, we got an URL
                // and the last part of it is most likely the GUID.
                if (strpos($guid, '/')) {
-                       $guid = substr($guid, strrpos($guid, '/')+1);
+                       $guid = substr($guid, strrpos($guid, '/') + 1);
                }
                // Now that we have the GUID get all IDs of the associated entries in the
                // item table of the DB and drop those items, which will also delete the
                // associated threads.
-               $r = dba::select('item', array('id'), array('guid'=>$guid));
+               $r = dba::select('item', ['id'], ['guid' => $guid]);
                while ($row = dba::fetch($r)) {
                        drop_item($row['id'], false);
                }
                dba::close($r);
        }
 
-       info(t('Item marked for deletion.').EOL);
+       info(t('Item marked for deletion.') . EOL);
        goaway('admin/deleteitem');
        return; // NOTREACHED
 }
@@ -434,7 +516,8 @@ function admin_page_deleteitem_post(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_federation(App $a) {
+function admin_page_federation(App $a)
+{
        // get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
        // social and statusnet nodes this node is knowing
        //
@@ -443,27 +526,32 @@ function admin_page_federation(App $a) {
        // off one % two of them are needed in the query
        // Add more platforms if you like, when one returns 0 known nodes it is not
        // displayed on the stats page.
-       $platforms = array('Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma');
-       $colors    = array('Friendi%%a' => '#ffc018',     // orange from the logo
-                          'Diaspora'  => '#a1a1a1',     // logo is black and white, makes a gray
-                          '%%red%%'   => '#c50001',     // fire red from the logo
-                          'Hubzilla'  => '#43488a',     // blue from the logo
-                          'BlaBlaNet' => '#3B5998',     // blue from the navbar at blablanet-dot-com
-                          'GNU Social'=> '#a22430',     // dark red from the logo
-                          'StatusNet' => '#789240',     // the green from the logo (red and blue have already others
-                          'Mastodon'  => '#1a9df9',    // blue from the Mastodon logo
-                          'Pleroma'  => '#E46F0F');    // Orange from the text that is used on Pleroma instances
-       $counts = array();
+       $platforms = ['Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma', 'socialhome'];
+       $colors = [
+               'Friendi%%a' => '#ffc018', // orange from the logo
+               'Diaspora'   => '#a1a1a1', // logo is black and white, makes a gray
+               '%%red%%'    => '#c50001', // fire red from the logo
+               'Hubzilla'   => '#43488a', // blue from the logo
+               'BlaBlaNet'  => '#3B5998', // blue from the navbar at blablanet-dot-com
+               'GNU Social' => '#a22430', // dark red from the logo
+               'StatusNet'  => '#789240', // the green from the logo (red and blue have already others
+               'Mastodon'   => '#1a9df9', // blue from the Mastodon logo
+               'Pleroma'    => '#E46F0F', // Orange from the text that is used on Pleroma instances
+               'socialhome' => '#52056b'  // lilac from the Django Image used at the Socialhome homepage
+       ];
+       $counts = [];
        $total = 0;
+       $users = 0;
 
        foreach ($platforms as $p) {
                // get a total count for the platform, the name and version of the
                // highest version and the protocol tpe
-               $c = q('SELECT COUNT(*) AS `total`, ANY_VALUE(`platform`) AS `platform`,
+               $c = q('SELECT COUNT(*) AS `total`, SUM(`registered-users`) AS `users`, ANY_VALUE(`platform`) AS `platform`,
                                ANY_VALUE(`network`) AS `network`, MAX(`version`) AS `version` FROM `gserver`
                                WHERE `platform` LIKE "%s" AND `last_contact` >= `last_failure`
                                ORDER BY `version` ASC;', $p);
-               $total = $total + $c[0]['total'];
+               $total += $c[0]['total'];
+               $users += $c[0]['users'];
 
                // what versions for that platform do we know at all?
                // again only the active nodes
@@ -479,15 +567,15 @@ function admin_page_federation(App $a) {
                // to the version string for the displayed list.
                foreach ($v as $key => $value) {
                        if ($v[$key]['version'] == '') {
-                               $v[$key] = array('total'=>$v[$key]['total'], 'version'=>t('unknown'));
+                               $v[$key] = ['total' => $v[$key]['total'], 'version' => t('unknown')];
                        }
                }
                // in the DB the Diaspora versions have the format x.x.x.x-xx the last
                // part (-xx) should be removed to clean up the versions from the "head
                // commit" information and combined into a single entry for x.x.x.x
                if ($p == 'Diaspora') {
-                       $newV = array();
-                       $newVv = array();
+                       $newV = [];
+                       $newVv = [];
                        foreach ($v as $vv) {
                                $newVC = $vv['total'];
                                $newVV = $vv['version'];
@@ -502,7 +590,7 @@ function admin_page_federation(App $a) {
                                }
                        }
                        foreach ($newV as $key => $value) {
-                               array_push($newVv, array('total'=>$value, 'version'=>$key));
+                               array_push($newVv, ['total' => $value, 'version' => $key]);
                        }
                        $v = $newVv;
                }
@@ -511,14 +599,14 @@ function admin_page_federation(App $a) {
                // DB version stamp; those should be operated out and versions be
                // conbined
                if ($p == 'Friendi%%a') {
-                       $newV = array();
-                       $newVv = array();
+                       $newV = [];
+                       $newVv = [];
                        foreach ($v as $vv) {
                                $newVC = $vv['total'];
                                $newVV = $vv['version'];
-                               $lastDot = strrpos($newVV,'.');
-                               $len = strlen($newVV)-1;
-                               if (($lastDot == $len-4) && (!strrpos($newVV,'-rc') == $len-3)) {
+                               $lastDot = strrpos($newVV, '.');
+                               $len = strlen($newVV) - 1;
+                               if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) {
                                        $newVV = substr($newVV, 0, $lastDot);
                                }
                                if (isset($newV[$newVV])) {
@@ -528,7 +616,7 @@ function admin_page_federation(App $a) {
                                }
                        }
                        foreach ($newV as $key => $value) {
-                               array_push($newVv, array('total'=>$value, 'version'=>$key));
+                               array_push($newVv, ['total' => $value, 'version' => $key]);
                        }
                        $v = $newVv;
                }
@@ -538,7 +626,7 @@ function admin_page_federation(App $a) {
 
                // the 3rd array item is needed for the JavaScript graphs as JS does
                // not like some characters in the names of variables...
-               $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p), $colors[$p]);
+               $counts[$p] = [$c[0], $v, str_replace([' ', '%'], '', $p), $colors[$p]];
        }
 
        // some helpful text
@@ -546,8 +634,8 @@ function admin_page_federation(App $a) {
        $hint = t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
 
        // load the template, replace the macros and return the page content
-       $t = get_markup_template("admin_federation.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/federation.tpl');
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Federation Statistics'),
                '$intro' => $intro,
@@ -555,9 +643,9 @@ function admin_page_federation(App $a) {
                '$autoactive' => Config::get('system', 'poco_completion'),
                '$counts' => $counts,
                '$version' => FRIENDICA_VERSION,
-               '$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total),
+               '$legendtext' => t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
                '$baseurl' => System::baseUrl(),
-       ));
+       ]);
 }
 
 /**
@@ -573,18 +661,19 @@ function admin_page_federation(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_queue(App $a) {
+function admin_page_queue(App $a)
+{
        // get content from the queue table
        $r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
                        FROM `queue` AS `q`, `contact` AS `c`
                        WHERE `c`.`id` = `q`.`cid`
                        ORDER BY `q`.`cid`, `q`.`created`;");
 
-       $t = get_markup_template("admin_queue.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/queue.tpl');
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Inspect Queue'),
-               '$count' => sizeof($r),
+               '$count' => count($r),
                'id_header' => t('ID'),
                '$to_header' => t('Recipient Name'),
                '$url_header' => t('Recipient Profile'),
@@ -593,7 +682,7 @@ function admin_page_queue(App $a) {
                '$last_header' => t('Last Tried'),
                '$info' => t('This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently.'),
                '$entries' => $r,
-       ));
+       ]);
 }
 
 /**
@@ -607,33 +696,32 @@ function admin_page_queue(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_summary(App $a) {
+function admin_page_summary(App $a)
+{
        // are there MyISAM tables in the DB? If so, trigger a warning message
-       $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
-               dbesc(dba::database_name()));
+       $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(dba::database_name()));
        $showwarning = false;
-       $warningtext = array();
+       $warningtext = [];
        if (DBM::is_result($r)) {
                $showwarning = true;
-               $warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
+               $warningtext[] = t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php scripts/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
        }
        // Check if github.com/friendica/master/VERSION is higher then
        // the local version of Friendica. Check is opt-in, source may be master or devel branch
-       if (Config::get('system', 'check_new_version_url', 'none') != 'none' ) {
-               $gitversion = Config::get('system','git_friendica_version');
+       if (Config::get('system', 'check_new_version_url', 'none') != 'none') {
+               $gitversion = Config::get('system', 'git_friendica_version');
                if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) {
-                       $warningtext[] = sprintf(t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s'), $FRIENDICA_VERSION, $gitversion);
+                       $warningtext[] = t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion);
                        $showwarning = true;
                }
        }
 
        if (Config::get('system', 'dbupdate', DB_UPDATE_NOT_CHECKED) == DB_UPDATE_NOT_CHECKED) {
-               require_once("include/dbstructure.php");
-               update_structure(false, true);
+               DBStructure::update(false, true);
        }
        if (Config::get('system', 'dbupdate') == DB_UPDATE_FAILED) {
                $showwarning = true;
-               $warningtext[] = t('The database update failed. Please run "php include/dbstructure.php update" from the command line and have a look at the errors that might appear.');
+               $warningtext[] = t('The database update failed. Please run "php scripts/dbstructure.php update" from the command line and have a look at the errors that might appear.');
        }
 
        $last_worker_call = Config::get('system', 'last_poller_execution', false);
@@ -642,26 +730,26 @@ function admin_page_summary(App $a) {
                $warningtext[] = t('The worker was never executed. Please check your database structure!');
        } elseif ((strtotime(datetime_convert()) - strtotime($last_worker_call)) > 60 * 60) {
                $showwarning = true;
-               $warningtext[] = sprintf(t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.'), $last_worker_call);
+               $warningtext[] = t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
        }
 
        $r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
-       $accounts = array(
-               array(t('Normal Account'), 0),
-               array(t('Automatic Follower Account'), 0),
-               array(t('Public Forum Account'), 0),
-               array(t('Automatic Friend Account'), 0),
-               array(t('Blog Account'), 0),
-               array(t('Private Forum Account'), 0)
-       );
-
-       $users=0;
+       $accounts = [
+               [t('Normal Account'), 0],
+               [t('Automatic Follower Account'), 0],
+               [t('Public Forum Account'), 0],
+               [t('Automatic Friend Account'), 0],
+               [t('Blog Account'), 0],
+               [t('Private Forum Account'), 0]
+       ];
+
+       $users = 0;
        foreach ($r as $u) {
                $accounts[$u['page-flags']][1] = $u['count'];
                $users+= $u['count'];
        }
 
-       logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
+       logger('accounts: ' . print_r($accounts, true), LOGGER_DATA);
 
        $r = q("SELECT COUNT(`id`) AS `count` FROM `register`");
        $pending = $r[0]['count'];
@@ -674,26 +762,26 @@ function admin_page_summary(App $a) {
 
        // We can do better, but this is a quick queue status
 
-       $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue);
+       $queues = ['label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue];
 
 
-       $t = get_markup_template("admin_summary.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/summary.tpl');
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Summary'),
                '$queues' => $queues,
-               '$users' => array(t('Registered users'), $users),
+               '$users' => [t('Registered users'), $users],
                '$accounts' => $accounts,
-               '$pending' => array(t('Pending registrations'), $pending),
-               '$version' => array(t('Version'), FRIENDICA_VERSION),
+               '$pending' => [t('Pending registrations'), $pending],
+               '$version' => [t('Version'), FRIENDICA_VERSION],
                '$baseurl' => System::baseUrl(),
                '$platform' => FRIENDICA_PLATFORM,
                '$codename' => FRIENDICA_CODENAME,
-               '$build' =>  Config::get('system','build'),
-               '$plugins' => array(t('Active plugins'), $a->plugins),
+               '$build' => Config::get('system', 'build'),
+               '$plugins' => [t('Active plugins'), $a->plugins],
                '$showwarning' => $showwarning,
                '$warningtext' => $warningtext
-       ));
+       ]);
 }
 
 /**
@@ -701,7 +789,8 @@ function admin_page_summary(App $a) {
  *
  * @param App $a
  */
-function admin_page_site_post(App $a) {
+function admin_page_site_post(App $a)
+{
        check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
 
        if (!empty($_POST['republish_directory'])) {
@@ -709,17 +798,17 @@ function admin_page_site_post(App $a) {
                return;
        }
 
-       if (!x($_POST,"page_site")) {
+       if (!x($_POST, "page_site")) {
                return;
        }
 
        // relocate
-       if (x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url'] != "") {
+       if (x($_POST, 'relocate') && x($_POST, 'relocate_url') && $_POST['relocate_url'] != "") {
                $new_url = $_POST['relocate_url'];
-               $new_url = rtrim($new_url,"/");
+               $new_url = rtrim($new_url, "/");
 
                $parsed = @parse_url($new_url);
-               if (!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
+               if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) {
                        notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
                        goaway('admin/site');
                }
@@ -735,44 +824,41 @@ function admin_page_site_post(App $a) {
                $new_host = str_replace("http://", "@", normalise_link($new_url));
                $old_host = str_replace("http://", "@", normalise_link($old_url));
 
-               function update_table($table_name, $fields, $old_url, $new_url) {
+               function update_table($table_name, $fields, $old_url, $new_url)
+               {
                        global $a;
 
                        $dbold = dbesc($old_url);
                        $dbnew = dbesc($new_url);
 
-                       $upd = array();
+                       $upd = [];
                        foreach ($fields as $f) {
                                $upd[] = "`$f` = REPLACE(`$f`, '$dbold', '$dbnew')";
                        }
 
                        $upds = implode(", ", $upd);
 
-
-
-                       $q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
-                       $r = q($q);
-                       if (!$r) {
-                               notice("Failed updating '$table_name': ".dba::errorMessage());
+                       $r = q("UPDATE %s SET %s;", $table_name, $upds);
+                       if (!DBM::is_result($r)) {
+                               notice("Failed updating '$table_name': " . dba::errorMessage());
                                goaway('admin/site');
                        }
                }
-
                // update tables
                // update profile links in the format "http://server.tld"
-               update_table("profile", array('photo', 'thumb'), $old_url, $new_url);
-               update_table("term", array('url'), $old_url, $new_url);
-               update_table("contact", array('photo','thumb','micro','url','nurl','alias','request','notify','poll','confirm','poco', 'avatar'), $old_url, $new_url);
-               update_table("gcontact", array('url','nurl','photo','server_url','notify','alias'), $old_url, $new_url);
-               update_table("item", array('owner-link','owner-avatar','author-link','author-avatar','body','plink','tag'), $old_url, $new_url);
+               update_table("profile", ['photo', 'thumb'], $old_url, $new_url);
+               update_table("term", ['url'], $old_url, $new_url);
+               update_table("contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url);
+               update_table("gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url);
+               update_table("item", ['owner-link', 'owner-avatar', 'author-link', 'author-avatar', 'body', 'plink', 'tag'], $old_url, $new_url);
 
                // update profile addresses in the format "user@server.tld"
-               update_table("contact", array('addr'), $old_host, $new_host);
-               update_table("gcontact", array('connect','addr'), $old_host, $new_host);
+               update_table("contact", ['addr'], $old_host, $new_host);
+               update_table("gcontact", ['connect', 'addr'], $old_host, $new_host);
 
                // update config
                $a->set_baseurl($new_url);
-               Config::set('system','url',$new_url);
+               Config::set('system', 'url', $new_url);
 
                // send relocate
                $users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0");
@@ -810,10 +896,11 @@ function admin_page_site_post(App $a) {
 
        $allowed_sites          =       ((x($_POST,'allowed_sites'))            ? notags(trim($_POST['allowed_sites']))         : '');
        $allowed_email          =       ((x($_POST,'allowed_email'))            ? notags(trim($_POST['allowed_email']))         : '');
+       $no_oembed_rich_content = x($_POST,'no_oembed_rich_content');
+       $allowed_oembed         =       ((x($_POST,'allowed_oembed'))           ? notags(trim($_POST['allowed_oembed']))                : '');
        $block_public           =       ((x($_POST,'block_public'))             ? True                                          : False);
        $force_publish          =       ((x($_POST,'publish_all'))              ? True                                          : False);
        $global_directory       =       ((x($_POST,'directory'))                ? notags(trim($_POST['directory']))             : '');
-       $thread_allow           =       ((x($_POST,'thread_allow'))             ? True                                          : False);
        $newuser_private                =       ((x($_POST,'newuser_private'))          ? True                                  : False);
        $enotify_no_content             =       ((x($_POST,'enotify_no_content'))       ? True                                  : False);
        $private_addons                 =       ((x($_POST,'private_addons'))           ? True                                  : False);
@@ -873,10 +960,7 @@ function admin_page_site_post(App $a) {
        if ($a->get_path() != "") {
                $diaspora_enabled = false;
        }
-       if (!$thread_allow) {
-               $ostatus_disabled = true;
-       }
-       if ($ssl_policy != intval(Config::get('system','ssl_policy'))) {
+       if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) {
                if ($ssl_policy == SSL_POLICY_FULL) {
                        q("UPDATE `contact` SET
                                `url`     = REPLACE(`url`    , 'http:' , 'https:'),
@@ -915,52 +999,50 @@ function admin_page_site_post(App $a) {
                        );
                }
        }
-       Config::set('system','ssl_policy',$ssl_policy);
-       Config::set('system','maxloadavg',$maxloadavg);
-       Config::set('system','maxloadavg_frontend',$maxloadavg_frontend);
-       Config::set('system','min_memory',$min_memory);
-       Config::set('system','optimize_max_tablesize',$optimize_max_tablesize);
-       Config::set('system','optimize_fragmentation',$optimize_fragmentation);
-       Config::set('system','poco_completion',$poco_completion);
-       Config::set('system','poco_requery_days',$poco_requery_days);
-       Config::set('system','poco_discovery',$poco_discovery);
-       Config::set('system','poco_discovery_since',$poco_discovery_since);
-       Config::set('system','poco_local_search',$poco_local_search);
-       Config::set('system','nodeinfo',$nodeinfo);
-       Config::set('config','sitename',$sitename);
-       Config::set('config','hostname',$hostname);
-       Config::set('config','sender_email', $sender_email);
-       Config::set('system','suppress_tags',$suppress_tags);
-       Config::set('system','shortcut_icon',$shortcut_icon);
-       Config::set('system','touch_icon',$touch_icon);
+       Config::set('system', 'ssl_policy', $ssl_policy);
+       Config::set('system', 'maxloadavg', $maxloadavg);
+       Config::set('system', 'maxloadavg_frontend', $maxloadavg_frontend);
+       Config::set('system', 'min_memory', $min_memory);
+       Config::set('system', 'optimize_max_tablesize', $optimize_max_tablesize);
+       Config::set('system', 'optimize_fragmentation', $optimize_fragmentation);
+       Config::set('system', 'poco_completion', $poco_completion);
+       Config::set('system', 'poco_requery_days', $poco_requery_days);
+       Config::set('system', 'poco_discovery', $poco_discovery);
+       Config::set('system', 'poco_discovery_since', $poco_discovery_since);
+       Config::set('system', 'poco_local_search', $poco_local_search);
+       Config::set('system', 'nodeinfo', $nodeinfo);
+       Config::set('config', 'sitename', $sitename);
+       Config::set('config', 'hostname', $hostname);
+       Config::set('config', 'sender_email', $sender_email);
+       Config::set('system', 'suppress_tags', $suppress_tags);
+       Config::set('system', 'shortcut_icon', $shortcut_icon);
+       Config::set('system', 'touch_icon', $touch_icon);
 
        if ($banner == "") {
                // don't know why, but del_config doesn't work...
-               q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
-                       dbesc("system"),
-                       dbesc("banner")
+               q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", dbesc("system"), dbesc("banner")
                );
        } else {
-               Config::set('system','banner', $banner);
+               Config::set('system', 'banner', $banner);
        }
 
        if ($info == "") {
-               Config::delete('config','info');
+               Config::delete('config', 'info');
        } else {
-               Config::set('config','info',$info);
+               Config::set('config', 'info', $info);
        }
-       Config::set('system','language', $language);
-       Config::set('system','theme', $theme);
+       Config::set('system', 'language', $language);
+       Config::set('system', 'theme', $theme);
 
        if ($theme_mobile == '---') {
-               Config::delete('system','mobile-theme');
+               Config::delete('system', 'mobile-theme');
        } else {
-               Config::set('system','mobile-theme', $theme_mobile);
+               Config::set('system', 'mobile-theme', $theme_mobile);
        }
        if ($singleuser == '---') {
-               Config::delete('system','singleuser');
+               Config::delete('system', 'singleuser');
        } else {
-               Config::set('system','singleuser', $singleuser);
+               Config::set('system', 'singleuser', $singleuser);
        }
        Config::set('system', 'maximagesize', $maximagesize);
        Config::set('system', 'max_image_length', $maximagelength);
@@ -972,9 +1054,10 @@ function admin_page_site_post(App $a) {
        Config::set('config', 'register_text', $register_text);
        Config::set('system', 'allowed_sites', $allowed_sites);
        Config::set('system', 'allowed_email', $allowed_email);
+       Config::set('system', 'no_oembed_rich_content', $no_oembed_rich_content);
+       Config::set('system', 'allowed_oembed', $allowed_oembed);
        Config::set('system', 'block_public', $block_public);
        Config::set('system', 'publish_all', $force_publish);
-       Config::set('system', 'thread_allow', $thread_allow);
        Config::set('system', 'newuser_private', $newuser_private);
        Config::set('system', 'enotify_no_content', $enotify_no_content);
        Config::set('system', 'disable_embedded', $disable_embedded);
@@ -1027,10 +1110,9 @@ function admin_page_site_post(App $a) {
        Config::set('system', 'frontend_worker', $worker_frontend);
        Config::set('system', 'rino_encrypt', $rino);
 
-       info(t('Site settings updated.').EOL);
+       info(t('Site settings updated.') . EOL);
        goaway('admin/site');
        return; // NOTREACHED
-
 }
 
 /**
@@ -1041,29 +1123,29 @@ function admin_page_site_post(App $a) {
  * @param  App $a
  * @return string
  */
-function admin_page_site(App $a) {
-
+function admin_page_site(App $a)
+{
        /* Installed langs */
        $lang_choices = get_available_languages();
 
-       if (strlen(Config::get('system','directory_submit_url')) &&
-               !strlen(Config::get('system','directory'))) {
-                       Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
-                       Config::delete('system','directory_submit_url');
+       if (strlen(Config::get('system', 'directory_submit_url')) &&
+               !strlen(Config::get('system', 'directory'))) {
+               Config::set('system', 'directory', dirname(Config::get('system', 'directory_submit_url')));
+               Config::delete('system', 'directory_submit_url');
        }
 
        /* Installed themes */
-       $theme_choices = array();
-       $theme_choices_mobile = array();
+       $theme_choices = [];
+       $theme_choices_mobile = [];
        $theme_choices_mobile["---"] = t("No special theme for mobile devices");
        $files = glob('view/theme/*');
-       if ($files) {
-
+       if (is_array($files)) {
                $allowed_theme_list = Config::get('system', 'allowed_themes');
 
                foreach ($files as $file) {
-                       if (intval(file_exists($file.'/unsupported')))
+                       if (intval(file_exists($file . '/unsupported'))) {
                                continue;
+                       }
 
                        $f = basename($file);
 
@@ -1072,9 +1154,9 @@ function admin_page_site(App $a) {
                                continue;
                        }
 
-                       $theme_name = ((file_exists($file.'/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
+                       $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
 
-                       if (file_exists($file.'/mobile')) {
+                       if (file_exists($file . '/mobile')) {
                                $theme_choices_mobile[$f] = $theme_name;
                        } else {
                                $theme_choices[$f] = $theme_name;
@@ -1083,38 +1165,29 @@ function admin_page_site(App $a) {
        }
 
        /* Community page style */
-       $community_page_style_choices = array(
+       $community_page_style_choices = [
                CP_NO_COMMUNITY_PAGE => t("No community page"),
                CP_USERS_ON_SERVER => t("Public postings from users of this site"),
-               CP_GLOBAL_COMMUNITY => t("Global community page")
-               );
-
-       /* OStatus conversation poll choices */
-       $ostatus_poll_choices = array(
-               "-2" => t("Never"),
-               "-1" => t("At post arrival"),
-               "0" => t("Frequently"),
-               "60" => t("Hourly"),
-               "720" => t("Twice daily"),
-               "1440" => t("Daily")
-               );
+               CP_GLOBAL_COMMUNITY => t("Public postings from the federated network"),
+               CP_USERS_AND_GLOBAL => t("Public postings from local users and the federated network")
+       ];
 
-       $poco_discovery_choices = array(
+       $poco_discovery_choices = [
                "0" => t("Disabled"),
                "1" => t("Users"),
                "2" => t("Users, Global Contacts"),
                "3" => t("Users, Global Contacts/fallback"),
-               );
+       ];
 
-       $poco_discovery_since_choices = array(
+       $poco_discovery_since_choices = [
                "30" => t("One month"),
                "91" => t("Three months"),
                "182" => t("Half a year"),
                "365" => t("One year"),
-               );
+       ];
 
        /* get user names to make the install a personal install of X */
-       $user_names = array();
+       $user_names = [];
        $user_names['---'] = t('Multi user instance');
        $users = q("SELECT `username`, `nickname` FROM `user`");
        foreach ($users as $user) {
@@ -1122,12 +1195,12 @@ function admin_page_site(App $a) {
        }
 
        /* Banner */
-       $banner = Config::get('system','banner');
+       $banner = Config::get('system', 'banner');
        if ($banner == false) {
                $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
        }
        $banner = htmlspecialchars($banner);
-       $info = Config::get('config','info');
+       $info = Config::get('config', 'info');
        $info = htmlspecialchars($info);
 
        // Automatically create temporary paths
@@ -1137,30 +1210,30 @@ function admin_page_site(App $a) {
        //echo "<pre>"; var_dump($lang_choices); die("</pre>");
 
        /* Register policy */
-       $register_choices = array(
+       $register_choices = [
                REGISTER_CLOSED => t("Closed"),
                REGISTER_APPROVE => t("Requires approval"),
                REGISTER_OPEN => t("Open")
-       );
+       ];
 
-       $ssl_choices = array(
+       $ssl_choices = [
                SSL_POLICY_NONE => t("No SSL policy, links will track page SSL state"),
                SSL_POLICY_FULL => t("Force all links to use SSL"),
                SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
-       );
+       ];
 
-       $check_git_version_choices = array(
+       $check_git_version_choices = [
                "none" => t("Don't check"),
                "master" => t("check the stable version"),
                "develop" => t("check the development version")
-       );
+       ];
 
        if ($a->config['hostname'] == "") {
                $a->config['hostname'] = $a->get_hostname();
        }
        $diaspora_able = ($a->get_path() == "");
 
-       $optimize_max_tablesize = Config::get('system','optimize_max_tablesize', 100);
+       $optimize_max_tablesize = Config::get('system', 'optimize_max_tablesize', 100);
 
        if ($optimize_max_tablesize < -1) {
                $optimize_max_tablesize = -1;
@@ -1170,8 +1243,8 @@ function admin_page_site(App $a) {
                $optimize_max_tablesize = 100;
        }
 
-       $t = get_markup_template("admin_site.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/site.tpl');
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Site'),
                '$submit' => t('Save Settings'),
@@ -1183,95 +1256,94 @@ function admin_page_site(App $a) {
                '$portable_contacts' => t('Auto Discovered Contact Directory'),
                '$performance' => t('Performance'),
                '$worker_title' => t('Worker'),
-               '$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
+               '$relocate' => t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
                '$baseurl' => System::baseUrl(true),
                // name, label, value, help string, extra data...
-               '$sitename'             => array('sitename', t("Site name"), $a->config['sitename'],''),
-               '$hostname'             => array('hostname', t("Host name"), $a->config['hostname'], ""),
-               '$sender_email'         => array('sender_email', t("Sender Email"), $a->config['sender_email'], t("The email address your server shall use to send notification emails from."), "", "", "email"),
-               '$banner'               => array('banner', t("Banner/Logo"), $banner, ""),
-               '$shortcut_icon'        => array('shortcut_icon', t("Shortcut icon"), Config::get('system','shortcut_icon'),  t("Link to an icon that will be used for browsers.")),
-               '$touch_icon'           => array('touch_icon', t("Touch icon"), Config::get('system','touch_icon'),  t("Link to an icon that will be used for tablets and mobiles.")),
-               '$info'                 => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())),
-               '$language'             => array('language', t("System language"), Config::get('system','language'), "", $lang_choices),
-               '$theme'                => array('theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
-               '$theme_mobile'         => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
-               '$ssl_policy'           => array('ssl_policy', t("SSL link policy"), (string) intval(Config::get('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
-               '$force_ssl'            => array('force_ssl', t("Force SSL"), Config::get('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
-               '$hide_help'            => array('hide_help', t("Hide help entry from navigation menu"), Config::get('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
-               '$singleuser'           => array('singleuser', t("Single user instance"), Config::get('system', 'singleuser', '---'), t("Make this instance multi-user or single-user for the named user"), $user_names),
-               '$maximagesize'         => array('maximagesize', t("Maximum image size"), Config::get('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
-               '$maximagelength'       => array('maximagelength', t("Maximum image length"), Config::get('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
-               '$jpegimagequality'     => array('jpegimagequality', t("JPEG image quality"), Config::get('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
-
-               '$register_policy'      => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
-               '$daily_registrations'  => array('max_daily_registrations', t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), 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'        => array('register_text', t("Register text"), $a->config['register_text'], t("Will be displayed prominently on the registration page.")),
-               '$abandon_days'         => array('abandon_days', t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
-               '$allowed_sites'        => array('allowed_sites', t("Allowed friend domains"), Config::get('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
-               '$allowed_email'        => array('allowed_email', t("Allowed email domains"), Config::get('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
-               '$block_public'         => array('block_public', t("Block public"), Config::get('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
-               '$force_publish'        => array('publish_all', t("Force publish"), Config::get('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
-               '$global_directory'     => array('directory', t("Global directory URL"), Config::get('system','directory'), t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")),
-               '$thread_allow'         => array('thread_allow', t("Allow threaded items"), Config::get('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
-               '$newuser_private'      => array('newuser_private', t("Private posts by default for new users"), Config::get('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
-               '$enotify_no_content'   => array('enotify_no_content', t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
-               '$private_addons'       => array('private_addons', t("Disallow public access to addons listed in the apps menu."), Config::get('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
-               '$disable_embedded'     => array('disable_embedded', t("Don't embed private images in posts"), Config::get('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")),
-               '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')),
-               '$no_multi_reg'         => array('no_multi_reg', t("Block multiple registrations"),  Config::get('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
-               '$no_openid'            => array('no_openid', t("OpenID support"), !Config::get('system','no_openid'), t("OpenID support for registration and logins.")),
-               '$no_regfullname'       => array('no_regfullname', t("Fullname check"), !Config::get('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
-               '$community_page_style' => array('community_page_style', t("Community Page Style"), Config::get('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
-               '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
-               '$ostatus_disabled'     => array('ostatus_disabled', t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
-               '$ostatus_full_threads' => array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
+               '$sitename'             => ['sitename', t("Site name"), $a->config['sitename'],''],
+               '$hostname'             => ['hostname', t("Host name"), $a->config['hostname'], ""],
+               '$sender_email'         => ['sender_email', t("Sender Email"), $a->config['sender_email'], t("The email address your server shall use to send notification emails from."), "", "", "email"],
+               '$banner'               => ['banner', t("Banner/Logo"), $banner, ""],
+               '$shortcut_icon'        => ['shortcut_icon', t("Shortcut icon"), Config::get('system','shortcut_icon'),  t("Link to an icon that will be used for browsers.")],
+               '$touch_icon'           => ['touch_icon', t("Touch icon"), Config::get('system','touch_icon'),  t("Link to an icon that will be used for tablets and mobiles.")],
+               '$info'                 => ['info', t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())],
+               '$language'             => ['language', t("System language"), Config::get('system','language'), "", $lang_choices],
+               '$theme'                => ['theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices],
+               '$theme_mobile'         => ['theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile],
+               '$ssl_policy'           => ['ssl_policy', t("SSL link policy"), (string) intval(Config::get('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices],
+               '$force_ssl'            => ['force_ssl', t("Force SSL"), Config::get('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")],
+               '$hide_help'            => ['hide_help', t("Hide help entry from navigation menu"), Config::get('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")],
+               '$singleuser'           => ['singleuser', t("Single user instance"), Config::get('system', 'singleuser', '---'), t("Make this instance multi-user or single-user for the named user"), $user_names],
+               '$maximagesize'         => ['maximagesize', t("Maximum image size"), Config::get('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")],
+               '$maximagelength'       => ['maximagelength', t("Maximum image length"), Config::get('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")],
+               '$jpegimagequality'     => ['jpegimagequality', t("JPEG image quality"), Config::get('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")],
+
+               '$register_policy'      => ['register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices],
+               '$daily_registrations'  => ['max_daily_registrations', t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), 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', t("Register text"), $a->config['register_text'], t("Will be displayed prominently on the registration page.")],
+               '$abandon_days'         => ['abandon_days', t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
+               '$allowed_sites'        => ['allowed_sites', t("Allowed friend domains"), Config::get('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")],
+               '$allowed_email'        => ['allowed_email', t("Allowed email domains"), Config::get('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")],
+               '$no_oembed_rich_content' => ['no_oembed_rich_content', t("No OEmbed rich content"), Config::get('system','no_oembed_rich_content'), t("Don't show the rich content (e.g. embedded PDF), except from the domains listed below.")],
+               '$allowed_oembed'       => ['allowed_oembed', t("Allowed OEmbed domains"), Config::get('system','allowed_oembed'), t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")],
+               '$block_public'         => ['block_public', t("Block public"), Config::get('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")],
+               '$force_publish'        => ['publish_all', t("Force publish"), Config::get('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")],
+               '$global_directory'     => ['directory', t("Global directory URL"), Config::get('system','directory'), t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")],
+               '$newuser_private'      => ['newuser_private', t("Private posts by default for new users"), Config::get('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")],
+               '$enotify_no_content'   => ['enotify_no_content', t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")],
+               '$private_addons'       => ['private_addons', t("Disallow public access to addons listed in the apps menu."), Config::get('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")],
+               '$disable_embedded'     => ['disable_embedded', t("Don't embed private images in posts"), Config::get('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")],
+               '$allow_users_remote_self' => ['allow_users_remote_self', t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')],
+               '$no_multi_reg'         => ['no_multi_reg', t("Block multiple registrations"),  Config::get('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")],
+               '$no_openid'            => ['no_openid', t("OpenID support"), !Config::get('system','no_openid'), t("OpenID support for registration and logins.")],
+               '$no_regfullname'       => ['no_regfullname', t("Fullname check"), !Config::get('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")],
+               '$community_page_style' => ['community_page_style', t("Community pages for visitors"), Config::get('system','community_page_style'), t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices],
+               '$max_author_posts_community_page' => ['max_author_posts_community_page', t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")],
+               '$ostatus_disabled'     => ['ostatus_disabled', t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")],
+               '$ostatus_full_threads' => ['ostatus_full_threads', t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")],
                '$ostatus_not_able'     => t("OStatus support can only be enabled if threading is enabled."),
                '$diaspora_able'        => $diaspora_able,
                '$diaspora_not_able'    => t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
-               '$diaspora_enabled'     => array('diaspora_enabled', t("Enable Diaspora support"), Config::get('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
-               '$dfrn_only'            => array('dfrn_only', t('Only allow Friendica contacts'), Config::get('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
-               '$verifyssl'            => array('verifyssl', t("Verify SSL"), Config::get('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
-               '$proxyuser'            => array('proxyuser', t("Proxy user"), Config::get('system','proxyuser'), ""),
-               '$proxy'                => array('proxy', t("Proxy URL"), Config::get('system','proxy'), ""),
-               '$timeout'              => array('timeout', t("Network timeout"), (x(Config::get('system','curl_timeout'))?Config::get('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
-               '$maxloadavg'           => array('maxloadavg', t("Maximum Load Average"), ((intval(Config::get('system','maxloadavg')) > 0)?Config::get('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
-               '$maxloadavg_frontend'  => array('maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(Config::get('system','maxloadavg_frontend')) > 0)?Config::get('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
-               '$min_memory'           => array('min_memory', t("Minimal Memory"), ((intval(Config::get('system','min_memory')) > 0)?Config::get('system','min_memory'):0), t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).")),
-               '$optimize_max_tablesize'=> array('optimize_max_tablesize', t("Maximum table size for optimization"), $optimize_max_tablesize, t("Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it.")),
-               '$optimize_fragmentation'=> array('optimize_fragmentation', t("Minimum level of fragmentation"), ((intval(Config::get('system','optimize_fragmentation')) > 0)?Config::get('system','optimize_fragmentation'):30), t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")),
-
-               '$poco_completion'      => array('poco_completion', t("Periodical check of global contacts"), Config::get('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
-               '$poco_requery_days'    => array('poco_requery_days', t("Days between requery"), Config::get('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),
-               '$poco_discovery'       => array('poco_discovery', t("Discover contacts from other servers"), (string) intval(Config::get('system','poco_discovery')), t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices),
-               '$poco_discovery_since' => array('poco_discovery_since', t("Timeframe for fetching global contacts"), (string) intval(Config::get('system','poco_discovery_since')), t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices),
-               '$poco_local_search'    => array('poco_local_search', t("Search the local directory"), Config::get('system','poco_local_search'), t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")),
-
-               '$nodeinfo'             => array('nodeinfo', t("Publish server information"), Config::get('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details.")),
-
-               '$check_new_version_url' => array('check_new_version_url', t("Check upstream version"), Config::get('system', 'check_new_version_url'), t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices),
-               '$suppress_tags'        => array('suppress_tags', t("Suppress Tags"), Config::get('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
-               '$itemcache'            => array('itemcache', t("Path to item cache"), Config::get('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
-               '$itemcache_duration'   => array('itemcache_duration', t("Cache duration in seconds"), Config::get('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
-               '$max_comments'         => array('max_comments', t("Maximum numbers of comments per post"), Config::get('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
-               '$temppath'             => array('temppath', t("Temp path"), Config::get('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
-               '$basepath'             => array('basepath', t("Base path to installation"), Config::get('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
-               '$proxy_disabled'       => array('proxy_disabled', t("Disable picture proxy"), Config::get('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
-               '$only_tag_search'      => array('only_tag_search', t("Only search in tags"), Config::get('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
-
-               '$relocate_url'         => array('relocate_url', t("New base url"), System::baseUrl(), t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")),
-
-               '$rino'                 => array('rino', t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
-
-               '$worker_queues'        => array('worker_queues', t("Maximum number of parallel workers"), Config::get('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
-               '$worker_dont_fork'     => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")),
-               '$worker_fastlane'      => array('worker_fastlane', t("Enable fastlane"), Config::get('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")),
-               '$worker_frontend'      => array('worker_frontend', t('Enable frontend worker'), Config::get('system','frontend_worker'), sprintf(t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.'), System::baseUrl())),
+               '$diaspora_enabled'     => ['diaspora_enabled', t("Enable Diaspora support"), Config::get('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")],
+               '$dfrn_only'            => ['dfrn_only', t('Only allow Friendica contacts'), Config::get('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")],
+               '$verifyssl'            => ['verifyssl', t("Verify SSL"), Config::get('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")],
+               '$proxyuser'            => ['proxyuser', t("Proxy user"), Config::get('system','proxyuser'), ""],
+               '$proxy'                => ['proxy', t("Proxy URL"), Config::get('system','proxy'), ""],
+               '$timeout'              => ['timeout', t("Network timeout"), (x(Config::get('system','curl_timeout'))?Config::get('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")],
+               '$maxloadavg'           => ['maxloadavg', t("Maximum Load Average"), ((intval(Config::get('system','maxloadavg')) > 0)?Config::get('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")],
+               '$maxloadavg_frontend'  => ['maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(Config::get('system','maxloadavg_frontend')) > 0)?Config::get('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")],
+               '$min_memory'           => ['min_memory', t("Minimal Memory"), ((intval(Config::get('system','min_memory')) > 0)?Config::get('system','min_memory'):0), t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).")],
+               '$optimize_max_tablesize'=> ['optimize_max_tablesize', t("Maximum table size for optimization"), $optimize_max_tablesize, t("Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it.")],
+               '$optimize_fragmentation'=> ['optimize_fragmentation', t("Minimum level of fragmentation"), ((intval(Config::get('system','optimize_fragmentation')) > 0)?Config::get('system','optimize_fragmentation'):30), t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")],
+
+               '$poco_completion'      => ['poco_completion', t("Periodical check of global contacts"), Config::get('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")],
+               '$poco_requery_days'    => ['poco_requery_days', t("Days between requery"), Config::get('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")],
+               '$poco_discovery'       => ['poco_discovery', t("Discover contacts from other servers"), (string) intval(Config::get('system','poco_discovery')), t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices],
+               '$poco_discovery_since' => ['poco_discovery_since', t("Timeframe for fetching global contacts"), (string) intval(Config::get('system','poco_discovery_since')), t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices],
+               '$poco_local_search'    => ['poco_local_search', t("Search the local directory"), Config::get('system','poco_local_search'), t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")],
+
+               '$nodeinfo'             => ['nodeinfo', t("Publish server information"), Config::get('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details.")],
+
+               '$check_new_version_url' => ['check_new_version_url', t("Check upstream version"), Config::get('system', 'check_new_version_url'), t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices],
+               '$suppress_tags'        => ['suppress_tags', t("Suppress Tags"), Config::get('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")],
+               '$itemcache'            => ['itemcache', t("Path to item cache"), Config::get('system','itemcache'), t("The item caches buffers generated bbcode and external images.")],
+               '$itemcache_duration'   => ['itemcache_duration', t("Cache duration in seconds"), Config::get('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")],
+               '$max_comments'         => ['max_comments', t("Maximum numbers of comments per post"), Config::get('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")],
+               '$temppath'             => ['temppath', t("Temp path"), Config::get('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")],
+               '$basepath'             => ['basepath', t("Base path to installation"), Config::get('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")],
+               '$proxy_disabled'       => ['proxy_disabled', t("Disable picture proxy"), Config::get('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")],
+               '$only_tag_search'      => ['only_tag_search', t("Only search in tags"), Config::get('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")],
+
+               '$relocate_url'         => ['relocate_url', t("New base url"), System::baseUrl(), t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")],
+
+               '$rino'                 => ['rino', t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), t("Encryption layer between nodes."), ["Disabled", "RINO1 (deprecated)", "RINO2"]],
+
+               '$worker_queues'        => ['worker_queues', t("Maximum number of parallel workers"), Config::get('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")],
+               '$worker_dont_fork'     => ['worker_dont_fork', t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")],
+               '$worker_fastlane'      => ['worker_fastlane', t("Enable fastlane"), Config::get('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")],
+               '$worker_frontend'      => ['worker_frontend', t('Enable frontend worker'), Config::get('system','frontend_worker'), t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.', System::baseUrl())],
 
                '$form_security_token'  => get_form_security_token("admin_site")
-
-       ));
-
+       ]);
 }
 
 /**
@@ -1285,30 +1357,28 @@ function admin_page_site(App $a) {
  *
  * @param App $a
  * @return string
- **/
-function admin_page_dbsync(App $a) {
-
+ * */
+function admin_page_dbsync(App $a)
+{
        $o = '';
 
        if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
-               Config::set('database', 'update_'.intval($a->argv[3]), 'success');
-               $curr = Config::get('system','build');
+               Config::set('database', 'update_' . intval($a->argv[3]), 'success');
+               $curr = Config::get('system', 'build');
                if (intval($curr) == intval($a->argv[3])) {
-                       Config::set('system','build',intval($curr) + 1);
+                       Config::set('system', 'build', intval($curr) + 1);
                }
-               info(t('Update has been marked successful').EOL);
+               info(t('Update has been marked successful') . EOL);
                goaway('admin/dbsync');
        }
 
        if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
-               require_once("include/dbstructure.php");
-               $retval = update_structure(false, true);
-               if (!$retval) {
-                       $o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />";
-                       Config::set('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success');
+               $retval = DBStructure::update(false, true);
+               if ($retval === '') {
+                       $o .= t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />";
+                       Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
                } else {
-                       $o .= sprintf(t("Executing of database structure update %s failed with error: %s"),
-                                       DB_UPDATE_VERSION, $retval)."<br />";
+                       $o .= t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />";
                }
                if ($a->argv[2] === 'check') {
                        return $o;
@@ -1316,56 +1386,54 @@ function admin_page_dbsync(App $a) {
        }
 
        if ($a->argc > 2 && intval($a->argv[2])) {
-               require_once('update.php');
-               $func = 'update_'.intval($a->argv[2]);
+               require_once 'update.php';
+               $func = 'update_' . intval($a->argv[2]);
                if (function_exists($func)) {
                        $retval = $func();
                        if ($retval === UPDATE_FAILED) {
-                               $o .= sprintf(t("Executing %s failed with error: %s"), $func, $retval);
-                       }
-                       elseif ($retval === UPDATE_SUCCESS) {
-                               $o .= sprintf(t('Update %s was successfully applied.', $func));
-                               Config::set('database',$func, 'success');
+                               $o .= t("Executing %s failed with error: %s", $func, $retval);
+                       } elseif ($retval === UPDATE_SUCCESS) {
+                               $o .= t('Update %s was successfully applied.', $func);
+                               Config::set('database', $func, 'success');
                        } else {
-                               $o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
+                               $o .= t('Update %s did not return a status. Unknown if it succeeded.', $func);
                        }
                } else {
-                       $o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />";
-                       Config::set('database',$func, 'success');
+                       $o .= t('There was no additional update function %s that needed to be called.', $func) . "<br />";
+                       Config::set('database', $func, 'success');
                }
                return $o;
        }
 
-       $failed = array();
+       $failed = [];
        $r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
-                       $upd = intval(substr($rr['k'],7));
+                       $upd = intval(substr($rr['k'], 7));
                        if ($upd < 1139 || $rr['v'] === 'success') {
                                continue;
                        }
                        $failed[] = $upd;
                }
        }
-       if (! count($failed)) {
-               $o = replace_macros(get_markup_template('structure_check.tpl'),array(
-                       '$base'   => System::baseUrl(true),
+       if (!count($failed)) {
+               $o = replace_macros(get_markup_template('structure_check.tpl'), [
+                       '$base' => System::baseUrl(true),
                        '$banner' => t('No failed updates.'),
-                       '$check'  => t('Check database structure'),
-               ));
+                       '$check' => t('Check database structure'),
+               ]);
        } else {
-               $o = replace_macros(get_markup_template('failed_updates.tpl'),array(
-                       '$base'   => System::baseUrl(true),
+               $o = replace_macros(get_markup_template('failed_updates.tpl'), [
+                       '$base' => System::baseUrl(true),
                        '$banner' => t('Failed Updates'),
-                       '$desc'   => t('This does not include updates prior to 1139, which did not return a status.'),
-                       '$mark'   => t('Mark success (if update was manually applied)'),
-                       '$apply'  => t('Attempt to execute this update step automatically'),
+                       '$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
+                       '$mark' => t('Mark success (if update was manually applied)'),
+                       '$apply' => t('Attempt to execute this update step automatically'),
                        '$failed' => $failed
-               ));
+               ]);
        }
 
        return $o;
-
 }
 
 /**
@@ -1373,26 +1441,32 @@ function admin_page_dbsync(App $a) {
  *
  * @param App $a
  */
-function admin_page_users_post(App $a) {
-       $pending     = (x($_POST, 'pending')           ? $_POST['pending']           : array());
-       $users       = (x($_POST, 'user')              ? $_POST['user']               : array());
-       $nu_name     = (x($_POST, 'new_user_name')     ? $_POST['new_user_name']     : '');
-       $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
-       $nu_email    = (x($_POST, 'new_user_email')    ? $_POST['new_user_email']    : '');
+function admin_page_users_post(App $a)
+{
+       $pending     = defaults($_POST, 'pending'          , []);
+       $users       = defaults($_POST, 'user'             , []);
+       $nu_name     = defaults($_POST, 'new_user_name'    , '');
+       $nu_nickname = defaults($_POST, 'new_user_nickname', '');
+       $nu_email    = defaults($_POST, 'new_user_email'   , '');
        $nu_language = Config::get('system', 'language');
 
        check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
 
        if (!($nu_name === "") && !($nu_email === "") && !($nu_nickname === "")) {
-               require_once('include/user.php');
-
-               $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email,
-                       'nickname'=>$nu_nickname, 'verified'=>1, 'language'=>$nu_language));
-               if (! $result['success']) {
-                       notice($result['message']);
+               try {
+                       $result = User::create([
+                               'username' => $nu_name,
+                               'email' => $nu_email,
+                               'nickname' => $nu_nickname,
+                               'verified' => 1,
+                               'language' => $nu_language
+                       ]);
+               } catch (Exception $ex) {
+                       notice($ex->getMessage());
                        return;
                }
-               $nu = $result['user'];
+
+               $user = $result['user'];
                $preamble = deindent(t('
                        Dear %1$s,
                                the administrator of %2$s has set up an account for you.'));
@@ -1422,42 +1496,39 @@ function admin_page_users_post(App $a) {
 
                        Thank you and welcome to %4$s.'));
 
-               $preamble = sprintf($preamble, $nu['username'], $a->config['sitename']);
-               $body = sprintf($body, System::baseUrl(), $nu['email'], $result['password'], $a->config['sitename']);
+               $preamble = sprintf($preamble, $user['username'], $a->config['sitename']);
+               $body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], $a->config['sitename']);
 
-               notification(array(
+               notification([
                        'type' => SYSTEM_EMAIL,
-                       'to_email' => $nu['email'],
-                       'subject'=> sprintf(t('Registration details for %s'), $a->config['sitename']),
-                       'preamble'=> $preamble,
-                       'body' => $body));
-
+                       'to_email' => $user['email'],
+                       'subject' => t('Registration details for %s', $a->config['sitename']),
+                       'preamble' => $preamble,
+                       'body' => $body]);
        }
 
-       if (x($_POST,'page_users_block')) {
+       if (x($_POST, 'page_users_block')) {
                foreach ($users as $uid) {
-                       q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s",
-                               intval($uid)
+                       q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid)
                        );
                }
-               notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
+               notice(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)));
        }
-       if (x($_POST,'page_users_delete')) {
-               require_once("include/Contact.php");
+       if (x($_POST, 'page_users_delete')) {
                foreach ($users as $uid) {
-                       user_remove($uid);
+                       User::remove($uid);
                }
-               notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
+               notice(tt("%s user deleted", "%s users deleted", count($users)));
        }
 
-       if (x($_POST,'page_users_approve')) {
-               require_once("mod/regmod.php");
+       if (x($_POST, 'page_users_approve')) {
+               require_once "mod/regmod.php";
                foreach ($pending as $hash) {
                        user_allow($hash);
                }
        }
-       if (x($_POST,'page_users_deny')) {
-               require_once("mod/regmod.php");
+       if (x($_POST, 'page_users_deny')) {
+               require_once "mod/regmod.php";
                foreach ($pending as $hash) {
                        user_deny($hash);
                }
@@ -1478,43 +1549,42 @@ function admin_page_users_post(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_users(App $a) {
-       if ($a->argc>2) {
+function admin_page_users(App $a)
+{
+       if ($a->argc > 2) {
                $uid = $a->argv[3];
-               $user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
-               if (count($user) == 0) {
-                       notice('User not found'.EOL);
+               $user = dba::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
+               if (DBM::is_result($user)) {
+                       notice('User not found' . EOL);
                        goaway('admin/users');
                        return ''; // NOTREACHED
                }
-               switch($a->argv[2]) {
+               switch ($a->argv[2]) {
                        case "delete":
                                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
                                // delete user
-                               require_once("include/Contact.php");
-                               user_remove($uid);
+                               User::remove($uid);
 
-                               notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL);
+                               notice(t("User '%s' deleted", $user['username']) . EOL);
                                break;
                        case "block":
                                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
                                q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
-                                       intval(1-$user[0]['blocked']),
+                                       intval(1 - $user['blocked']),
                                        intval($uid)
                                );
-                               notice(sprintf(($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']).EOL);
+                               notice(sprintf(($user['blocked'] ? t("User '%s' unblocked") : t("User '%s' blocked")), $user['username']) . EOL);
                                break;
                }
                goaway('admin/users');
                return ''; // NOTREACHED
-
        }
 
        /* get pending */
        $pending = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
                                 FROM `register`
-                                LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
-                                LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
+                                INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
+                                INNER JOIN `user` ON `register`.`uid` = `user`.`uid`;");
 
 
        /* get users */
@@ -1525,53 +1595,46 @@ function admin_page_users(App $a) {
        }
 
        /* ordering */
-       $valid_orders = array(
+       $valid_orders = [
                'contact.name',
                'user.email',
                'user.register_date',
                'user.login_date',
                'lastitem_date',
                'user.page-flags'
-       );
+       ];
 
        $order = "contact.name";
        $order_direction = "+";
-       if (x($_GET,'o')) {
+       if (x($_GET, 'o')) {
                $new_order = $_GET['o'];
                if ($new_order[0] === "-") {
                        $order_direction = "-";
-                       $new_order = substr($new_order,1);
+                       $new_order = substr($new_order, 1);
                }
 
                if (in_array($new_order, $valid_orders)) {
                        $order = $new_order;
                }
-               if (x($_GET,'d')) {
-                       $new_direction = $_GET['d'];
-               }
        }
-       $sql_order = "`".str_replace('.','`.`',$order)."`";
-       $sql_order_direction = ($order_direction === "+")?"ASC":"DESC";
+       $sql_order = "`" . str_replace('.', '`.`', $order) . "`";
+       $sql_order_direction = ($order_direction === "+") ? "ASC" : "DESC";
 
        $users = q("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date`
                                FROM `user`
                                INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                                WHERE `user`.`verified`
-                               ORDER BY $sql_order $sql_order_direction LIMIT %d, %d",
-                               intval($a->pager['start']),
-                               intval($a->pager['itemspage'])
-                               );
-
-       //echo "<pre>$users"; killme();
+                               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']));
        $_setup_users = function ($e) use ($adminlist) {
-               $accounts = array(
+               $accounts = [
                        t('Normal Account'),
                        t('Automatic Follower Account'),
                        t('Public Forum Account'),
-                                               t('Automatic Friend Account')
-               );
+                       t('Automatic Friend Account')
+               ];
                $e['page-flags'] = $accounts[$e['page-flags']];
                $e['register_date'] = relative_date($e['register_date']);
                $e['login_date'] = relative_date($e['login_date']);
@@ -1579,7 +1642,7 @@ function admin_page_users(App $a) {
                //$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']?relative_date($e['account_expires_on']):False);
+               $e['deleted'] = ($e['account_removed'] ? relative_date($e['account_expires_on']) : False);
                return $e;
        };
        $users = array_map($_setup_users, $users);
@@ -1588,13 +1651,13 @@ function admin_page_users(App $a) {
        // Get rid of dashes in key names, Smarty3 can't handle them
        // and extracting deleted users
 
-       $tmp_users = array();
-       $deleted = array();
+       $tmp_users = [];
+       $deleted = [];
 
        while (count($users)) {
-               $new_user = array();
+               $new_user = [];
                foreach (array_pop($users) as $k => $v) {
-                       $k = str_replace('-','_',$k);
+                       $k = str_replace('-', '_', $k);
                        $new_user[$k] = $v;
                }
                if ($new_user['deleted']) {
@@ -1609,13 +1672,11 @@ function admin_page_users(App $a) {
                array_push($users, array_pop($tmp_users));
        }
 
-       $th_users = array_map(null,
-               array(t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account')),
-               $valid_orders
+       $th_users = array_map(null, [t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account')], $valid_orders
        );
 
-       $t = get_markup_template("admin_users.tpl");
-       $o = replace_macros($t, array(
+       $t = get_markup_template('admin/users.tpl');
+       $o = replace_macros($t, [
                // strings //
                '$title' => t('Administration'),
                '$page' => t('Users'),
@@ -1623,8 +1684,8 @@ function admin_page_users(App $a) {
                '$select_all' => t('select all'),
                '$h_pending' => t('User registrations waiting for confirm'),
                '$h_deleted' => t('User waiting for permanent deletion'),
-               '$th_pending' => array(t('Request date'), t('Name'), t('Email')),
-               '$no_pending' =>  t('No registrations.'),
+               '$th_pending' => [t('Request date'), t('Name'), t('Email')],
+               '$no_pending' => t('No registrations.'),
                '$pendingnotetext' => t('Note from the user'),
                '$approve' => t('Approve'),
                '$deny' => t('Deny'),
@@ -1636,7 +1697,7 @@ function admin_page_users(App $a) {
 
                '$h_users' => t('Users'),
                '$h_newuser' => t('New User'),
-               '$th_deleted' => array(t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Deleted since')),
+               '$th_deleted' => [t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Deleted since')],
                '$th_users' => $th_users,
                '$order_users' => $order,
                '$order_direction_users' => $order_direction,
@@ -1652,15 +1713,14 @@ function admin_page_users(App $a) {
                '$pending' => $pending,
                'deleted' => $deleted,
                '$users' => $users,
-               '$newusername' => array('new_user_name', t("Name"), '', t("Name of the new user.")),
-               '$newusernickname' => array('new_user_nickname', t("Nickname"), '', t("Nickname of the new user.")),
-               '$newuseremail' => array('new_user_email', t("Email"), '', t("Email address of the new user."), '', '', 'email'),
-       ));
+               '$newusername' => ['new_user_name', t("Name"), '', t("Name of the new user.")],
+               '$newusernickname' => ['new_user_nickname', t("Nickname"), '', t("Nickname of the new user.")],
+               '$newuseremail' => ['new_user_email', t("Email"), '', t("Email address of the new user."), '', '', 'email'],
+       ]);
        $o .= paginate($a);
        return $o;
 }
 
-
 /**
  * @brief Plugins admin page
  *
@@ -1677,8 +1737,8 @@ function admin_page_users(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_plugins(App $a) {
-
+function admin_page_plugins(App $a)
+{
        /*
         * Single plugin
         */
@@ -1689,7 +1749,7 @@ function admin_page_plugins(App $a) {
                        return '';
                }
 
-               if (x($_GET,"a") && $_GET['a']=="t") {
+               if (x($_GET, "a") && $_GET['a'] == "t") {
                        check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
 
                        // Toggle plugin status
@@ -1697,44 +1757,43 @@ function admin_page_plugins(App $a) {
                        if ($idx !== false) {
                                unset($a->plugins[$idx]);
                                uninstall_plugin($plugin);
-                               info(sprintf(t("Plugin %s disabled."), $plugin));
+                               info(t("Plugin %s disabled.", $plugin));
                        } else {
                                $a->plugins[] = $plugin;
                                install_plugin($plugin);
-                               info(sprintf(t("Plugin %s enabled."), $plugin));
+                               info(t("Plugin %s enabled.", $plugin));
                        }
-                       Config::set("system","addon", implode(", ",$a->plugins));
+                       Config::set("system", "addon", implode(", ", $a->plugins));
                        goaway('admin/plugins');
                        return ''; // NOTREACHED
                }
 
                // display plugin details
-               require_once('library/markdown.php');
-
                if (in_array($plugin, $a->plugins)) {
-                       $status="on"; $action= t("Disable");
+                       $status = "on";
+                       $action = t("Disable");
                } else {
-                       $status="off"; $action= t("Enable");
+                       $status = "off";
+                       $action = t("Enable");
                }
 
-               $readme=Null;
+               $readme = Null;
                if (is_file("addon/$plugin/README.md")) {
-                       $readme = file_get_contents("addon/$plugin/README.md");
-                       $readme = Markdown($readme, false);
+                       $readme = Markdown::convert(file_get_contents("addon/$plugin/README.md"), false);
                } elseif (is_file("addon/$plugin/README")) {
-                       $readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
+                       $readme = "<pre>" . file_get_contents("addon/$plugin/README") . "</pre>";
                }
 
-               $admin_form="";
-               if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
+               $admin_form = "";
+               if (in_array($plugin, $a->plugins_admin)) {
                        @require_once("addon/$plugin/$plugin.php");
-                       $func = $plugin.'_plugin_admin';
+                       $func = $plugin . '_plugin_admin';
                        $func($a, $admin_form);
                }
 
-               $t = get_markup_template("admin_plugins_details.tpl");
+               $t = get_markup_template('admin/plugins_details.tpl');
 
-               return replace_macros($t, array(
+               return replace_macros($t, [
                        '$title' => t('Administration'),
                        '$page' => t('Plugins'),
                        '$toggle' => t('Toggle'),
@@ -1754,33 +1813,30 @@ function admin_page_plugins(App $a) {
                        '$readme' => $readme,
 
                        '$form_security_token' => get_form_security_token("admin_themes"),
-               ));
+               ]);
        }
 
-
-
        /*
         * List plugins
         */
-
-       if (x($_GET,"a") && $_GET['a']=="r") {
-               check_form_security_token_redirectOnErr(System::baseUrl().'/admin/plugins', 'admin_themes', 't');
+       if (x($_GET, "a") && $_GET['a'] == "r") {
+               check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/plugins', 'admin_themes', 't');
                reload_plugins();
                info("Plugins reloaded");
-               goaway(System::baseUrl().'/admin/plugins');
+               goaway(System::baseUrl() . '/admin/plugins');
        }
 
-       $plugins = array();
+       $plugins = [];
        $files = glob("addon/*/");
-       if ($files) {
+       if (is_array($files)) {
                foreach ($files as $file) {
                        if (is_dir($file)) {
-                               list($tmp, $id)=array_map("trim", explode("/",$file));
+                               list($tmp, $id) = array_map("trim", explode("/", $file));
                                $info = get_plugin_info($id);
                                $show_plugin = true;
 
                                // If the addon is unsupported, then only show it, when it is enabled
-                               if ((strtolower($info["status"]) == "unsupported") && !in_array($id,  $a->plugins)) {
+                               if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->plugins)) {
                                        $show_plugin = false;
                                }
 
@@ -1790,14 +1846,14 @@ function admin_page_plugins(App $a) {
                                }
 
                                if ($show_plugin) {
-                                       $plugins[] = array($id, (in_array($id,  $a->plugins)?"on":"off") , $info);
+                                       $plugins[] = [$id, (in_array($id, $a->plugins) ? "on" : "off"), $info];
                                }
                        }
                }
        }
 
-       $t = get_markup_template("admin_plugins.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/plugins.tpl');
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Plugins'),
                '$submit' => t('Save Settings'),
@@ -1806,9 +1862,9 @@ function admin_page_plugins(App $a) {
                '$function' => 'plugins',
                '$plugins' => $plugins,
                '$pcount' => count($plugins),
-               '$noplugshint' => sprintf(t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s'), 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
+               '$noplugshint' => t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
                '$form_security_token' => get_form_security_token("admin_themes"),
-       ));
+       ]);
 }
 
 /**
@@ -1816,14 +1872,15 @@ function admin_page_plugins(App $a) {
  * @param string $th
  * @param int $result
  */
-function toggle_theme(&$themes,$th,&$result) {
-       for($x = 0; $x < count($themes); $x ++) {
+function toggle_theme(&$themes, $th, &$result)
+{
+       $count = count($themes);
+       for ($x = 0; $x < $count; $x ++) {
                if ($themes[$x]['name'] === $th) {
                        if ($themes[$x]['allowed']) {
                                $themes[$x]['allowed'] = 0;
                                $result = 0;
-                       }
-                       else {
+                       } else {
                                $themes[$x]['allowed'] = 1;
                                $result = 1;
                        }
@@ -1836,13 +1893,14 @@ function toggle_theme(&$themes,$th,&$result) {
  * @param string $th
  * @return int
  */
-function theme_status($themes,$th) {
-       for($x = 0; $x < count($themes); $x ++) {
+function theme_status($themes, $th)
+{
+       $count = count($themes);
+       for ($x = 0; $x < $count; $x ++) {
                if ($themes[$x]['name'] === $th) {
                        if ($themes[$x]['allowed']) {
                                return 1;
-                       }
-                       else {
+                       } else {
                                return 0;
                        }
                }
@@ -1850,12 +1908,12 @@ function theme_status($themes,$th) {
        return 0;
 }
 
-
 /**
  * @param array $themes
  * @return string
  */
-function rebuild_theme_table($themes) {
+function rebuild_theme_table($themes)
+{
        $o = '';
        if (count($themes)) {
                foreach ($themes as $th) {
@@ -1870,7 +1928,6 @@ function rebuild_theme_table($themes) {
        return $o;
 }
 
-
 /**
  * @brief Themes admin page
  *
@@ -1887,11 +1944,11 @@ function rebuild_theme_table($themes) {
  * @param App $a
  * @return string
  */
-function admin_page_themes(App $a) {
-
-       $allowed_themes_str = Config::get('system','allowed_themes');
-       $allowed_themes_raw = explode(',',$allowed_themes_str);
-       $allowed_themes = array();
+function admin_page_themes(App $a)
+{
+       $allowed_themes_str = Config::get('system', 'allowed_themes');
+       $allowed_themes_raw = explode(',', $allowed_themes_str);
+       $allowed_themes = [];
        if (count($allowed_themes_raw)) {
                foreach ($allowed_themes_raw as $x) {
                        if (strlen(trim($x))) {
@@ -1900,31 +1957,31 @@ function admin_page_themes(App $a) {
                }
        }
 
-       $themes = array();
+       $themes = [];
        $files = glob('view/theme/*');
-       if ($files) {
+       if (is_array($files)) {
                foreach ($files as $file) {
                        $f = basename($file);
 
                        // Is there a style file?
-                       $theme_files = glob('view/theme/'.$f.'/style.*');
+                       $theme_files = glob('view/theme/' . $f . '/style.*');
 
                        // If not then quit
                        if (count($theme_files) == 0) {
                                continue;
                        }
 
-                       $is_experimental = intval(file_exists($file.'/experimental'));
-                       $is_supported = 1-(intval(file_exists($file.'/unsupported')));
-                       $is_allowed = intval(in_array($f,$allowed_themes));
+                       $is_experimental = intval(file_exists($file . '/experimental'));
+                       $is_supported = 1 - (intval(file_exists($file . '/unsupported')));
+                       $is_allowed = intval(in_array($f, $allowed_themes));
 
                        if ($is_allowed || $is_supported || Config::get("system", "show_unsupported_themes")) {
-                               $themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
+                               $themes[] = ['name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed];
                        }
                }
        }
 
-       if (! count($themes)) {
+       if (!count($themes)) {
                notice(t('No themes found.'));
                return '';
        }
@@ -1935,82 +1992,77 @@ function admin_page_themes(App $a) {
 
        if ($a->argc == 3) {
                $theme = $a->argv[2];
-               if (! is_dir("view/theme/$theme")) {
+               if (!is_dir("view/theme/$theme")) {
                        notice(t("Item not found."));
                        return '';
                }
 
-               if (x($_GET,"a") && $_GET['a']=="t") {
+               if (x($_GET, "a") && $_GET['a'] == "t") {
                        check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
 
                        // Toggle theme status
 
-                       toggle_theme($themes,$theme,$result);
+                       toggle_theme($themes, $theme, $result);
                        $s = rebuild_theme_table($themes);
                        if ($result) {
                                install_theme($theme);
-                               info(sprintf('Theme %s enabled.',$theme));
+                               info(sprintf('Theme %s enabled.', $theme));
                        } else {
                                uninstall_theme($theme);
-                               info(sprintf('Theme %s disabled.',$theme));
+                               info(sprintf('Theme %s disabled.', $theme));
                        }
 
-                       Config::set('system','allowed_themes',$s);
+                       Config::set('system', 'allowed_themes', $s);
                        goaway('admin/themes');
                        return ''; // NOTREACHED
                }
 
                // display theme details
-               require_once('library/markdown.php');
-
-               if (theme_status($themes,$theme)) {
-                       $status="on"; $action= t("Disable");
+               if (theme_status($themes, $theme)) {
+                       $status = "on";
+                       $action = t("Disable");
                } else {
-                       $status="off"; $action= t("Enable");
+                       $status = "off";
+                       $action = t("Enable");
                }
 
-               $readme = Null;
+               $readme = null;
                if (is_file("view/theme/$theme/README.md")) {
-                       $readme = file_get_contents("view/theme/$theme/README.md");
-                       $readme = Markdown($readme, false);
+                       $readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false);
                } elseif (is_file("view/theme/$theme/README")) {
-                       $readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
+                       $readme = "<pre>" . file_get_contents("view/theme/$theme/README") . "</pre>";
                }
 
-               $admin_form = "";
+               $admin_form = '';
                if (is_file("view/theme/$theme/config.php")) {
-                       function __get_theme_admin_form(App $a, $theme) {
-                               $orig_theme = $a->theme;
-                               $orig_page = $a->page;
-                               $orig_session_theme = $_SESSION['theme'];
-                               require_once("view/theme/$theme/theme.php");
-                               require_once("view/theme/$theme/config.php");
-                               $_SESSION['theme'] = $theme;
-
-
-                               $init = $theme."_init";
-                               if (function_exists($init)) {
-                                       $init($a);
-                               }
-                               if (function_exists("theme_admin")) {
-                                       $admin_form = theme_admin($a);
-                               }
+                       $orig_theme = $a->theme;
+                       $orig_page = $a->page;
+                       $orig_session_theme = $_SESSION['theme'];
+                       require_once "view/theme/$theme/theme.php";
+                       require_once "view/theme/$theme/config.php";
+                       $_SESSION['theme'] = $theme;
+
+                       $init = $theme . "_init";
+                       if (function_exists($init)) {
+                               $init($a);
+                       }
 
-                               $_SESSION['theme'] = $orig_session_theme;
-                               $a->theme = $orig_theme;
-                               $a->page = $orig_page;
-                               return $admin_form;
+                       if (function_exists('theme_admin')) {
+                               $admin_form = theme_admin($a);
                        }
-                       $admin_form = __get_theme_admin_form($a, $theme);
+
+                       $_SESSION['theme'] = $orig_session_theme;
+                       $a->theme = $orig_theme;
+                       $a->page = $orig_page;
                }
 
-               $screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
-               if (! stristr($screenshot[0],$theme)) {
+               $screenshot = [get_theme_screenshot($theme), t('Screenshot')];
+               if (!stristr($screenshot[0], $theme)) {
                        $screenshot = null;
                }
 
-               $t = get_markup_template("admin_plugins_details.tpl");
-               return replace_macros($t, array(
+               $t = get_markup_template('admin/plugins_details.tpl');
+               return replace_macros($t, [
                        '$title' => t('Administration'),
                        '$page' => t('Themes'),
                        '$toggle' => t('Toggle'),
@@ -2028,71 +2080,66 @@ function admin_page_themes(App $a) {
                        '$readme' => $readme,
 
                        '$form_security_token' => get_form_security_token("admin_themes"),
-               ));
+               ]);
        }
 
 
        // reload active themes
-       if (x($_GET,"a") && $_GET['a']=="r") {
-               check_form_security_token_redirectOnErr(System::baseUrl().'/admin/themes', 'admin_themes', 't');
-               if ($themes) {
-                       foreach ($themes as $th) {
-                               if ($th['allowed']) {
-                                       uninstall_theme($th['name']);
-                                       install_theme($th['name']);
-                               }
+       if (x($_GET, "a") && $_GET['a'] == "r") {
+               check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
+               foreach ($themes as $th) {
+                       if ($th['allowed']) {
+                               uninstall_theme($th['name']);
+                               install_theme($th['name']);
                        }
                }
                info("Themes reloaded");
-               goaway(System::baseUrl().'/admin/themes');
+               goaway(System::baseUrl() . '/admin/themes');
        }
 
        /*
         * List themes
         */
 
-       $xthemes = array();
-       if ($themes) {
-               foreach ($themes as $th) {
-                       $xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
-               }
+       $plugins = [];
+       foreach ($themes as $th) {
+               $plugins[] = [$th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name'])];
        }
 
-
-       $t = get_markup_template("admin_plugins.tpl");
-       return replace_macros($t, array(
+       $t = get_markup_template('admin/plugins.tpl');
+       return replace_macros($t, [
                '$title'               => t('Administration'),
                '$page'                => t('Themes'),
                '$submit'              => t('Save Settings'),
                '$reload'              => t('Reload active themes'),
                '$baseurl'             => System::baseUrl(true),
                '$function'            => 'themes',
-               '$plugins'             => $xthemes,
+               '$plugins'             => $plugins,
                '$pcount'              => count($themes),
-               '$noplugshint'         => sprintf(t('No themes found on the system. They should be paced in %1$s'),'<code>/view/themes</code>'),
+               '$noplugshint'         => t('No themes found on the system. They should be placed in %1$s', '<code>/view/themes</code>'),
                '$experimental'        => t('[Experimental]'),
                '$unsupported'         => t('[Unsupported]'),
                '$form_security_token' => get_form_security_token("admin_themes"),
-       ));
+       ]);
 }
 
-
 /**
  * @brief Prosesses data send by Logs admin page
  *
  * @param App $a
  */
-function admin_page_logs_post(App $a) {
-       if (x($_POST,"page_logs")) {
+function admin_page_logs_post(App $a)
+{
+       if (x($_POST, "page_logs")) {
                check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
 
                $logfile   = ((x($_POST,'logfile'))   ? notags(trim($_POST['logfile']))  : '');
                $debugging = ((x($_POST,'debugging')) ? true                             : false);
                $loglevel  = ((x($_POST,'loglevel'))  ? intval(trim($_POST['loglevel'])) : 0);
 
-               Config::set('system','logfile', $logfile);
-               Config::set('system','debugging',  $debugging);
-               Config::set('system','loglevel', $loglevel);
+               Config::set('system', 'logfile', $logfile);
+               Config::set('system', 'debugging', $debugging);
+               Config::set('system', 'loglevel', $loglevel);
        }
 
        info(t("Log settings updated."));
@@ -2116,15 +2163,15 @@ function admin_page_logs_post(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_logs(App $a) {
-
-       $log_choices = array(
+function admin_page_logs(App $a)
+{
+       $log_choices = [
                LOGGER_NORMAL   => 'Normal',
                LOGGER_TRACE    => 'Trace',
                LOGGER_DEBUG    => 'Debug',
                LOGGER_DATA     => 'Data',
                LOGGER_ALL      => 'All'
-       );
+       ];
 
        if (ini_get('log_errors')) {
                $phplogenabled = t('PHP log currently enabled.');
@@ -2132,27 +2179,25 @@ function admin_page_logs(App $a) {
                $phplogenabled = t('PHP log currently disabled.');
        }
 
-       $t = get_markup_template("admin_logs.tpl");
+       $t = get_markup_template('admin/logs.tpl');
 
-       return replace_macros($t, array(
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('Logs'),
                '$submit' => t('Save Settings'),
                '$clear' => t('Clear'),
                '$baseurl' => System::baseUrl(true),
-               '$logname' =>  Config::get('system','logfile'),
-
+               '$logname' => Config::get('system', 'logfile'),
                // name, label, value, help string, extra data...
-               '$debugging' => array('debugging', t("Enable Debugging"),Config::get('system','debugging'), ""),
-               '$logfile' => array('logfile', t("Log file"), Config::get('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
-               '$loglevel' => array('loglevel', t("Log level"), Config::get('system','loglevel'), "", $log_choices),
-
+               '$debugging' => ['debugging', t("Enable Debugging"), Config::get('system', 'debugging'), ""],
+               '$logfile' => ['logfile', t("Log file"), Config::get('system', 'logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")],
+               '$loglevel' => ['loglevel', t("Log level"), Config::get('system', 'loglevel'), "", $log_choices],
                '$form_security_token' => get_form_security_token("admin_logs"),
                '$phpheader' => t("PHP logging"),
                '$phphint' => t("To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."),
                '$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE);\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
                '$phplogenabled' => $phplogenabled,
-       ));
+       ]);
 }
 
 /**
@@ -2173,9 +2218,10 @@ function admin_page_logs(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_viewlogs(App $a) {
-       $t = get_markup_template("admin_viewlogs.tpl");
-       $f = Config::get('system','logfile');
+function admin_page_viewlogs(App $a)
+{
+       $t = get_markup_template('admin/viewlogs.tpl');
+       $f = Config::get('system', 'logfile');
        $data = '';
 
        if (!file_exists($f)) {
@@ -2191,23 +2237,23 @@ function admin_page_viewlogs(App $a) {
                                if ($size > 5000000 || $size < 0) {
                                        $size = 5000000;
                                }
-                               $seek = fseek($fp,0-$size,SEEK_END);
+                               $seek = fseek($fp, 0 - $size, SEEK_END);
                                if ($seek === 0) {
-                                       $data = escape_tags(fread($fp,$size));
-                                       while (! feof($fp)) {
-                                               $data .= escape_tags(fread($fp,4096));
+                                       $data = escape_tags(fread($fp, $size));
+                                       while (!feof($fp)) {
+                                               $data .= escape_tags(fread($fp, 4096));
                                        }
                                }
                        }
                        fclose($fp);
                }
        }
-       return replace_macros($t, array(
+       return replace_macros($t, [
                '$title' => t('Administration'),
                '$page' => t('View Logs'),
                '$data' => $data,
-               '$logname' =>  Config::get('system','logfile')
-       ));
+               '$logname' => Config::get('system', 'logfile')
+       ]);
 }
 
 /**
@@ -2215,14 +2261,13 @@ function admin_page_viewlogs(App $a) {
  *
  * @param App $a
  */
-function admin_page_features_post(App $a) {
-
+function admin_page_features_post(App $a)
+{
        check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
 
-       logger('postvars: '.print_r($_POST,true),LOGGER_DATA);
+       logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
 
-       $arr = array();
-       $features = get_features(false);
+       $features = Feature::get(false);
 
        foreach ($features as $fname => $fdata) {
                foreach (array_slice($fdata, 1) as $f) {
@@ -2263,32 +2308,31 @@ function admin_page_features_post(App $a) {
  * @param App $a
  * @return string
  */
-function admin_page_features(App $a) {
-
+function admin_page_features(App $a)
+{
        if ((argc() > 1) && (argv(1) === 'features')) {
-               $arr = array();
-               $features = get_features(false);
+               $arr = [];
+               $features = Feature::get(false);
 
                foreach ($features as $fname => $fdata) {
-                       $arr[$fname] = array();
+                       $arr[$fname] = [];
                        $arr[$fname][0] = $fdata[0];
-                       foreach (array_slice($fdata,1) as $f) {
-
+                       foreach (array_slice($fdata, 1) as $f) {
                                $set = Config::get('feature', $f[0], $f[3]);
-                               $arr[$fname][1][] = array(
-                                       array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'), t('On'))),
-                                       array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'), t('On')))
-                               );
+                               $arr[$fname][1][] = [
+                                       ['feature_' . $f[0], $f[1], $set, $f[2], [t('Off'), t('On')]],
+                                       ['featurelock_' . $f[0], t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', [t('Off'), t('On')]]
+                               ];
                        }
                }
 
-               $tpl = get_markup_template("admin_settings_features.tpl");
-               $o .= replace_macros($tpl, array(
+               $tpl = get_markup_template('admin/settings_features.tpl');
+               $o = replace_macros($tpl, [
                        '$form_security_token' => get_form_security_token("admin_manage_features"),
                        '$title' => t('Manage Additional Features'),
                        '$features' => $arr,
                        '$submit' => t('Save Settings'),
-               ));
+               ]);
 
                return $o;
        }