summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/sessionsadminpanel.php201
-rw-r--r--actions/useradminpanel.php20
-rw-r--r--lib/adminpanelaction.php11
-rw-r--r--lib/default.php2
-rw-r--r--lib/router.php3
5 files changed, 212 insertions, 25 deletions
diff --git a/actions/sessionsadminpanel.php b/actions/sessionsadminpanel.php
new file mode 100644
index 000000000..4386ef844
--- /dev/null
+++ b/actions/sessionsadminpanel.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Sessions administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Settings
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Admin site sessions
+ *
+ * @category Admin
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class SessionsadminpanelAction extends AdminPanelAction
+{
+ /**
+ * Returns the page title
+ *
+ * @return string page title
+ */
+
+ function title()
+ {
+ return _('Sessions');
+ }
+
+ /**
+ * Instructions for using this form.
+ *
+ * @return string instructions
+ */
+
+ function getInstructions()
+ {
+ return _('Session settings for this StatusNet site.');
+ }
+
+ /**
+ * Show the site admin panel form
+ *
+ * @return void
+ */
+
+ function showForm()
+ {
+ $form = new SessionsAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save settings from the form
+ *
+ * @return void
+ */
+
+ function saveSettings()
+ {
+ static $booleans = array('sessions' => array('handle', 'debug'));
+
+ $values = array();
+
+ 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);
+
+ // assert(all values are valid);
+
+ $config = new Config();
+
+ $config->query('BEGIN');
+
+ foreach ($booleans as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ function validate(&$values)
+ {
+ // stub
+ }
+}
+
+class SessionsAdminPanelForm extends AdminForm
+{
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+
+ function id()
+ {
+ return 'sessionsadminpanel';
+ }
+
+ /**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_settings';
+ }
+
+ /**
+ * Action of the form
+ *
+ * @return string URL of the action
+ */
+
+ function action()
+ {
+ return common_local_url('sessionsadminpanel');
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions'));
+ $this->out->element('legend', null, _('Sessions'));
+
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+ $this->out->checkbox('handle', _('Handle sessions'),
+ (bool) $this->value('handle', 'sessions'),
+ _('Whether to handle sessions ourselves.'));
+ $this->unli();
+
+ $this->li();
+ $this->out->checkbox('debug', _('Session debugging'),
+ (bool) $this->value('debug', 'sessions'),
+ _('Turn on debugging output for sessions.'));
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+
+ $this->out->elementEnd('fieldset');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings'));
+ }
+}
diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
index 5de2db5ff..6813222f5 100644
--- a/actions/useradminpanel.php
+++ b/actions/useradminpanel.php
@@ -96,7 +96,6 @@ class UseradminpanelAction extends AdminPanelAction
);
static $booleans = array(
- 'sessions' => array('handle', 'debug'),
'invite' => array('enabled')
);
@@ -261,26 +260,7 @@ class UserAdminPanelForm extends AdminForm
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
- $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions'));
- $this->out->element('legend', null, _('Sessions'));
- $this->out->elementStart('ul', 'form_data');
-
- $this->li();
- $this->out->checkbox('sessions-handle', _('Handle sessions'),
- (bool) $this->value('handle', 'sessions'),
- _('Whether to handle sessions ourselves.'));
- $this->unli();
-
- $this->li();
- $this->out->checkbox('sessions-debug', _('Session debugging'),
- (bool) $this->value('debug', 'sessions'),
- _('Turn on debugging output for sessions.'));
- $this->unli();
-
- $this->out->elementEnd('ul');
-
- $this->out->elementEnd('fieldset');
}
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index f62bfa458..f05627b31 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -327,9 +327,14 @@ class AdminPanelNav extends Widget
_('Access configuration'), $action_name == 'accessadminpanel', 'nav_design_admin_panel');
}
- if ($this->canAdmin('paths')) {
- $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
- _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
+ if ($this->canAdmin('paths')) {
+ $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
+ _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
+ }
+
+ if ($this->canAdmin('sessions')) {
+ $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
+ _('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_design_admin_panel');
}
Event::handle('EndAdminPanelNav', array($this));
diff --git a/lib/default.php b/lib/default.php
index c01508695..1337a9633 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -266,7 +266,7 @@ $default =
'OpenID' => null),
),
'admin' =>
- array('panels' => array('design', 'site', 'user', 'paths', 'access')),
+ array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions')),
'singleuser' =>
array('enabled' => false,
'nickname' => null),
diff --git a/lib/router.php b/lib/router.php
index 03765b39d..be9cfac0c 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -637,8 +637,9 @@ class Router
$m->connect('admin/site', array('action' => 'siteadminpanel'));
$m->connect('admin/design', array('action' => 'designadminpanel'));
$m->connect('admin/user', array('action' => 'useradminpanel'));
- $m->connect('admin/access', array('action' => 'accessadminpanel'));
+ $m->connect('admin/access', array('action' => 'accessadminpanel'));
$m->connect('admin/paths', array('action' => 'pathsadminpanel'));
+ $m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
$m->connect('getfile/:filename',
array('action' => 'getfile'),
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-24 14:22:28 +0000