diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-08-27 06:52:01 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-08-27 06:52:01 -0400 |
| commit | ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1 (patch) | |
| tree | 80936d2335aca91c1a3b828c234ae736c811d22b /Zotlabs/Module/Setup.php | |
| parent | 420aa4bc44a2fdf707b3964582258809f978ea2d (diff) | |
| parent | aea2fa1629692cc29f1070a66fbde9fb9ae837a6 (diff) | |
| download | volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.tar.gz volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.tar.bz2 volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.zip | |
Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.
Diffstat (limited to 'Zotlabs/Module/Setup.php')
| -rw-r--r-- | Zotlabs/Module/Setup.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index cb43b5c20..f8e210410 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -73,7 +73,9 @@ class Setup extends \Zotlabs\Web\Controller { $phpath = trim($_POST['phpath']); $adminmail = trim($_POST['adminmail']); $siteurl = trim($_POST['siteurl']); - $advanced = ((intval($_POST['advanced'])) ? 1 : 0); + $server_role = trim($_POST['server_role']); + if(! $server_role) + $server_role = 'standard'; // $siteurl should not have a trailing slash @@ -101,7 +103,9 @@ class Setup extends \Zotlabs\Web\Controller { $timezone = notags(trim($_POST['timezone'])); $adminmail = notags(trim($_POST['adminmail'])); $siteurl = notags(trim($_POST['siteurl'])); - $advanced = ((intval($_POST['advanced'])) ? 'standard' : 'basic'); + $server_role = notags(trim($_POST['server_role'])); + if(! $server_role) + $server_role = 'standard'; if($siteurl != z_root()) { $test = z_fetch_url($siteurl."/setup/testrewrite"); @@ -130,7 +134,7 @@ class Setup extends \Zotlabs\Web\Controller { '$dbpass' => $dbpass, '$dbdata' => $dbdata, '$dbtype' => $dbtype, - '$server_role' => $advanced, + '$server_role' => $server_role, '$timezone' => $timezone, '$siteurl' => $siteurl, '$site_id' => random_string(), @@ -327,6 +331,12 @@ class Setup extends \Zotlabs\Web\Controller { $siteurl = notags(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( '$title' => $install_title, @@ -344,7 +354,8 @@ class Setup extends \Zotlabs\Web\Controller { '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), - '$advanced' => array('advanced', t('Enable $Projectname <strong>advanced</strong> features?'), 1, t('Some advanced features, while useful - may be best suited for technically proficient audiences')), + + '$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()), |