X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsiteadminpanel.php;h=29813ca3b976021fd6d642d93450b79e96b01ad0;hb=bc2f64d7ab6c0218104e1a655209fe062d5bdd43;hp=f66aa855c057efbfa28a3241aa9764231df01a5f;hpb=977d5d6f8569437a8d8a7f9616f4de6afc0dc509;p=quix0rs-gnu-social.git diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index f66aa855c0..29813ca3b9 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/ */ @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class SiteadminpanelAction extends AdminPanelAction { /** @@ -52,10 +51,10 @@ class SiteadminpanelAction extends AdminPanelAction * * @return string page title */ - function title() { - return _('Site'); + // TRANS: Title for site administration panel. + return _m('TITLE','Site'); } /** @@ -63,10 +62,10 @@ class SiteadminpanelAction extends AdminPanelAction * * @return string instructions */ - function getInstructions() { - return _('Basic settings for this StatusNet site.'); + // TRANS: Instructions for site administration panel. + return _('Basic settings for this StatusNet site'); } /** @@ -74,7 +73,6 @@ class SiteadminpanelAction extends AdminPanelAction * * @return void */ - function showForm() { $form = new SiteAdminPanelForm($this); @@ -87,15 +85,20 @@ class SiteadminpanelAction extends AdminPanelAction * * @return void */ - function saveSettings() { - static $settings = array('name', 'broughtby', 'broughtbyurl', 'email', 'timezone'); + 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 ($settings as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] = $this->trimmed($setting); + } } // This throws an exception on validation errors @@ -108,8 +111,10 @@ class SiteadminpanelAction extends AdminPanelAction $config->query('BEGIN'); - foreach ($settings 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'); @@ -121,42 +126,69 @@ 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'])) { + // TRANS: Client error displayed trying to save an empty 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'])) { + // TRANS: Client error displayed trying to save site settings without a contact address. + $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'))) { + // TRANS: Client error displayed trying to save site settings without a valid contact address. + $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())) { + // TRANS: Client error displayed trying to save site settings without a timezone. $this->clientError(_('Timezone not selected.')); return; } + + // Validate language + + if (!is_null($values['site']['language']) && + !in_array($values['site']['language'], array_keys(get_nice_language_list()))) { + // TRANS: Client error displayed trying to save site settings with an invalid language code. + // TRANS: %s is the invalid language code. + $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language'])); + } + + // Validate text limit + + if (!Validate::number($values['site']['textlimit'], array('min' => 0))) { + // TRANS: Client error displayed trying to save site settings with a text limit below 0. + $this->clientError(_('Minimum text limit is 0 (unlimited).')); + } + + // Validate dupe limit + + if (!Validate::number($values['site']['dupelimit'], array('min' => 1))) { + // TRANS: Client error displayed trying to save site settings with a text limit below 1. + $this->clientError(_("Dupe limit must be one or more seconds.")); + } } } -class SiteAdminPanelForm extends Form +// @todo FIXME: Class documentation missing. +class SiteAdminPanelForm extends AdminForm { /** * ID of the form * * @return int ID of the form */ - function id() { - return 'siteadminpanel'; + return 'form_site_admin_panel'; } /** @@ -164,10 +196,9 @@ class SiteAdminPanelForm extends Form * * @return string class of the form */ - function formClass() { - return 'form_site_admin_panel'; + return 'form_settings'; } /** @@ -175,7 +206,6 @@ class SiteAdminPanelForm extends Form * * @return string URL of the action */ - function action() { return common_local_url('siteadminpanel'); @@ -186,18 +216,45 @@ class SiteAdminPanelForm extends Form * * @return void */ - function formData() { - $this->input('name', _('Site name'), - _('The name of your site, like "Yourcompany Microblog"')); + $this->out->elementStart('fieldset', array('id' => 'settings_admin_general')); + // TRANS: Fieldset legend on site settings panel. + $this->out->element('legend', null, _m('LEGEND','General')); + $this->out->elementStart('ul', 'form_data'); + $this->li(); + // TRANS: Field label on site settings panel. + $this->input('name', _m('LABEL','Site name'), + // TRANS: Field title on site settings panel. + _('The name of your site, like "Yourcompany Microblog".')); + $this->unli(); + + $this->li(); + // TRANS: Field label on site settings panel. $this->input('broughtby', _('Brought by'), - _('Text used for credits link in footer of each page')); + // TRANS: Field title on site settings panel. + _('Text used for credits link in footer of each page.')); + $this->unli(); + + $this->li(); + // TRANS: Field label on site settings panel. $this->input('broughtbyurl', _('Brought by URL'), - _('URL used for credits link in footer of each page')); + // TRANS: Field title on site settings panel. + _('URL used for credits link in footer of each page.')); + $this->unli(); + $this->li(); + // TRANS: Field label on site settings panel. $this->input('email', _('Email'), - _('contact email address for your site')); - + // TRANS: Field title on site settings panel. + _('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')); + // TRANS: Fieldset legend on site settings panel. + $this->out->element('legend', null, _m('LEGEND','Local')); + $this->out->elementStart('ul', 'form_data'); $timezones = array(); foreach (DateTimeZone::listIdentifiers() as $k => $v) { @@ -206,42 +263,48 @@ class SiteAdminPanelForm extends Form asort($timezones); + $this->li(); + // TRANS: Dropdown label on site settings panel. $this->out->dropdown('timezone', _('Default timezone'), + // TRANS: Dropdown title on site settings panel. $timezones, _('Default timezone for the site; usually UTC.'), true, $this->value('timezone')); - } - - /** - * 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; + $this->unli(); + + $this->li(); + $this->out->dropdown('language', + // TRANS: Dropdown label on site settings panel. + _('Default language'), + get_nice_language_list(), + // TRANS: Dropdown title on site settings panel. + _('Site language when autodetection from browser settings is not available'), + false, $this->value('language')); + $this->unli(); + + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + + $this->out->elementStart('fieldset', array('id' => 'settings_admin_limits')); + // TRANS: Fieldset legend on site settings panel. + $this->out->element('legend', null, _m('LEGEND','Limits')); + $this->out->elementStart('ul', 'form_data'); + $this->li(); + $this->input('textlimit', + // TRANS: Field label on site settings panel. + _('Text limit'), + // TRANS: Field title on site settings panel. + _('Maximum number of characters for notices.')); + $this->unli(); + + $this->li(); + $this->input('dupelimit', + // TRANS: Field label on site settings panel. + _('Dupe limit'), + // TRANS: Field title on site settings panel. + _('How long users must wait (in seconds) to post the same thing again.')); + $this->unli(); + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); } /** @@ -249,9 +312,14 @@ class SiteAdminPanelForm extends Form * * @return void */ - function formActions() { - $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings')); + $this->out->submit('submit', + // TRANS: Button text for saving site settings. + _m('BUTTON','Save'), + 'submit', + null, + // TRANS: Button title for saving site settings. + _('Save site settings')); } }