summaryrefslogtreecommitdiff
path: root/actions/siteadminpanel.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/siteadminpanel.php')
-rw-r--r--actions/siteadminpanel.php173
1 files changed, 119 insertions, 54 deletions
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index c316f8e17..916b9ebfb 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -91,10 +91,12 @@ class SiteadminpanelAction extends AdminPanelAction
function saveSettings()
{
static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
- 'email', 'timezone', 'language'),
+ 'email', 'timezone', 'language',
+ 'ssl', 'sslserver', 'site', 'path',
+ 'textlimit', 'dupelimit', 'locale_path'),
'snapshot' => array('run', 'reporturl', 'frequency'));
- static $booleans = array('site' => array('private'));
+ static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
$values = array();
@@ -190,10 +192,42 @@ class SiteadminpanelAction extends AdminPanelAction
$this->clientError(_("Snapshot frequency must be a number."));
}
+ // Validate SSL setup
+
+ if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
+ if (empty($values['site']['sslserver'])) {
+ $this->clientError(_("You must set an SSL sever when enabling SSL."));
+ }
+ }
+
+ if (mb_strlen($values['site']['sslserver']) > 255) {
+ $this->clientError(_("Invalid SSL server. Max length is 255 characters."));
+ }
+
+ // Validate text limit
+
+ if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
+ $this->clientError(_("Minimum text limit is 140c."));
+ }
+
+ // Validate dupe limit
+
+ if (!Validate::number($values['site']['dupelimit'], array('min' => 1))) {
+ $this->clientError(_("Dupe limit must 1 or more seconds."));
+ }
+
+ // Validate locales path
+
+ // XXX: What else do we need to validate for lacales path here? --Z
+
+ if (!empty($values['site']['locale_path']) && !is_readable($values['site']['locale_path'])) {
+ $this->clientError(sprintf(_("Locales directory not readable: %s"), $values['site']['locale_path']));
+ }
+
}
}
-class SiteAdminPanelForm extends Form
+class SiteAdminPanelForm extends AdminForm
{
/**
* ID of the form
@@ -236,15 +270,19 @@ class SiteAdminPanelForm extends Form
function formData()
{
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_general'));
+ $this->out->element('legend', null, _('General'));
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->input('name', _('Site name'),
_('The name of your site, like "Yourcompany Microblog"'));
$this->unli();
+
$this->li();
$this->input('broughtby', _('Brought by'),
_('Text used for credits link in footer of each page'));
$this->unli();
+
$this->li();
$this->input('broughtbyurl', _('Brought by URL'),
_('URL used for credits link in footer of each page'));
@@ -252,9 +290,13 @@ class SiteAdminPanelForm extends Form
$this->li();
$this->input('email', _('Email'),
_('contact email address for your site'));
-
$this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_local'));
+ $this->out->element('legend', null, _('Local'));
+ $this->out->elementStart('ul', 'form_data');
$timezones = array();
foreach (DateTimeZone::listIdentifiers() as $k => $v) {
@@ -264,100 +306,123 @@ class SiteAdminPanelForm extends Form
asort($timezones);
$this->li();
-
$this->out->dropdown('timezone', _('Default timezone'),
$timezones, _('Default timezone for the site; usually UTC.'),
true, $this->value('timezone'));
-
$this->unli();
- $this->li();
+ $this->li();
$this->out->dropdown('language', _('Language'),
get_nice_language_list(), _('Default site language'),
false, $this->value('language'));
+ $this->unli();
+ $this->li();
+ $this->input('locale_path', _('Path to locales'), _('Directory path to locales'));
$this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_urls'));
+ $this->out->element('legend', null, _('URLs'));
+ $this->out->elementStart('ul', 'form_data');
$this->li();
+ $this->input('server', _('Server'), _('Site\'s server hostname.'));
+ $this->unli();
+ $this->li();
+ $this->input('path', _('Path'), _('Site path'));
+ $this->unli();
+
+ $this->li();
+ $this->out->checkbox('fancy', _('Fancy URLs'),
+ (bool) $this->value('fancy'),
+ _('Use fancy (more readable and memorable) URLs?'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_access'));
+ $this->out->element('legend', null, _('Access'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
$this->out->checkbox('private', _('Private'),
(bool) $this->value('private'),
_('Prohibit anonymous users (not logged in) from viewing site?'));
+ $this->unli();
+ $this->li();
+ $this->out->checkbox('inviteonly', _('Invite only'),
+ (bool) $this->value('inviteonly'),
+ _('Make registration invitation only.'));
$this->unli();
$this->li();
+ $this->out->checkbox('closed', _('Closed'),
+ (bool) $this->value('closed'),
+ _('Disable new registrations.'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_snapshots'));
+ $this->out->element('legend', null, _('Snapshots'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
$snapshot = array('web' => _('Randomly during Web hit'),
'cron' => _('In a scheduled job'),
'never' => _('Never'));
-
$this->out->dropdown('run', _('Data snapshots'),
$snapshot, _('When to send statistical data to status.net servers'),
false, $this->value('run', 'snapshot'));
-
$this->unli();
- $this->li();
+ $this->li();
$this->input('frequency', _('Frequency'),
_('Snapshots will be sent once every N Web hits'),
'snapshot');
-
$this->unli();
$this->li();
-
$this->input('reporturl', _('Report URL'),
_('Snapshots will be sent to this URL'),
'snapshot');
-
$this->unli();
-
$this->out->elementEnd('ul');
- }
-
- /**
- * Utility to simplify some of the duplicated code around
- * params and settings.
- *
- * @param string $setting Name of the setting
- * @param string $title Title to use for the input
- * @param string $instructions Instructions for this field
- * @param string $section config section, default = 'site'
- *
- * @return void
- */
+ $this->out->elementEnd('fieldset');
- function input($setting, $title, $instructions, $section='site')
- {
- $this->out->input($setting, $title, $this->value($setting, $section), $instructions);
- }
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_ssl'));
+ $this->out->element('legend', null, _('SSL'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $ssl = array('never' => _('Never'),
+ 'sometimes' => _('Sometimes'),
+ 'always' => _('Always'));
- /**
- * Utility to simplify getting the posted-or-stored setting value
- *
- * @param string $setting Name of the setting
- * @param string $main configuration section, default = 'site'
- *
- * @return string param value if posted, or current config value
- */
+ $this->out->dropdown('ssl', _('Use SSL'),
+ $ssl, _('When to use SSL'),
+ false, $this->value('ssl', 'site'));
+ $this->unli();
- function value($setting, $main='site')
- {
- $value = $this->out->trimmed($setting);
- if (empty($value)) {
- $value = common_config($main, $setting);
- }
- return $value;
- }
+ $this->li();
+ $this->input('sslserver', _('SSL Server'),
+ _('Server to direct SSL requests to'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
- function li()
- {
- $this->out->elementStart('li');
- }
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_limits'));
+ $this->out->element('legend', null, _('Limits'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $this->input('textlimit', _('Text limit'), _('Maximum number of characters for notices.'));
+ $this->unli();
- function unli()
- {
- $this->out->elementEnd('li');
+ $this->li();
+ $this->input('dupelimit', _('Dupe limit'), _('How long users must wait (in seconds) to post the same thing again.'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
}
/**
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-22 20:27:42 +0000