]> git.mxchange.org Git - friendica.git/blobdiff - mod/settings.php
Merge pull request #11014 from MrPetovan/task/10978-settings-keyboard-actionable
[friendica.git] / mod / settings.php
index 6c41856a4f808f9cc58872c41f2a284352127ef7..632517f16554e7e86d29850c0af7db6928bacd68 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -30,14 +30,13 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
+use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\Email;
-use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Worker\Delivery;
 
@@ -48,100 +47,41 @@ function settings_init(App $a)
                return;
        }
 
-       BaseSettings::content();
+       BaseSettings::createAside();
 }
 
 function settings_post(App $a)
 {
-       if (!local_user()) {
-               return;
-       }
-
-       if (!empty($_SESSION['submanage'])) {
-               return;
-       }
-
-       if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
+       if (!$a->isLoggedIn()) {
                notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
-       $old_page_flags = $a->user['page-flags'];
-
-       if (($a->argc > 1) && ($a->argv[1] === 'oauth') && !empty($_POST['remove'])) {
-               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
-
-               $key = $_POST['remove'];
-               DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
-               DI::baseUrl()->redirect('settings/oauth/', true);
-               return;
-       }
-
-       if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && !empty($_POST['submit'])) {
-               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
-
-               $name     = $_POST['name']     ?? '';
-               $key      = $_POST['key']      ?? '';
-               $secret   = $_POST['secret']   ?? '';
-               $redirect = $_POST['redirect'] ?? '';
-               $icon     = $_POST['icon']     ?? '';
-
-               if ($name == "" || $key == "" || $secret == "") {
-                       notice(DI::l10n()->t("Missing some important data!"));
-               } else {
-                       if ($_POST['submit'] == DI::l10n()->t("Update")) {
-                               q("UPDATE clients SET
-                                                       client_id='%s',
-                                                       pw='%s',
-                                                       name='%s',
-                                                       redirect_uri='%s',
-                                                       icon='%s',
-                                                       uid=%d
-                                               WHERE client_id='%s'",
-                                       DBA::escape($key),
-                                       DBA::escape($secret),
-                                       DBA::escape($name),
-                                       DBA::escape($redirect),
-                                       DBA::escape($icon),
-                                       local_user(),
-                                       DBA::escape($key)
-                               );
-                       } else {
-                               q("INSERT INTO clients
-                                                       (client_id, pw, name, redirect_uri, icon, uid)
-                                               VALUES ('%s', '%s', '%s', '%s', '%s',%d)",
-                                       DBA::escape($key),
-                                       DBA::escape($secret),
-                                       DBA::escape($name),
-                                       DBA::escape($redirect),
-                                       DBA::escape($icon),
-                                       local_user()
-                               );
-                       }
-               }
-               DI::baseUrl()->redirect('settings/oauth/', true);
+       if (!empty($_SESSION['submanage'])) {
                return;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
-               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/addon', 'settings_addon');
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] == 'addon')) {
+               BaseModule::checkFormSecurityTokenRedirectOnError(DI::args()->getQueryString(), 'settings_addon');
 
                Hook::callAll('addon_settings_post', $_POST);
+               DI::baseUrl()->redirect(DI::args()->getQueryString());
                return;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-               BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
+       $user = User::getById($a->getLoggedInUserId());
+
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] == 'connectors')) {
+               BaseModule::checkFormSecurityTokenRedirectOnError(DI::args()->getQueryString(), 'settings_connectors');
 
                if (!empty($_POST['general-submit'])) {
                        DI::pConfig()->set(local_user(), 'system', 'accept_only_sharer', intval($_POST['accept_only_sharer']));
-                       DI::pConfig()->set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
-                       DI::pConfig()->set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
+                       DI::pConfig()->set(local_user(), 'system', 'disable_cw', !intval($_POST['enable_cw']));
+                       DI::pConfig()->set(local_user(), 'system', 'no_intelligent_shortening', !intval($_POST['enable_smart_shortening']));
+                       DI::pConfig()->set(local_user(), 'system', 'simple_shortening', intval($_POST['simple_shortening']));
                        DI::pConfig()->set(local_user(), 'system', 'attach_link_title', intval($_POST['attach_link_title']));
-                       DI::pConfig()->set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
-                       DI::pConfig()->set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
                        DI::pConfig()->set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
-               } elseif (!empty($_POST['imap-submit'])) {
+               } elseif (!empty($_POST['mail-submit'])) {
                        $mail_server       =                 $_POST['mail_server']       ?? '';
                        $mail_port         =                 $_POST['mail_port']         ?? '';
                        $mail_ssl          = strtolower(trim($_POST['mail_ssl']          ?? ''));
@@ -152,51 +92,39 @@ function settings_post(App $a)
                        $mail_replyto      =                 $_POST['mail_replyto']      ?? '';
                        $mail_pubmail      =                 $_POST['mail_pubmail']      ?? '';
 
-                       if (
-                               !DI::config()->get('system', 'dfrn_only')
-                               && function_exists('imap_open')
-                               && !DI::config()->get('system', 'imap_disabled')
-                       ) {
-                               $failed = false;
-                               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-                                       intval(local_user())
-                               );
-                               if (!DBA::isResult($r)) {
+                       if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) {
+                               if (!DBA::exists('mailacct', ['uid' => local_user()])) {
                                        DBA::insert('mailacct', ['uid' => local_user()]);
                                }
                                if (strlen($mail_pass)) {
                                        $pass = '';
-                                       openssl_public_encrypt($mail_pass, $pass, $a->user['pubkey']);
+                                       openssl_public_encrypt($mail_pass, $pass, $user['pubkey']);
                                        DBA::update('mailacct', ['pass' => bin2hex($pass)], ['uid' => local_user()]);
                                }
-                               $r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
-                                       `action` = %d, `movetofolder` = '%s',
-                                       `mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d",
-                                       DBA::escape($mail_server),
-                                       intval($mail_port),
-                                       DBA::escape($mail_ssl),
-                                       DBA::escape($mail_user),
-                                       intval($mail_action),
-                                       DBA::escape($mail_movetofolder),
-                                       DBA::escape($mail_replyto),
-                                       intval($mail_pubmail),
-                                       intval(local_user())
-                               );
+
+                               $r = DBA::update('mailacct', [
+                                       'server'       => $mail_server,
+                                       'port'         => $mail_port,
+                                       'ssltype'      => $mail_ssl,
+                                       'user'         => $mail_user,
+                                       `action`       => $mail_action,
+                                       'movetofolder' => $mail_movetofolder,
+                                       'mailbox'      => 'INBOX',
+                                       'reply_to'     => $mail_replyto,
+                                       'pubmail'      => $mail_pubmail
+                               ], ['uid' => local_user()]);
+
                                Logger::notice('updating mailaccount', ['response' => $r]);
-                               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-                                       intval(local_user())
-                               );
-                               if (DBA::isResult($r)) {
-                                       $eacct = $r[0];
-                                       $mb = Email::constructMailboxName($eacct);
-
-                                       if (strlen($eacct['server'])) {
+                               $mailacct = DBA::selectFirst('mailacct', [], ['uid' => local_user()]);
+                               if (DBA::isResult($mailacct)) {
+                                       $mb = Email::constructMailboxName($mailacct);
+
+                                       if (strlen($mailacct['server'])) {
                                                $dcrpass = '';
-                                               openssl_private_decrypt(hex2bin($eacct['pass']), $dcrpass, $a->user['prvkey']);
+                                               openssl_private_decrypt(hex2bin($mailacct['pass']), $dcrpass, $user['prvkey']);
                                                $mbox = Email::connect($mb, $mail_user, $dcrpass);
                                                unset($dcrpass);
                                                if (!$mbox) {
-                                                       $failed = true;
                                                        notice(DI::l10n()->t('Failed to connect with email account using the settings provided.'));
                                                }
                                        }
@@ -205,10 +133,11 @@ function settings_post(App $a)
                }
 
                Hook::callAll('connector_settings_post', $_POST);
+               DI::baseUrl()->redirect(DI::args()->getQueryString());
                return;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] === 'features')) {
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'features')) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features');
                foreach ($_POST as $k => $v) {
                        if (strpos($k, 'feature_') === 0) {
@@ -229,7 +158,7 @@ function settings_post(App $a)
                                notice(DI::l10n()->t('Contact CSV file upload error'));
                        } else {
                                $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name']));
-                               Logger::info('Import started', ['lines' => count($csvArray)]);
+                               Logger::notice('Import started', ['lines' => count($csvArray)]);
                                // import contacts
                                foreach ($csvArray as $csvRow) {
                                        // The 1st row may, or may not contain the headers of the table
@@ -237,18 +166,20 @@ function settings_post(App $a)
                                        // or the handle of the account, therefore we check for either
                                        // "http" or "@" to be present in the string.
                                        // All other fields from the row will be ignored
-                                       if ((strpos($csvRow[0],'@') !== false) || (strpos($csvRow[0],'http') !== false)) {
+                                       if ((strpos($csvRow[0],'@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) {
                                                Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]);
+                                       } else {
+                                               Logger::notice('Invalid account', ['url' => $csvRow[0]]);
                                        }
                                }
-                               Logger::info('Import done');
+                               Logger::notice('Import done');
 
                                info(DI::l10n()->t('Importing Contacts done'));
                                // delete temp file
                                unlink($_FILES['importcontact-filename']['tmp_name']);
                        }
                } else {
-                       Logger::info('Import triggered, but no import file was found.');
+                       Logger::notice('Import triggered, but no import file was found.');
                }
 
                return;
@@ -286,14 +217,14 @@ function settings_post(App $a)
                }
        }
 
-       $username         = (!empty($_POST['username'])   ? Strings::escapeTags(trim($_POST['username']))     : '');
-       $email            = (!empty($_POST['email'])      ? Strings::escapeTags(trim($_POST['email']))        : '');
-       $timezone         = (!empty($_POST['timezone'])   ? Strings::escapeTags(trim($_POST['timezone']))     : '');
-       $language         = (!empty($_POST['language'])   ? Strings::escapeTags(trim($_POST['language']))     : '');
+       $username         = (!empty($_POST['username'])        ? trim($_POST['username'])          : '');
+       $email            = (!empty($_POST['email'])           ? trim($_POST['email'])             : '');
+       $timezone         = (!empty($_POST['timezone'])        ? trim($_POST['timezone'])          : '');
+       $language         = (!empty($_POST['language'])        ? trim($_POST['language'])          : '');
 
-       $defloc           = (!empty($_POST['defloc'])     ? Strings::escapeTags(trim($_POST['defloc']))       : '');
-       $maxreq           = (!empty($_POST['maxreq'])     ? intval($_POST['maxreq'])             : 0);
-       $expire           = (!empty($_POST['expire'])     ? intval($_POST['expire'])             : 0);
+       $defloc           = (!empty($_POST['defloc'])          ? trim($_POST['defloc'])            : '');
+       $maxreq           = (!empty($_POST['maxreq'])          ? intval($_POST['maxreq'])          : 0);
+       $expire           = (!empty($_POST['expire'])          ? intval($_POST['expire'])          : 0);
        $def_gid          = (!empty($_POST['group-selection']) ? intval($_POST['group-selection']) : 0);
 
 
@@ -320,9 +251,14 @@ function settings_post(App $a)
        $unlisted         = (($_POST['unlisted'] == 1) ? 1: 0);
        $accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0);
 
+       $notify_like      = (($_POST['notify_like'] == 1) ? 1 : 0);
+       $notify_announce  = (($_POST['notify_announce'] == 1) ? 1 : 0);
+
        $email_textonly   = (($_POST['email_textonly'] == 1) ? 1 : 0);
        $detailed_notif   = (($_POST['detailed_notif'] == 1) ? 1 : 0);
 
+       $notify_ignored   = (($_POST['notify_ignored'] == 1) ? 1 : 0);
+
        $notify = 0;
 
        if (!empty($_POST['notify1'])) {
@@ -363,7 +299,7 @@ function settings_post(App $a)
 
        $err = '';
 
-       if ($username != $a->user['username']) {
+       if ($username != $user['username']) {
                if (strlen($username) > 40) {
                        $err .= DI::l10n()->t('Please use a shorter name.');
                }
@@ -372,11 +308,13 @@ function settings_post(App $a)
                }
        }
 
-       if ($email != $a->user['email']) {
+       if ($email != $user['email']) {
                //  check for the correct password
-               if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
+               try {
+                       User::getIdFromPasswordAuthentication(local_user(), $_POST['mpassword']);
+               } catch (Exception $ex) {
                        $err .= DI::l10n()->t('Wrong Password.');
-                       $email = $a->user['email'];
+                       $email = $user['email'];
                }
                //  check the email is valid
                if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
@@ -387,7 +325,7 @@ function settings_post(App $a)
                        $adminlist = explode(",", str_replace(" ", "", strtolower(DI::config()->get('config', 'admin_email'))));
                        if (in_array(strtolower($email), $adminlist)) {
                                $err .= DI::l10n()->t('Cannot change to that email.');
-                               $email = $a->user['email'];
+                               $email = $user['email'];
                        }
                }
        }
@@ -397,8 +335,8 @@ function settings_post(App $a)
                return;
        }
 
-       if (($timezone != $a->user['timezone']) && strlen($timezone)) {
-               date_default_timezone_set($timezone);
+       if (($timezone != $user['timezone']) && strlen($timezone)) {
+               $a->setTimeZone($timezone);
        }
 
        $aclFormatter = DI::aclFormatter();
@@ -414,8 +352,12 @@ function settings_post(App $a)
        DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos);
        DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only);
 
+       DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like);
+       DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce);
+
        DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly);
        DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif);
+       DI::pConfig()->set(local_user(), 'system', 'notify_ignored', $notify_ignored);
        DI::pConfig()->set(local_user(), 'system', 'unlisted', $unlisted);
        DI::pConfig()->set(local_user(), 'system', 'accessible-photos', $accessiblephotos);
 
@@ -442,38 +384,15 @@ function settings_post(App $a)
                $fields['openidserver'] = '';
        }
 
-       if (!DBA::update('user', $fields, ['uid' => local_user()])) {
+       $profile_fields = ['publish' => $publish, 'net-publish' => $net_publish, 'hide-friends' => $hide_friends];
+
+       if (!User::update($fields, local_user()) || !Profile::update($profile_fields, local_user())) {
                notice(DI::l10n()->t('Settings were not updated.'));
        }
 
        // clear session language
        unset($_SESSION['language']);
 
-       q("UPDATE `profile`
-               SET `publish` = %d,
-               `name` = '%s',
-               `net-publish` = %d,
-               `hide-friends` = %d
-               WHERE `uid` = %d",
-               intval($publish),
-               DBA::escape($username),
-               intval($net_publish),
-               intval($hide_friends),
-               intval(local_user())
-       );
-
-       Contact::updateSelfFromUserID(local_user());
-
-       if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
-               // Update global directory in background
-               $url = $_SESSION['my_url'];
-               if ($url && strlen(DI::config()->get('system', 'directory'))) {
-                       Worker::add(PRIORITY_LOW, "Directory", $url);
-               }
-       }
-
-       Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
-
        DI::baseUrl()->redirect('settings');
        return; // NOTREACHED
 }
@@ -491,106 +410,70 @@ function settings_content(App $a)
 
        if (!empty($_SESSION['submanage'])) {
                notice(DI::l10n()->t('Permission denied.'));
-               return;
+               return '';
        }
 
-       if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
-               if (($a->argc > 2) && ($a->argv[2] === 'add')) {
-                       $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
-                       $o .= Renderer::replaceMacros($tpl, [
-                               '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
-                               '$title'        => DI::l10n()->t('Add application'),
-                               '$submit'       => DI::l10n()->t('Save Settings'),
-                               '$cancel'       => DI::l10n()->t('Cancel'),
-                               '$name'         => ['name', DI::l10n()->t('Name'), '', ''],
-                               '$key'          => ['key', DI::l10n()->t('Consumer Key'), '', ''],
-                               '$secret'       => ['secret', DI::l10n()->t('Consumer Secret'), '', ''],
-                               '$redirect'     => ['redirect', DI::l10n()->t('Redirect'), '', ''],
-                               '$icon'         => ['icon', DI::l10n()->t('Icon url'), '', ''],
-                       ]);
-                       return $o;
-               }
-
-               if (($a->argc > 3) && ($a->argv[2] === 'edit')) {
-                       $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
-                                       DBA::escape($a->argv[3]),
-                                       local_user());
-
-                       if (!DBA::isResult($r)) {
-                               notice(DI::l10n()->t("You can't edit this application."));
-                               return;
-                       }
-                       $app = $r[0];
-
-                       $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
-                       $o .= Renderer::replaceMacros($tpl, [
-                               '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
-                               '$title'        => DI::l10n()->t('Add application'),
-                               '$submit'       => DI::l10n()->t('Update'),
-                               '$cancel'       => DI::l10n()->t('Cancel'),
-                               '$name'         => ['name', DI::l10n()->t('Name'), $app['name'] , ''],
-                               '$key'          => ['key', DI::l10n()->t('Consumer Key'), $app['client_id'], ''],
-                               '$secret'       => ['secret', DI::l10n()->t('Consumer Secret'), $app['pw'], ''],
-                               '$redirect'     => ['redirect', DI::l10n()->t('Redirect'), $app['redirect_uri'], ''],
-                               '$icon'         => ['icon', DI::l10n()->t('Icon url'), $app['icon'], ''],
-                       ]);
-                       return $o;
-               }
-
-               if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'oauth')) {
+               if ((DI::args()->getArgc() > 3) && (DI::args()->getArgv()[2] === 'delete')) {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
 
-                       DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
+                       DBA::delete('application-token', ['application-id' => DI::args()->getArgv()[3], 'uid' => local_user()]);
                        DI::baseUrl()->redirect('settings/oauth/', true);
-                       return;
+                       return '';
                }
 
-               /// @TODO validate result with DBA::isResult()
-               $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
-                               FROM clients
-                               LEFT JOIN tokens ON clients.client_id=tokens.client_id
-                               WHERE clients.uid IN (%d, 0)",
-                               local_user(),
-                               local_user());
-
+               $applications = DBA::selectToArray('application-view', ['id', 'uid', 'name', 'website', 'scopes', 'created_at'], ['uid' => local_user()]);
 
                $tpl = Renderer::getMarkupTemplate('settings/oauth.tpl');
                $o .= Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
-                       '$baseurl'      => DI::baseUrl()->get(true),
-                       '$title'        => DI::l10n()->t('Connected Apps'),
-                       '$add'          => DI::l10n()->t('Add application'),
-                       '$edit'         => DI::l10n()->t('Edit'),
-                       '$delete'               => DI::l10n()->t('Delete'),
-                       '$consumerkey' => DI::l10n()->t('Client key starts with'),
-                       '$noname'       => DI::l10n()->t('No name'),
-                       '$remove'       => DI::l10n()->t('Remove authorization'),
-                       '$apps'         => $r,
+                       '$baseurl'             => DI::baseUrl()->get(true),
+                       '$title'               => DI::l10n()->t('Connected Apps'),
+                       '$name'                => DI::l10n()->t('Name'),
+                       '$website'             => DI::l10n()->t('Home Page'),
+                       '$created_at'          => DI::l10n()->t('Created'),
+                       '$delete'              => DI::l10n()->t('Remove authorization'),
+                       '$apps'                => $applications,
                ]);
                return $o;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
-               $settings_addons = "";
-
-               $r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
-               if (!DBA::isResult($r)) {
-                       $settings_addons = DI::l10n()->t('No Addon settings configured');
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'addon')) {
+               $addon_settings_forms = [];
+               foreach (DI::dba()->selectToArray('hook', ['file', 'function'], ['hook' => 'addon_settings']) as $hook) {
+                       $data = [];
+                       Hook::callSingle(DI::app(), 'addon_settings', [$hook['file'], $hook['function']], $data);
+
+                       if (!empty($data['href'])) {
+                               $tpl = Renderer::getMarkupTemplate('settings/addon/link.tpl');
+                               $addon_settings_forms[] = Renderer::replaceMacros($tpl, [
+                                       '$addon' => $data['addon'],
+                                       '$title' => $data['title'],
+                                       '$href'  => $data['href'],
+                               ]);
+                       } elseif(!empty($data['addon'])) {
+                               $tpl = Renderer::getMarkupTemplate('settings/addon/panel.tpl');
+                               $addon_settings_forms[$data['addon']] = Renderer::replaceMacros($tpl, [
+                                       '$addon'  => $data['addon'],
+                                       '$title'  => $data['title'],
+                                       '$open'   => (DI::args()->getArgv()[2] ?? '') === $data['addon'],
+                                       '$html'   => $data['html'] ?? '',
+                                       '$submit' => $data['submit'] ?? DI::l10n()->t('Save Settings'),
+                               ]);
+                       }
                }
 
-               Hook::callAll('addon_settings', $settings_addons);
-
-
                $tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
                $o .= Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
                        '$title'        => DI::l10n()->t('Addon Settings'),
-                       '$settings_addons' => $settings_addons
+                       '$no_addons_settings_configured' => DI::l10n()->t('No Addon settings configured'),
+                       '$addon_settings_forms' => $addon_settings_forms,
                ]);
                return $o;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] === 'features')) {
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'features')) {
 
                $arr = [];
                $features = Feature::get();
@@ -612,13 +495,12 @@ function settings_content(App $a)
                return $o;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'connectors')) {
                $accept_only_sharer        = intval(DI::pConfig()->get(local_user(), 'system', 'accept_only_sharer'));
-               $disable_cw                = intval(DI::pConfig()->get(local_user(), 'system', 'disable_cw'));
-               $no_intelligent_shortening = intval(DI::pConfig()->get(local_user(), 'system', 'no_intelligent_shortening'));
+               $enable_cw                 = !intval(DI::pConfig()->get(local_user(), 'system', 'disable_cw'));
+               $enable_smart_shortening   = !intval(DI::pConfig()->get(local_user(), 'system', 'no_intelligent_shortening'));
+               $simple_shortening         = intval(DI::pConfig()->get(local_user(), 'system', 'simple_shortening'));
                $attach_link_title         = intval(DI::pConfig()->get(local_user(), 'system', 'attach_link_title'));
-               $ostatus_autofriend        = intval(DI::pConfig()->get(local_user(), 'system', 'ostatus_autofriend'));
-               $default_group             = DI::pConfig()->get(local_user(), 'ostatus', 'default_group');
                $legacy_contact            = DI::pConfig()->get(local_user(), 'ostatus', 'legacy_contact');
 
                if (!empty($legacy_contact)) {
@@ -626,10 +508,24 @@ function settings_content(App $a)
                        DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
                }
 
-               $settings_connectors = '';
-               Hook::callAll('connector_settings', $settings_connectors);
+               $connector_settings_forms = [];
+               foreach (DI::dba()->selectToArray('hook', ['file', 'function'], ['hook' => 'connector_settings']) as $hook) {
+                       $data = [];
+                       Hook::callSingle(DI::app(), 'connector_settings', [$hook['file'], $hook['function']], $data);
+
+                       $tpl = Renderer::getMarkupTemplate('settings/addon/connector.tpl');
+                       $connector_settings_forms[$data['connector']] = Renderer::replaceMacros($tpl, [
+                               '$connector' => $data['connector'],
+                               '$title'     => $data['title'],
+                               '$image'     => $data['image'] ?? '',
+                               '$enabled'   => $data['enabled'] ?? true,
+                               '$open'      => (DI::args()->getArgv()[2] ?? '') === $data['connector'],
+                               '$html'      => $data['html'] ?? '',
+                               '$submit'    => $data['submit'] ?? DI::l10n()->t('Save Settings'),
+                       ]);
+               }
 
-               if (is_site_admin()) {
+               if ($a->isSiteAdmin()) {
                        $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora (Socialhome, Hubzilla)'), ((DI::config()->get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled')));
                        $ostat_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('OStatus (GNU Social)'), ((DI::config()->get('system', 'ostatus_disabled')) ? DI::l10n()->t('disabled') : DI::l10n()->t('enabled')));
                } else {
@@ -638,26 +534,21 @@ function settings_content(App $a)
                }
 
                $mail_disabled = ((function_exists('imap_open') && (!DI::config()->get('system', 'imap_disabled'))) ? 0 : 1);
-               if (DI::config()->get('system', 'dfrn_only')) {
-                       $mail_disabled = 1;
-               }
                if (!$mail_disabled) {
-                       $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-                               local_user()
-                       );
+                       $mailacct = DBA::selectFirst('mailacct', [], ['uid' => local_user()]);
                } else {
-                       $r = null;
+                       $mailacct = null;
                }
 
-               $mail_server       = ((DBA::isResult($r)) ? $r[0]['server'] : '');
-               $mail_port         = ((DBA::isResult($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
-               $mail_ssl          = ((DBA::isResult($r)) ? $r[0]['ssltype'] : '');
-               $mail_user         = ((DBA::isResult($r)) ? $r[0]['user'] : '');
-               $mail_replyto      = ((DBA::isResult($r)) ? $r[0]['reply_to'] : '');
-               $mail_pubmail      = ((DBA::isResult($r)) ? $r[0]['pubmail'] : 0);
-               $mail_action       = ((DBA::isResult($r)) ? $r[0]['action'] : 0);
-               $mail_movetofolder = ((DBA::isResult($r)) ? $r[0]['movetofolder'] : '');
-               $mail_chk          = ((DBA::isResult($r)) ? $r[0]['last_check'] : DBA::NULL_DATETIME);
+               $mail_server       = $mailacct['server'] ?? '';
+               $mail_port         = (!empty($mailacct['port']) && is_numeric($mailacct['port'])) ? (int)$mailacct['port'] : '';
+               $mail_ssl          = $mailacct['ssltype'] ?? '';
+               $mail_user         = $mailacct['user'] ?? '';
+               $mail_replyto      = $mailacct['reply_to'] ?? '';
+               $mail_pubmail      = $mailacct['pubmail'] ?? 0;
+               $mail_action       = $mailacct['action'] ?? 0;
+               $mail_movetofolder = $mailacct['movetofolder'] ?? '';
+               $mail_chk          = $mailacct['last_check'] ?? DBA::NULL_DATETIME;
 
 
                $tpl = Renderer::getMarkupTemplate('settings/connectors.tpl');
@@ -680,21 +571,20 @@ function settings_content(App $a)
 
                        '$general_settings' => DI::l10n()->t('General Social Media Settings'),
                        '$accept_only_sharer' => ['accept_only_sharer', DI::l10n()->t('Accept only top level posts by contacts you follow'), $accept_only_sharer, DI::l10n()->t('The system does an auto completion of threads when a comment arrives. This has got the side effect that you can receive posts that had been started by a non-follower but had been commented by someone you follow. This setting deactivates this behaviour. When activated, you strictly only will receive posts from people you really do follow.')],
-                       '$disable_cw' => ['disable_cw', DI::l10n()->t('Disable Content Warning'), $disable_cw, DI::l10n()->t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')],
-                       '$no_intelligent_shortening' => ['no_intelligent_shortening', DI::l10n()->t('Disable intelligent shortening'), $no_intelligent_shortening, DI::l10n()->t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
+                       '$enable_cw' => ['enable_cw', DI::l10n()->t('Enable Content Warning'), $enable_cw, DI::l10n()->t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This enables the automatic collapsing instead of setting the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')],
+                       '$enable_smart_shortening' => ['enable_smart_shortening', DI::l10n()->t('Enable intelligent shortening'), $enable_smart_shortening, DI::l10n()->t('Normally the system tries to find the best link to add to shortened posts. If disabled, every shortened post will always point to the original friendica post.')],
+                       '$simple_shortening' => ['simple_shortening', DI::l10n()->t('Enable simple text shortening'), $simple_shortening, DI::l10n()->t('Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.')],
                        '$attach_link_title' => ['attach_link_title', DI::l10n()->t('Attach the link title'), $attach_link_title, DI::l10n()->t('When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.')],
-                       '$ostatus_autofriend' => ['snautofollow', DI::l10n()->t("Automatically follow any GNU Social \x28OStatus\x29 followers/mentioners"), $ostatus_autofriend, DI::l10n()->t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
-                       '$default_group' => Group::displayGroupSelection(local_user(), $default_group, DI::l10n()->t("Default group for OStatus contacts")),
-                       '$legacy_contact' => ['legacy_contact', DI::l10n()->t('Your legacy GNU Social account'), $legacy_contact, DI::l10n()->t("If you enter your old GNU Social/Statusnet account name here \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")],
+                       '$legacy_contact' => ['legacy_contact', DI::l10n()->t('Your legacy ActivityPub/GNU Social account'), $legacy_contact, DI::l10n()->t("If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.")],
 
                        '$repair_ostatus_url' => DI::baseUrl() . '/repair_ostatus',
                        '$repair_ostatus_text' => DI::l10n()->t('Repair OStatus subscriptions'),
 
-                       '$settings_connectors' => $settings_connectors,
+                       '$connector_settings_forms' => $connector_settings_forms,
 
-                       '$h_imap' => DI::l10n()->t('Email/Mailbox Setup'),
-                       '$imap_desc' => DI::l10n()->t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
-                       '$imap_lastcheck' => ['imap_lastcheck', DI::l10n()->t('Last successful email check:'), $mail_chk, ''],
+                       '$h_mail' => DI::l10n()->t('Email/Mailbox Setup'),
+                       '$mail_desc' => DI::l10n()->t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+                       '$mail_lastcheck' => ['mail_lastcheck', DI::l10n()->t('Last successful email check:'), $mail_chk, ''],
                        '$mail_disabled' => $mail_disabled_message,
                        '$mail_server'  => ['mail_server',      DI::l10n()->t('IMAP server name:'), $mail_server, ''],
                        '$mail_port'    => ['mail_port',        DI::l10n()->t('IMAP port:'), $mail_port, ''],
@@ -719,21 +609,23 @@ function settings_content(App $a)
        $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]);
        if (!DBA::isResult($profile)) {
                notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.'));
-               return;
+               return '';
        }
 
-       $username   = $a->user['username'];
-       $email      = $a->user['email'];
-       $nickname   = $a->user['nickname'];
-       $timezone   = $a->user['timezone'];
-       $language   = $a->user['language'];
-       $notify     = $a->user['notify-flags'];
-       $defloc     = $a->user['default-location'];
-       $openid     = $a->user['openid'];
-       $maxreq     = $a->user['maxreq'];
-       $expire     = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
-       $unkmail    = $a->user['unkmail'];
-       $cntunkmail = $a->user['cntunkmail'];
+       $user = User::getById($a->getLoggedInUserId());
+
+       $username   = $user['username'];
+       $email      = $user['email'];
+       $nickname   = $a->getLoggedInUserNickname();
+       $timezone   = $user['timezone'];
+       $language   = $user['language'];
+       $notify     = $user['notify-flags'];
+       $defloc     = $user['default-location'];
+       $openid     = $user['openid'];
+       $maxreq     = $user['maxreq'];
+       $expire     =  ((intval($user['expire'])) ? $user['expire'] : '');
+       $unkmail    = $user['unkmail'];
+       $cntunkmail = $user['cntunkmail'];
 
        $expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true);
        $expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true);
@@ -741,15 +633,15 @@ function settings_content(App $a)
        $expire_photos = DI::pConfig()->get(local_user(), 'expire', 'photos', false);
        $expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false);
 
-       if (!strlen($a->user['timezone'])) {
-               $timezone = date_default_timezone_get();
+       if (!strlen($user['timezone'])) {
+               $timezone = $a->getTimeZone();
        }
 
        // Set the account type to "Community" when the page is a community page but the account type doesn't fit
        // This is only happening on the first visit after the update
-       if (in_array($a->user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]) &&
-               ($a->user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY))
-               $a->user['account-type'] = User::ACCOUNT_TYPE_COMMUNITY;
+       if (in_array($user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]) &&
+               ($user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY))
+               $user['account-type'] = User::ACCOUNT_TYPE_COMMUNITY;
 
        $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl');
 
@@ -757,7 +649,7 @@ function settings_content(App $a)
                '$account_types'        => DI::l10n()->t("Account Types"),
                '$user'                 => DI::l10n()->t("Personal Page Subtypes"),
                '$community'            => DI::l10n()->t("Community Forum Subtypes"),
-               '$account_type'         => $a->user['account-type'],
+               '$account_type'         => $user['account-type'],
                '$type_person'          => User::ACCOUNT_TYPE_PERSON,
                '$type_organisation'    => User::ACCOUNT_TYPE_ORGANISATION,
                '$type_news'            => User::ACCOUNT_TYPE_NEWS,
@@ -765,39 +657,39 @@ function settings_content(App $a)
 
                '$account_person'       => ['account-type', DI::l10n()->t('Personal Page'), User::ACCOUNT_TYPE_PERSON,
                                                                        DI::l10n()->t('Account for a personal profile.'),
-                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_PERSON)],
+                                                                       ($user['account-type'] == User::ACCOUNT_TYPE_PERSON)],
 
                '$account_organisation' => ['account-type', DI::l10n()->t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION,
                                                                        DI::l10n()->t('Account for an organisation that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION)],
+                                                                       ($user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION)],
 
                '$account_news'         => ['account-type', DI::l10n()->t('News Page'), User::ACCOUNT_TYPE_NEWS,
                                                                        DI::l10n()->t('Account for a news reflector that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_NEWS)],
+                                                                       ($user['account-type'] == User::ACCOUNT_TYPE_NEWS)],
 
                '$account_community'    => ['account-type', DI::l10n()->t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY,
                                                                        DI::l10n()->t('Account for community discussions.'),
-                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)],
+                                                                       ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)],
 
                '$page_normal'          => ['page-flags', DI::l10n()->t('Normal Account Page'), User::PAGE_FLAGS_NORMAL,
                                                                        DI::l10n()->t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
-                                                                       ($a->user['page-flags'] == User::PAGE_FLAGS_NORMAL)],
+                                                                       ($user['page-flags'] == User::PAGE_FLAGS_NORMAL)],
 
                '$page_soapbox'         => ['page-flags', DI::l10n()->t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX,
                                                                        DI::l10n()->t('Account for a public profile that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['page-flags'] == User::PAGE_FLAGS_SOAPBOX)],
+                                                                       ($user['page-flags'] == User::PAGE_FLAGS_SOAPBOX)],
 
                '$page_community'       => ['page-flags', DI::l10n()->t('Public Forum'), User::PAGE_FLAGS_COMMUNITY,
                                                                        DI::l10n()->t('Automatically approves all contact requests.'),
-                                                                       ($a->user['page-flags'] == User::PAGE_FLAGS_COMMUNITY)],
+                                                                       ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY)],
 
                '$page_freelove'        => ['page-flags', DI::l10n()->t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE,
                                                                        DI::l10n()->t('Account for a popular profile that automatically approves contact requests as "Friends".'),
-                                                                       ($a->user['page-flags'] == User::PAGE_FLAGS_FREELOVE)],
+                                                                       ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE)],
 
                '$page_prvgroup'        => ['page-flags', DI::l10n()->t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP,
                                                                        DI::l10n()->t('Requires manual approval of contact requests.'),
-                                                                       ($a->user['page-flags'] == User::PAGE_FLAGS_PRVGROUP)],
+                                                                       ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP)],
 
 
        ]);
@@ -861,7 +753,7 @@ function settings_content(App $a)
                '$timezone' => ['timezone_select' , DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''],
                '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
                '$defloc'       => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''],
-               '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
+               '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($user['allow_location'] == 1), ''],
 
                '$h_prv'                  => DI::l10n()->t('Security and Privacy Settings'),
                '$visibility'         => $profile['net-publish'],
@@ -869,16 +761,16 @@ function settings_content(App $a)
                '$profile_in_dir'     => $profile_in_dir,
                '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc],
                '$hide_friends'       => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')],
-               '$hide_wall'          => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')],
+               '$hide_wall'          => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')],
                '$unlisted'           => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')],
                '$accessiblephotos'   => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")],
-               '$blockwall'          => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''),
-               '$blocktags'          => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''),
+               '$blockwall'          => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''),
+               '$blocktags'          => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''),
                '$unkmail'            => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')],
                '$cntunkmail'         => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")],
-               '$group_select'       => Group::displayGroupSelection(local_user(), $a->user['def_gid']),
+               '$group_select'       => Group::displayGroupSelection(local_user(), $user['def_gid']),
                '$permissions'        => DI::l10n()->t('Default Post Permissions'),
-               '$aclselect'          => ACL::getFullSelectorHTML(DI::page(), $a->user),
+               '$aclselect'          => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()),
 
                '$expire' => [
                        'label'        => DI::l10n()->t('Expiration settings'),
@@ -892,14 +784,18 @@ function settings_content(App $a)
 
                '$h_not'        => DI::l10n()->t('Notification Settings'),
                '$lbl_not'      => DI::l10n()->t('Send a notification email when:'),
-               '$notify1'      => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), Type::INTRO, ''],
-               '$notify2'      => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), Type::CONFIRM, ''],
-               '$notify3'      => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Type::WALL), Type::WALL, ''],
-               '$notify4'      => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Type::COMMENT), Type::COMMENT, ''],
-               '$notify5'      => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''],
-               '$notify6'  => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''],
-               '$notify7'  => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''],
-               '$notify8'  => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Type::POKE), Type::POKE, ''],
+               '$notify1'      => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Notification\Type::INTRO), Notification\Type::INTRO, ''],
+               '$notify2'      => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Notification\Type::CONFIRM), Notification\Type::CONFIRM, ''],
+               '$notify3'      => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Notification\Type::WALL), Notification\Type::WALL, ''],
+               '$notify4'      => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Notification\Type::COMMENT), Notification\Type::COMMENT, ''],
+               '$notify5'      => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Notification\Type::MAIL), Notification\Type::MAIL, ''],
+               '$notify6'  => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Notification\Type::SUGGEST), Notification\Type::SUGGEST, ''],
+               '$notify7'  => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''],
+               '$notify8'  => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''],
+
+               '$lbl_notify'      => DI::l10n()->t('Create a desktop notification when:'),
+               '$notify_like'     => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''],
+               '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''],
 
                '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],
 
@@ -911,14 +807,18 @@ function settings_content(App $a)
                                                                        DI::pConfig()->get(local_user(), 'system', 'detailed_notif'),
                                                                        DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')],
 
-               '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'),
+               '$notify_ignored' => ['notify_ignored', DI::l10n()->t('Show notifications of ignored contacts') ,
+                                                                       DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true),
+                                                                       DI::l10n()->t("You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.")],
+
+                                                                       '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'),
                '$h_descadvn' => DI::l10n()->t('Change the behaviour of this account for special situations'),
                '$pagetype' => $pagetype,
 
                '$importcontact' => DI::l10n()->t('Import Contacts'),
                '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'),
                '$importcontact_button' => DI::l10n()->t('Upload File'),
-               '$importcontact_maxsize' => DI::config()->get('system', 'max_csv_file_size', 30720), 
+               '$importcontact_maxsize' => DI::config()->get('system', 'max_csv_file_size', 30720),
                '$relocate' => DI::l10n()->t('Relocate'),
                '$relocate_text' => DI::l10n()->t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
                '$relocate_button' => DI::l10n()->t("Resend relocate message to contacts"),