X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsiteadminpanel.php;h=4238b3e85a3a98636dfadb4eeb3ee6ff24528752;hb=65bf58be806d19bc7fe962c0824160deab07d5c3;hp=cd33d5adb1118c32563e1703034313d437b25c3e;hpb=42d6c696916d545047339c77d36df2192555662b;p=quix0rs-gnu-social.git diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index cd33d5adb1..4238b3e85a 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -24,7 +24,7 @@ * @author Evan Prodromou * @author Zach Copley * @author Sarven Capadisli - * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2008-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -66,7 +66,7 @@ class SiteadminpanelAction extends AdminPanelAction function getInstructions() { - return _('Basic settings for this StatusNet site.'); + return _('Basic settings for this StatusNet site'); } /** @@ -90,18 +90,18 @@ class SiteadminpanelAction extends AdminPanelAction function saveSettings() { - static $settings = array('name', 'broughtby', 'broughtbyurl', - 'email', 'timezone', 'language'); - static $booleans = array('private'); + static $settings = array( + 'site' => array('name', 'broughtby', 'broughtbyurl', + 'email', 'timezone', 'language', + 'site', 'textlimit', 'dupelimit'), + ); $values = array(); - foreach ($settings as $setting) { - $values[$setting] = $this->trimmed($setting); - } - - foreach ($booleans as $setting) { - $values[$setting] = ($this->boolean($setting)) ? 1 : 0; + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] = $this->trimmed($setting); + } } // This throws an exception on validation errors @@ -114,8 +114,10 @@ class SiteadminpanelAction extends AdminPanelAction $config->query('BEGIN'); - foreach (array_merge($settings, $booleans) as $setting) { - Config::save('site', $setting, $values[$setting]); + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } } $config->query('COMMIT'); @@ -127,38 +129,52 @@ class SiteadminpanelAction extends AdminPanelAction { // Validate site name - if (empty($values['name'])) { - $this->clientError(_("Site name must have non-zero length.")); + if (empty($values['site']['name'])) { + $this->clientError(_('Site name must have non-zero length.')); } // Validate email - $values['email'] = common_canonical_email($values['email']); + $values['site']['email'] = common_canonical_email($values['site']['email']); - if (empty($values['email'])) { - $this->clientError(_('You must have a valid contact email address')); + if (empty($values['site']['email'])) { + $this->clientError(_('You must have a valid contact email address.')); } - if (!Validate::email($values['email'], common_config('email', 'check_domain'))) { - $this->clientError(_('Not a valid email address')); + if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) { + $this->clientError(_('Not a valid email address.')); } // Validate timezone - if (is_null($values['timezone']) || - !in_array($values['timezone'], DateTimeZone::listIdentifiers())) { + if (is_null($values['site']['timezone']) || + !in_array($values['site']['timezone'], DateTimeZone::listIdentifiers())) { $this->clientError(_('Timezone not selected.')); return; } // Validate language - if (!is_null($language) && !in_array($language, array_keys(get_nice_language_list()))) { - $this->clientError(sprintf(_('Unknown language "%s"'), $language)); + if (!is_null($values['site']['language']) && + !in_array($values['site']['language'], array_keys(get_nice_language_list()))) { + $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language'])); } + + // Validate text limit + + if (!Validate::number($values['site']['textlimit'], array('min' => 0))) { + $this->clientError(_("Minimum text limit is 0 (unlimited).")); + } + + // Validate dupe limit + + if (!Validate::number($values['site']['dupelimit'], array('min' => 1))) { + $this->clientError(_("Dupe limit must be one or more seconds.")); + } + } } -class SiteAdminPanelForm extends Form +class SiteAdminPanelForm extends AdminForm { /** * ID of the form @@ -168,7 +184,7 @@ class SiteAdminPanelForm extends Form function id() { - return 'siteadminpanel'; + return 'form_site_admin_panel'; } /** @@ -179,7 +195,7 @@ class SiteAdminPanelForm extends Form function formClass() { - return 'form_site_admin_panel'; + return 'form_settings'; } /** @@ -201,25 +217,33 @@ 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')); $this->unli(); $this->li(); $this->input('email', _('Email'), - _('contact email address for your site')); - + _('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) { @@ -229,71 +253,32 @@ 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->out->dropdown('language', _('Language'), - get_nice_language_list(), _('Default site language'), + $this->li(); + $this->out->dropdown('language', _('Default language'), + get_nice_language_list(), _('Site language when autodetection from browser settings is not available'), false, $this->value('language')); - $this->unli(); - $this->li(); - $this->out->checkbox('private', _('Private'), - (bool) $this->value('private'), - _('Prohibit anonymous users (not logged in) from viewing site?')); + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + $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(); + $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'); - } - - /** - * 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 - * - * @return void - */ - - function input($setting, $title, $instructions) - { - $this->out->input($setting, $title, $this->value($setting), $instructions); - } - - /** - * Utility to simplify getting the posted-or-stored setting value - * - * @param string $setting Name of the setting - * - * @return string param value if posted, or current config value - */ - - function value($setting) - { - $value = $this->out->trimmed($setting); - if (empty($value)) { - $value = common_config('site', $setting); - } - return $value; - } - - function li() - { - $this->out->elementStart('li'); - } - - function unli() - { - $this->out->elementEnd('li'); + $this->out->elementEnd('fieldset'); } /**