summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/apidirectmessage.php1
-rw-r--r--actions/apigrouplist.php1
-rw-r--r--actions/apigrouplistall.php1
-rw-r--r--actions/apigroupmembership.php1
-rw-r--r--actions/apigroupshow.php1
-rw-r--r--actions/apistatusesshow.php1
-rw-r--r--actions/apisubscriptions.php1
-rw-r--r--actions/apitimelinefavorites.php1
-rw-r--r--actions/apitimelinefriends.php1
-rw-r--r--actions/apitimelinegroup.php1
-rw-r--r--actions/apitimelinehome.php1
-rw-r--r--actions/apitimelinementions.php1
-rw-r--r--actions/apitimelinepublic.php1
-rw-r--r--actions/apitimelinetag.php1
-rw-r--r--actions/apitimelineuser.php1
-rw-r--r--actions/designadminpanel.php19
-rw-r--r--actions/editapplication.php7
-rw-r--r--actions/licenseadminpanel.php303
-rw-r--r--actions/newapplication.php2
-rw-r--r--actions/oauthconnectionssettings.php2
-rw-r--r--actions/pathsadminpanel.php2
-rw-r--r--actions/sessionsadminpanel.php2
-rw-r--r--actions/shownotice.php1
-rw-r--r--actions/useradminpanel.php7
24 files changed, 348 insertions, 12 deletions
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 7a0f46274..e7ea38dfa 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -357,6 +357,7 @@ class ApiDirectMessageAction extends ApiAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
strtotime($this->messages[0]->created),
strtotime($this->messages[$last]->created)
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 148c802f4..319a1e424 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -213,6 +213,7 @@ class ApiGroupListAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
strtotime($this->groups[0]->created),
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index a8317608d..cc7cd901d 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -204,6 +204,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
strtotime($this->groups[0]->created),
strtotime($this->groups[$last]->created))
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index ffd5c7c7d..b7f3064b5 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -183,6 +183,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->group->id,
strtotime($this->profiles[0]->created),
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 2998e505e..9b90e6b38 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -149,6 +149,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->group->id,
strtotime($this->group->modified))
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 476820a43..84f8079db 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -194,6 +194,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->notice->id,
strtotime($this->notice->created))
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 63d65f289..749d16f06 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -181,6 +181,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
isset($this->ids_only) ? 'IDs' : 'Profiles',
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 7228960c0..f5ce5d2fd 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -259,6 +259,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
strtotime($this->notices[0]->created),
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 40ce35979..c96391c12 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -346,6 +346,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
strtotime($this->notices[0]->created),
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 7a40fd808..5138a4b5e 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -229,6 +229,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->group->id,
strtotime($this->notices[0]->created),
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 27eb74169..1ceb3d902 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -254,6 +254,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
strtotime($this->notices[0]->created),
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index ed1ad20e3..354dc58b6 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -244,6 +244,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
strtotime($this->notices[0]->created),
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index f90164288..0119b504a 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -311,6 +311,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
strtotime($this->notices[0]->created),
strtotime($this->notices[$last]->created))
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index c7ec172ae..712703694 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -232,6 +232,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->tag,
strtotime($this->notices[0]->created),
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 17a283663..0c97aad21 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -234,6 +234,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
return '"' . implode(
':',
array($this->arg('action'),
+ common_user_cache_hash($this->auth_user),
common_language(),
$this->user->id,
strtotime($this->notices[0]->created),
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 763737175..4285f7d73 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -71,7 +71,7 @@ class DesignadminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('Design settings for this StatusNet site.');
+ return _('Design settings for this StatusNet site');
}
/**
@@ -154,9 +154,22 @@ class DesignadminpanelAction extends AdminPanelAction
$config->query('BEGIN');
- // Only update colors if the theme has not changed.
+ if ($themeChanged) {
+ // If the theme has changed, reset custom colors and let them pick
+ // up the new theme's defaults.
+ $colors = array('background', 'content', 'sidebar', 'text', 'link');
+ foreach ($colors as $colorKey) {
+ // Clear from global config so we see defaults on this page...
+ $GLOBALS['config']['design'][$colorKey . 'color'] = false;
- if (!$themeChanged) {
+ // And remove old settings from DB...
+ $this->deleteSetting('design', $colorKey . 'color');
+ }
+ } else {
+ // Only save colors from the form if the theme has not changed.
+ //
+ // @fixme a future more ajaxy form should allow theme switch
+ // and color customization in one step.
$bgcolor = new WebColor($this->trimmed('design_background'));
$ccolor = new WebColor($this->trimmed('design_content'));
diff --git a/actions/editapplication.php b/actions/editapplication.php
index 64cf0a574..477bcd6f0 100644
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -188,7 +188,7 @@ class EditApplicationAction extends OwnerDesignAction
} elseif (Oauth_application::descriptionTooLong($description)) {
$this->showForm(sprintf(
_('Description is too long (max %d chars).'),
- Oauth_application::maxDescription()));
+ Oauth_application::maxDesc()));
return;
} elseif (mb_strlen($source_url) > 255) {
$this->showForm(_('Source URL is too long.'));
@@ -253,7 +253,10 @@ class EditApplicationAction extends OwnerDesignAction
$result = $this->app->update($orig);
- if (!$result) {
+ // Note: 0 means no rows changed, which can happen if the only
+ // thing we changed was the icon, since it's not altered until
+ // the next step.
+ if ($result === false) {
common_log_db_error($this->app, 'UPDATE', __FILE__);
$this->serverError(_('Could not update application.'));
}
diff --git a/actions/licenseadminpanel.php b/actions/licenseadminpanel.php
new file mode 100644
index 000000000..c9aad5c4f
--- /dev/null
+++ b/actions/licenseadminpanel.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * License 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);
+}
+
+/**
+ * License settings
+ *
+ * @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 LicenseadminpanelAction extends AdminPanelAction
+{
+
+ /**
+ * Returns the page title
+ *
+ * @return string page title
+ */
+
+ function title()
+ {
+ // TRANS: User admin panel title
+ return _m('TITLE', 'License');
+ }
+
+ /**
+ * Instructions for using this form.
+ *
+ * @return string instructions
+ */
+
+ function getInstructions()
+ {
+ return _('License for this StatusNet site');
+ }
+
+ /**
+ * Show the site admin panel form
+ *
+ * @return void
+ */
+
+ function showForm()
+ {
+ $form = new LicenseAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save settings from the form
+ *
+ * @return void
+ */
+
+ function saveSettings()
+ {
+ static $settings = array(
+ 'license' => array('type', 'owner', 'url', 'title', 'image')
+ );
+
+ $values = array();
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting] = $this->trimmed($setting);
+ }
+ }
+
+ // This throws an exception on validation errors
+
+ $this->validate($values);
+
+ // assert(all values are valid);
+
+ $config = new Config();
+
+ $config->query('BEGIN');
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ /**
+ * Validate License admin form values
+ *
+ * @param array &$values from the form
+ *
+ * @return nothing
+ */
+
+ function validate(&$values)
+ {
+ // Validate license type (shouldn't have to do it, but just in case)
+
+ $types = array('private', 'allrightsreserved', 'cc');
+
+ if (!in_array($values['license']['type'], $types)) {
+ $this->clientError(_("Invalid license selection."));
+ }
+
+ // Make sure the user has set an owner if the site has a private
+ // license
+
+ if ($values['license']['type'] == 'allrightsreserved'
+ && empty($values['license']['owner'])
+ ) {
+ $this->clientError(
+ _("You must specify the owner of the content when using the All Rights Reserved license.")
+ );
+ }
+
+ // Make sure the license title is not too long
+ if (mb_strlen($values['license']['type']) > 255) {
+ $this->clientError(
+ _("Invalid license title. Max length is 255 characters.")
+ );
+ }
+
+ // make sure the license URL and license image URL are valid URLs
+
+ $options = array('allowed_schemes' => array('http', 'https'));
+
+ if (!Validate::uri($values['license']['url'], $options)) {
+ $this->clientError(_("Invalid license URL."));
+ }
+
+ if (!Validate::uri($values['license']['image'], $options)) {
+ $this->clientError(_("Invalid license image URL."));
+ }
+ }
+}
+
+class LicenseAdminPanelForm extends AdminForm
+{
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+
+ function id()
+ {
+ return 'licenseadminpanel';
+ }
+
+ /**
+ * 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('licenseadminpanel');
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $this->out->elementStart(
+ 'fieldset', array('id' => 'settings_license-selection')
+ );
+ $this->out->element('legend', null, _('License selection'));
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+
+ $types = array(
+ 'private' => _('Private'),
+ 'allrightsreserved' => _('All Rights Reserved'),
+ 'cc' => _('Creative Commons')
+ );
+
+ $this->out->dropdown(
+ 'type',
+ _('Type'),
+ $types,
+ _('Select license'),
+ false,
+ $this->value('type', 'license')
+ );
+
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart(
+ 'fieldset',
+ array('id' => 'settings_license-details')
+ );
+ $this->out->element('legend', null, _('License details'));
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+ $this->input(
+ 'owner',
+ _('Owner'),
+ _('Name of the owner of the site\'s content (if applicable).'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'title',
+ _('License Title'),
+ _('The title of the license.'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'url',
+ _('License URL'),
+ _('URL for more information about the license.'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'image', _('License Image URL'),
+ _('URL for an image to display with the license.'),
+ 'license'
+ );
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit(
+ 'submit', _('Save'), 'submit', null, _('Save license settings')
+ );
+ }
+}
diff --git a/actions/newapplication.php b/actions/newapplication.php
index 0f819b349..8b150c315 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -170,7 +170,7 @@ class NewApplicationAction extends OwnerDesignAction
} elseif (Oauth_application::descriptionTooLong($description)) {
$this->showForm(sprintf(
_('Description is too long (max %d chars).'),
- Oauth_application::maxDescription()));
+ Oauth_application::maxDesc()));
return;
} elseif (empty($source_url)) {
$this->showForm(_('Source URL is required.'));
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index 8a206d710..1fa70662f 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -80,7 +80,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
function getInstructions()
{
- return _('You have allowed the following applications to access you account.');
+ return _('You have allowed the following applications to access your account.');
}
/**
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index 7ff3c2583..0c83aa29e 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -67,7 +67,7 @@ class PathsadminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('Path and server settings for this StatusNet site.');
+ return _('Path and server settings for this StatusNet site');
}
/**
diff --git a/actions/sessionsadminpanel.php b/actions/sessionsadminpanel.php
index 4386ef844..e9bd1719f 100644
--- a/actions/sessionsadminpanel.php
+++ b/actions/sessionsadminpanel.php
@@ -62,7 +62,7 @@ class SessionsadminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('Session settings for this StatusNet site.');
+ return _('Session settings for this StatusNet site');
}
/**
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 9c5d83441..86df5f9f3 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -151,6 +151,7 @@ class ShownoticeAction extends OwnerDesignAction
strtotime($this->avatar->modified) : 0;
return 'W/"' . implode(':', array($this->arg('action'),
+ common_user_cache_hash(),
common_language(),
$this->notice->id,
strtotime($this->notice->created),
diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
index ee9c23076..04e0ca3e7 100644
--- a/actions/useradminpanel.php
+++ b/actions/useradminpanel.php
@@ -12,6 +12,7 @@
* (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.
@@ -24,7 +25,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/
*/
@@ -67,7 +68,7 @@ class UseradminpanelAction extends AdminPanelAction
function getInstructions()
{
- return _('User settings for this StatusNet site.');
+ return _('User settings for this StatusNet site');
}
/**
@@ -291,6 +292,6 @@ class UserAdminPanelForm extends AdminForm
function formActions()
{
- $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings'));
+ $this->out->submit('submit', _('Save'), 'submit', null, _('Save user settings'));
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-08-08 14:03:46 +0000