X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapiaccountupdateprofilecolors.php;h=109fbf959e2f545ddf861caeceb1ed2fdb7f6646;hb=6e894c010fc0e7ddaaafa8795634d6343019aafb;hp=3cac829749679353ec4fc608a2ee9894367698da;hpb=db64b612961c37477d0729e9ff4f882fb5df7b8d;p=quix0rs-gnu-social.git diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php index 3cac829749..109fbf959e 100644 --- a/actions/apiaccountupdateprofilecolors.php +++ b/actions/apiaccountupdateprofilecolors.php @@ -22,7 +22,7 @@ * @category API * @package StatusNet * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-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/ */ @@ -43,10 +43,8 @@ require_once INSTALLDIR . '/lib/apiauth.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiAccountUpdateProfileColorsAction extends ApiAuthAction { - var $profile_background_color = null; var $profile_text_color = null; var $profile_link_color = null; @@ -59,9 +57,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -100,13 +96,13 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); @@ -115,6 +111,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method updating profile colours. _('API method not found.'), 404, $this->format @@ -125,13 +122,12 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction $design = $this->user->getDesign(); if (!empty($design)) { - $original = clone($design); try { $this->setColors($design); } catch (WebColorException $e) { - $this->clientError($e->getMessage()); + $this->clientError($e->getMessage(), 400, $this->format); return false; } @@ -139,12 +135,11 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if ($result === false) { common_log_db_error($design, 'UPDATE', __FILE__); + // TRANS: Client error displayed when a database error occurs updating profile colours. $this->clientError(_('Could not update your design.')); return; } - } else { - $this->user->query('BEGIN'); // save new design @@ -153,7 +148,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction try { $this->setColors($design); } catch (WebColorException $e) { - $this->clientError($e->getMessage()); + $this->clientError($e->getMessage(), 400, $this->format); return false; } @@ -161,6 +156,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); + // TRANS: Client error displayed when a database error occurs inserting profile colours. $this->clientError(_('Unable to save your design settings.')); return; } @@ -171,6 +167,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); + // TRANS: Client error displayed when a database error occurs updating profile colours. $this->clientError(_('Unable to save your design settings.')); $this->user->query('ROLLBACK'); return; @@ -182,6 +179,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { + // TRANS: Client error displayed a user has no profile updating profile colours. $this->clientError(_('User has no profile.')); return; } @@ -206,7 +204,6 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction * * @return void */ - function setColors($design) { $bgcolor = empty($this->profile_background_color) ? @@ -242,5 +239,4 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction return true; } - }