Merge pull request #524 from beardy-unixer/master

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 5edb927559c87e220f4795aa0e5e27f2c30c2da1..a145e5b28bf61b40ad17086bdf636cc60c0ab586 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -448,7 +448,7 @@ function admin_page_site(&$a) {
                
                '$baseurl' => $a->get_baseurl(true),
                // name, label, value, help string, extra data...
-               '$sitename'             => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
+               '$sitename'             => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'),
                '$banner'               => array('banner', t("Banner/Logo"), $banner, ""),
                '$language'             => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
                '$theme'                => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
@@ -664,6 +664,7 @@ function admin_page_users(&$a){
                                );
                                        
        function _setup_users($e){
+        $a = get_app();
                $accounts = Array(
                        t('Normal Account'), 
                        t('Soapbox Account'),
@@ -674,6 +675,7 @@ function admin_page_users(&$a){
                $e['register_date'] = relative_date($e['register_date']);
                $e['login_date'] = relative_date($e['login_date']);
                $e['lastitem_date'] = relative_date($e['lastitem_date']);
+        $e['is_admin'] = ($e['email'] === $a->config['admin_email']);
                return $e;
        }
        $users = array_map("_setup_users", $users);
@@ -694,6 +696,7 @@ function admin_page_users(&$a){
                '$delete' => t('Delete'),
                '$block' => t('Block'),
                '$unblock' => t('Unblock'),
+        '$siteadmin' => t('Site admin'),
                
                '$h_users' => t('Users'),
                '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account') ),