Merge branch 'develop' into rewrite/gravity-constants

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 04a9e3fd3b40fbc30703e6cd8079e3fb7a4f1772..093572f18a2f4b8d59eecba6414d993efe96506e 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -23,30 +23,21 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
-use Friendica\Core\ACL;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Notification;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Model\Verb;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
-use Friendica\Protocol\Activity;
 use Friendica\Protocol\Email;
-use Friendica\Util\Temporal;
-use Friendica\Worker\Delivery;
 
 function settings_init(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -56,7 +47,7 @@ function settings_init(App $a)
 function settings_post(App $a)
 {
        if (!$a->isLoggedIn()) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -117,7 +108,7 @@ function settings_post(App $a)
                                        'pubmail'      => $mail_pubmail
                                ], ['uid' => local_user()]);
 
-                               Logger::notice('updating mailaccount', ['response' => $r]);
+                               Logger::debug('updating mailaccount', ['response' => $r]);
                                $mailacct = DBA::selectFirst('mailacct', [], ['uid' => local_user()]);
                                if (DBA::isResult($mailacct)) {
                                        $mb = Email::constructMailboxName($mailacct);
@@ -128,7 +119,7 @@ function settings_post(App $a)
                                                $mbox = Email::connect($mb, $mail_user, $dcrpass);
                                                unset($dcrpass);
                                                if (!$mbox) {
-                                                       notice(DI::l10n()->t('Failed to connect with email account using the settings provided.'));
+                                                       DI::sysmsg()->addNotice(DI::l10n()->t('Failed to connect with email account using the settings provided.'));
                                                }
                                        }
                                }
@@ -157,12 +148,12 @@ function settings_content(App $a)
        Nav::setSelected('settings');
 
        if (!local_user()) {
-               //notice(DI::l10n()->t('Permission denied.'));
+               //DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return Login::form();
        }
 
        if (!empty($_SESSION['submanage'])) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return '';
        }