Merge pull request #6199 from MrPetovan/task/move-config-to-php-array

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index ab5c37ec029c4391f3e4ee77b4da45040bb12aff..cedd6748ec7fac0a97211a3255b0f63db4d6bd58 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1167,6 +1167,7 @@ function admin_page_site_post(App $a)
        $relay_scope            =       ((x($_POST,'relay_scope'))              ? Strings::escapeTags(trim($_POST['relay_scope']))              : '');
        $relay_server_tags      =       ((x($_POST,'relay_server_tags'))        ? Strings::escapeTags(trim($_POST['relay_server_tags']))        : '');
        $relay_user_tags        =       ((x($_POST,'relay_user_tags'))          ? True                                          : False);
+       $active_panel           =       (defaults($_POST, 'active_panel', '')   ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : '');
 
        // Has the directory url changed? If yes, then resubmit the existing profiles there
        if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
@@ -1348,7 +1349,8 @@ function admin_page_site_post(App $a)
        Config::set('system', 'rino_encrypt', $rino);
 
        info(L10n::t('Site settings updated.') . EOL);
-       $a->internalRedirect('admin/site');
+
+       $a->internalRedirect('admin/site' . $active_panel);
        return; // NOTREACHED
 }
 
@@ -1494,7 +1496,8 @@ function admin_page_site(App $a)
                '$performance' => L10n::t('Performance'),
                '$worker_title' => L10n::t('Worker'),
                '$relay_title' => L10n::t('Message Relay'),
-               '$relocate' => L10n::t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
+               '$relocate' => L10n::t('Relocate Instance'),
+               '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'),
                '$baseurl' => System::baseUrl(true),
                // name, label, value, help string, extra data...
                '$sitename'             => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],
@@ -1780,7 +1783,11 @@ function admin_page_users_post(App $a)
        }
        if (x($_POST, 'page_users_delete')) {
                foreach ($users as $uid) {
-                       User::remove($uid);
+                       if (local_user() != $uid) {
+                               User::remove($uid);
+                       } else {
+                               notice(L10n::t('You can\'t remove yourself'));
+                       }
                }
                notice(L10n::tt("%s user deleted", "%s users deleted", count($users)));
        }
@@ -1825,11 +1832,15 @@ function admin_page_users(App $a)
                }
                switch ($a->argv[2]) {
                        case "delete":
-                               BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
-                               // delete user
-                               User::remove($uid);
+                               if (local_user() != $uid) {
+                                       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
+                                       // delete user
+                                       User::remove($uid);
 
-                               notice(L10n::t("User '%s' deleted", $user['username']) . EOL);
+                                       notice(L10n::t("User '%s' deleted", $user['username']));
+                               } else {
+                                       notice(L10n::t('You can\'t remove yourself'));
+                               }
                                break;
                        case "block":
                                BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');