summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-29 16:55:42 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-29 16:57:36 -0700
commit4321e02c7b6dcc2ceeff301916a0f901a5554b10 (patch)
treebe56b60931a07e4a921bb70a7b316e9741e4da9f /actions
parentd19ffc73c2d4701ba0c63924be13ad4b01c588c4 (diff)
Delete orphaned background imgs. Design settings code now passes
phpcs.
Diffstat (limited to 'actions')
-rw-r--r--actions/groupdesignsettings.php31
-rw-r--r--actions/userdesignsettings.php41
2 files changed, 57 insertions, 15 deletions
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 79c192ac4..df34ecb42 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -34,19 +34,37 @@ if (!defined('LACONICA')) {
require_once INSTALLDIR . '/lib/designsettings.php';
+/**
+ * Setting a groups's design
+ *
+ * Saves a design for a given group
+ *
+ * @category Settings
+ * @package Laconica
+ * @author Zach Copley <zach@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
class GroupDesignSettingsAction extends DesignSettingsAction
{
var $group = null;
/**
- * Prepare to run
+ * Sets the right action for the form, and passes request args into
+ * the base action
+ *
+ * @param array $args misc. arguments
+ *
+ * @return boolean true
*/
function prepare($args)
{
parent::prepare($args);
- if (!common_config('inboxes','enabled')) {
+ if (!common_config('inboxes', 'enabled')) {
$this->serverError(_('Inboxes must be enabled for groups to work'));
return false;
}
@@ -57,7 +75,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
}
$nickname_arg = $this->trimmed('nickname');
- $nickname = common_canonical_nickname($nickname_arg);
+ $nickname = common_canonical_nickname($nickname_arg);
// Permanent redirect on non-canonical nickname
@@ -158,7 +176,8 @@ class GroupDesignSettingsAction extends DesignSettingsAction
* @return Design
*/
- function getWorkingDesign() {
+ function getWorkingDesign()
+ {
$design = null;
@@ -273,9 +292,9 @@ class GroupDesignSettingsAction extends DesignSettingsAction
return;
}
- $original = clone($this->group);
+ $original = clone($this->group);
$this->group->design_id = $id;
- $result = $this->group->update($original);
+ $result = $this->group->update($original);
if (empty($result)) {
common_log_db_error($original, 'UPDATE', __FILE__);
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index ec688d36d..4386d55f8 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -34,8 +34,29 @@ if (!defined('LACONICA')) {
require_once INSTALLDIR . '/lib/designsettings.php';
+/**
+ * Setting a user's design
+ *
+ * Saves a design for a given user
+ *
+ * @category Settings
+ * @package Laconica
+ * @author Zach Copley <zach@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
class UserDesignSettingsAction extends DesignSettingsAction
{
+ /**
+ * Sets the right action for the form, and passes request args into
+ * the base action
+ *
+ * @param array $args misc. arguments
+ *
+ * @return boolean true
+ */
function prepare($args)
{
@@ -73,9 +94,10 @@ class UserDesignSettingsAction extends DesignSettingsAction
* @return Design
*/
- function getWorkingDesign() {
+ function getWorkingDesign()
+ {
- $user = common_current_user();
+ $user = common_current_user();
$design = $user->getDesign();
if (empty($design)) {
@@ -142,7 +164,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
$tile = true;
}
- $user = common_current_user();
+ $user = common_current_user();
$design = $user->getDesign();
if (!empty($design)) {
@@ -189,9 +211,9 @@ class UserDesignSettingsAction extends DesignSettingsAction
return;
}
- $original = clone($user);
+ $original = clone($user);
$user->design_id = $id;
- $result = $user->update($original);
+ $result = $user->update($original);
if (empty($result)) {
common_log_db_error($original, 'UPDATE', __FILE__);
@@ -215,9 +237,10 @@ class UserDesignSettingsAction extends DesignSettingsAction
* @return nothing
*/
- function sethd() {
+ function sethd()
+ {
- $user = common_current_user();
+ $user = common_current_user();
$design = $user->getDesign();
$user->query('BEGIN');
@@ -241,9 +264,9 @@ class UserDesignSettingsAction extends DesignSettingsAction
return;
}
- $original = clone($user);
+ $original = clone($user);
$user->design_id = $id;
- $result = $user->update($original);
+ $result = $user->update($original);
if (empty($result)) {
common_log_db_error($original, 'UPDATE', __FILE__);