* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
* @author Sarven Capadisli <csarven@status.net>
- * @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/
*/
{
static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
'email', 'timezone', 'language',
- 'ssl', 'sslserver', 'site', 'path',
- 'textlimit', 'dupelimit'),
+ 'site', 'textlimit', 'dupelimit'),
'snapshot' => array('run', 'reporturl', 'frequency'));
- static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
-
$values = array();
foreach ($settings as $section => $parts) {
}
}
- 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);
}
}
- foreach ($booleans as $section => $parts) {
- foreach ($parts as $setting) {
- Config::save($section, $setting, $values[$section][$setting]);
- }
- }
-
$config->query('COMMIT');
return;
$values['site']['email'] = common_canonical_email($values['site']['email']);
if (empty($values['site']['email'])) {
- $this->clientError(_('You must have a valid contact email address'));
+ $this->clientError(_('You must have a valid contact email address.'));
}
if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) {
- $this->clientError(_('Not a valid email address'));
+ $this->clientError(_('Not a valid email address.'));
}
// Validate timezone
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']));
+ $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language']));
}
// Validate report URL
$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."));
+ $this->clientError(_("Minimum text limit is 140 characters."));
}
// Validate dupe limit
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) {
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->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->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'),
+ _('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->li();
-
- $ssl = array('never' => _('Never'),
- 'sometimes' => _('Sometimes'),
- 'always' => _('Always'));
-
- $this->out->dropdown('ssl', _('Use SSL'),
- $ssl, _('When to use SSL'),
- false, $this->value('ssl', 'site'));
-
- $this->unli();
-
- $this->li();
- $this->input('sslserver', _('SSL Server'),
- _('Server to direct SSL requests to'));
$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');
}
/**