X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fsiteadminpanel.php;h=8c8f8b3742bf5c28590281c59dc14504c828b521;hb=e2578cfad68c45ca177c51997c4cc7c0abafbd9a;hp=358c0b15fac88a6305ecf90f3cca035faa20aa5c;hpb=badd8ccccadb4eb3697c8d68619e4ec931b947c5;p=quix0rs-gnu-social.git

diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 358c0b15fa..8c8f8b3742 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -24,7 +24,7 @@
  * @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/
  */
@@ -90,14 +90,17 @@ class SiteadminpanelAction extends AdminPanelAction
 
     function saveSettings()
     {
-        static $settings = array('name', 'broughtby', 'broughtbyurl',
-                                 'email', 'timezone', 'language',
-                                 'closed', 'inviteonly', 'private');
+        static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
+                                                 'email', 'timezone', 'language',
+                                                 'site', 'textlimit', 'dupelimit'),
+                                 'snapshot' => array('run', 'reporturl', 'frequency'));
 
         $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
@@ -110,8 +113,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');
@@ -123,38 +128,71 @@ class SiteadminpanelAction extends AdminPanelAction
     {
         // Validate site name
 
-        if (empty($values['name'])) {
+        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 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."));
+        }
+
+        // Validate dupe limit
+
+        if (!Validate::number($values['site']['dupelimit'], array('min' => 1))) {
+            $this->clientError(_("Dupe limit must 1 or more seconds."));
+        }
+
     }
 }
 
-class SiteAdminPanelForm extends Form
+class SiteAdminPanelForm extends AdminForm
 {
     /**
      * ID of the form
@@ -164,7 +202,7 @@ class SiteAdminPanelForm extends Form
 
     function id()
     {
-        return 'siteadminpanel';
+        return 'form_site_admin_panel';
     }
 
     /**
@@ -175,7 +213,7 @@ class SiteAdminPanelForm extends Form
 
     function formClass()
     {
-        return 'form_site_admin_panel';
+        return 'form_settings';
     }
 
     /**
@@ -197,15 +235,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) {
@@ -214,58 +270,59 @@ 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'),
                              false, $this->value('language'));
-
-        $this->out->checkbox('closed', _('Closed'),
-                             (bool) $this->value('closed'),
-                             _('Is registration on this site prohibited?'));
-
-        $this->out->checkbox('inviteonly', _('Invite-only'),
-                             (bool) $this->value('inviteonly'),
-                             _('Is registration on this site only open to invited users?'));
-
-        $this->out->checkbox('private', _('Private'),
-                             (bool) $this->value('private'),
-                             _('Prohibit anonymous users (not logged in) from viewing site?'));
-    }
-
-    /**
-     * 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->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->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');
+        $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');
     }
 
     /**