X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsiteadminpanel.php;h=b45e12518981d8b80e20476a65f5404ccabac3b5;hb=c18020561b8a01bbb2b3fc092694a7bb0fde70f9;hp=dd388a18a2f1c6ac757b9196fcb59b85329d95bd;hpb=6ef70bf5d9f89cc9bbc6cce3e26fe25ab641567d;p=quix0rs-gnu-social.git diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index dd388a18a2..b45e125189 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-2011 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,23 @@ class SiteadminpanelAction extends AdminPanelAction * * @return void */ - function saveSettings() { - static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl', - 'email', 'timezone', 'language', - 'site', 'textlimit', 'dupelimit'), - 'snapshot' => array('run', 'reporturl', 'frequency')); - - static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy')); + static $settings = array( + 'site' => array( + 'name', + 'broughtby', + 'broughtbyurl', + 'email', + 'timezone', + 'language', + 'site', + 'textlimit', + 'dupelimit', + 'logo', + 'ssllogo' + ) + ); $values = array(); @@ -105,12 +111,6 @@ class SiteadminpanelAction extends AdminPanelAction } } - foreach ($booleans as $section => $parts) { - foreach ($parts as $setting) { - $values[$section][$setting] = ($this->boolean($setting)) ? 1 : 0; - } - } - // This throws an exception on validation errors $this->validate($values); @@ -127,12 +127,6 @@ class SiteadminpanelAction extends AdminPanelAction } } - foreach ($booleans as $section => $parts) { - foreach ($parts as $setting) { - Config::save($section, $setting, $values[$section][$setting]); - } - } - $config->query('COMMIT'); return; @@ -143,7 +137,8 @@ class SiteadminpanelAction extends AdminPanelAction // Validate site name if (empty($values['site']['name'])) { - $this->clientError(_("Site name must have non-zero length.")); + // TRANS: Client error displayed trying to save an empty site name. + $this->clientError(_('Site name must have non-zero length.')); } // Validate email @@ -151,61 +146,61 @@ class SiteadminpanelAction extends AdminPanelAction $values['site']['email'] = common_canonical_email($values['site']['email']); 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['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 logos + if (!empty($values['site']['logo']) && + !common_valid_http_url($values['site']['logo'])) { + // TRANS: Client error displayed when a logo URL is not valid. + $this->clientError(_('Invalid logo URL.')); + } + + if (!empty($values['site']['ssllogo']) && + !common_valid_http_url($values['site']['ssllogo'], true)) { + // TRANS: Client error displayed when a SSL logo URL is invalid. + $this->clientError(_('Invalid SSL logo URL.')); + } + // Validate timezone 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 report URL - - if (!is_null($values['snapshot']['reporturl']) && - !Validate::uri($values['snapshot']['reporturl'], array('allowed_schemes' => array('http', 'https')))) { - $this->clientError(_("Invalid snapshot report URL.")); - } - - // Validate snapshot run value - - if (!in_array($values['snapshot']['run'], array('web', 'cron', 'never'))) { - $this->clientError(_("Invalid snapshot run value.")); - } - - // Validate snapshot run value - - if (!Validate::number($values['snapshot']['frequency'])) { - $this->clientError(_("Snapshot frequency must be a number.")); - } - // Validate text limit - if (!Validate::number($values['site']['textlimit'], array('min' => 140))) { - $this->clientError(_("Minimum text limit is 140 characters.")); + 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))) { - $this->clientError(_("Dupe limit must 1 or more seconds.")); + // 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.')); } - } } +// @todo FIXME: Class documentation missing. class SiteAdminPanelForm extends AdminForm { /** @@ -213,7 +208,6 @@ class SiteAdminPanelForm extends AdminForm * * @return int ID of the form */ - function id() { return 'form_site_admin_panel'; @@ -224,7 +218,6 @@ class SiteAdminPanelForm extends AdminForm * * @return string class of the form */ - function formClass() { return 'form_settings'; @@ -235,7 +228,6 @@ class SiteAdminPanelForm extends AdminForm * * @return string URL of the action */ - function action() { return common_local_url('siteadminpanel'); @@ -246,35 +238,46 @@ class SiteAdminPanelForm extends AdminForm * * @return void */ - function formData() { $this->out->elementStart('fieldset', array('id' => 'settings_admin_general')); - $this->out->element('legend', null, _('General')); + // TRANS: Fieldset legend on site settings panel. + $this->out->element('legend', null, _m('LEGEND','General')); $this->out->elementStart('ul', 'form_data'); $this->li(); - $this->input('name', _('Site name'), - _('The name of your site, like "Yourcompany Microblog"')); + // 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->showLogo(); + $this->out->elementStart('fieldset', array('id' => 'settings_admin_local')); - $this->out->element('legend', null, _('Local')); + // TRANS: Fieldset legend on site settings panel. + $this->out->element('legend', null, _m('LEGEND','Local')); $this->out->elementStart('ul', 'form_data'); $timezones = array(); @@ -285,95 +288,75 @@ class SiteAdminPanelForm extends AdminForm 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')); $this->unli(); $this->li(); - $this->out->dropdown('language', _('Language'), - get_nice_language_list(), _('Default site language'), + $this->out->dropdown('language', + // TRANS: Dropdown label on site settings panel. + _('Default language'), + get_nice_language_list(), + // TRANS: Dropdown title on site settings panel. + _('The 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_urls')); - $this->out->element('legend', null, _('URLs')); + $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('server', _('Server'), _('Site\'s server hostname.')); + $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->out->checkbox('fancy', _('Fancy URLs'), - (bool) $this->value('fancy'), - _('Use fancy (more readable and memorable) URLs?')); + $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'); + } - $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'); + function showLogo() + { + $this->out->elementStart('fieldset', array('id' => 'settings_site_logo')); + // TRANS: Fieldset legend for form to change logo. + $this->out->element('legend', null, _('Logo')); - $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->input('frequency', _('Frequency'), - _('Snapshots will be sent once every N web hits'), - 'snapshot'); + $this->input('logo', + // TRANS: Field label for StatusNet site logo. + _('Site logo'), + // TRANS: Title for field label for StatusNet site logo. + 'Logo for the site (full URL).'); $this->unli(); $this->li(); - $this->input('reporturl', _('Report URL'), - _('Snapshots will be sent to this URL'), - 'snapshot'); + $this->input('ssllogo', + // TRANS: Field label for SSL StatusNet site logo. + _('SSL logo'), + // TRANS: Title for field label for SSL StatusNet site logo. + 'Logo to show on SSL pages (full URL).'); $this->unli(); - $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'); + $this->out->elementEnd('fieldset'); } @@ -382,9 +365,14 @@ class SiteAdminPanelForm extends AdminForm * * @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 the site settings.')); } }