diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-09 18:54:10 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-09 18:54:10 -0800 |
| commit | 1a49f0d164ce94bc3fce227a68aa3796e22347e1 (patch) | |
| tree | 01aa60c0d16a2a9c567d64297473b486c7bb526b /Zotlabs | |
| parent | c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea (diff) | |
| download | volse-hubzilla-1a49f0d164ce94bc3fce227a68aa3796e22347e1.tar.gz volse-hubzilla-1a49f0d164ce94bc3fce227a68aa3796e22347e1.tar.bz2 volse-hubzilla-1a49f0d164ce94bc3fce227a68aa3796e22347e1.zip | |
one role.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/System.php | 11 | ||||
| -rw-r--r-- | Zotlabs/Module/Setup.php | 7 |
2 files changed, 3 insertions, 15 deletions
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 306c90f4a..865cb9a30 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -57,9 +57,7 @@ class System { static public function get_server_role() { - if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role']) - return \App::$config['system']['server_role']; - return 'standard'; + return 'pro'; } static public function get_std_version() { @@ -72,11 +70,8 @@ class System { if(get_directory_realm() != DIRECTORY_REALM) return true; - - foreach(['hubzilla','zap'] as $t) { - if(stristr($p,$t)) - return true; - } + if(in_array(strtolower($p),['hubzilla','zap','red'])) + return true; return false; } } diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 9c688af01..e114dfc0b 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -324,11 +324,6 @@ class Setup extends \Zotlabs\Web\Controller { $siteurl = trim($_POST['siteurl']); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); - $server_roles = [ - 'basic' => t('Basic/Minimal Social Networking'), - 'standard' => t('Standard Configuration (default)'), - 'pro' => t('Professional') - ]; $tpl = get_markup_template('install_settings.tpl'); $o .= replace_macros($tpl, array( @@ -348,8 +343,6 @@ class Setup extends \Zotlabs\Web\Controller { '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), - '$server_role' => array('server_role', t("Server Configuration/Role"), 'standard','',$server_roles), - '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()), '$baseurl' => z_root(), |