Merge remote-tracking branch 'upstream/develop' into item-distribution

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 74849ea9ed4f59b3a3638df75712625737cb161f..7749cff6dcd3be23fb95a79e2ae5f294beb03964 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1262,6 +1262,7 @@ function admin_page_site(App $a)
 
        /* Community page style */
        $community_page_style_choices = [
+               CP_NO_INTERNAL_COMMUNITY => L10n::t("No community page for local users"),
                CP_NO_COMMUNITY_PAGE => L10n::t("No community page"),
                CP_USERS_ON_SERVER => L10n::t("Public postings from users of this site"),
                CP_GLOBAL_COMMUNITY => L10n::t("Public postings from the federated network"),
@@ -1735,13 +1736,28 @@ function admin_page_users(App $a)
 
        $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
        $_setup_users = function ($e) use ($adminlist) {
-               $accounts = [
-                       L10n::t('Normal Account'),
-                       L10n::t('Automatic Follower Account'),
-                       L10n::t('Public Forum Account'),
-                       L10n::t('Automatic Friend Account')
+               $page_types = [
+                       PAGE_NORMAL => L10n::t('Normal Account Page'),
+                       PAGE_SOAPBOX => L10n::t('Soapbox Page'),
+                       PAGE_COMMUNITY => L10n::t('Public Forum'),
+                       PAGE_FREELOVE => L10n::t('Automatic Friend Page'),
+                       PAGE_PRVGROUP => L10n::t('Private Forum')
                ];
-               $e['page-flags'] = $accounts[$e['page-flags']];
+               $account_types = [
+                       ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'),
+                       ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'),
+                       ACCOUNT_TYPE_NEWS => L10n::t('News Page'),
+                       ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum')
+               ];
+
+
+
+               $e['page-flags-raw'] = $e['page-flags'];
+               $e['page-flags'] = $page_types[$e['page-flags']];
+
+               $e['account-type-raw'] = ($e['page_flags_raw']==0) ? $e['account-type'] : -1;
+               $e['account-type'] = ($e['page_flags_raw']==0) ? $account_types[$e['account-type']] : "";
+
                $e['register_date'] = Temporal::getRelativeDate($e['register_date']);
                $e['login_date'] = Temporal::getRelativeDate($e['login_date']);
                $e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']);
@@ -1778,8 +1794,7 @@ function admin_page_users(App $a)
                array_push($users, array_pop($tmp_users));
        }
 
-       $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Account')], $valid_orders
-       );
+       $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders);
 
        $t = get_markup_template('admin/users.tpl');
        $o = replace_macros($t, [