X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgrouplogo.php;h=10fd33088d6a60fa3445b1339febd442e595d4be;hb=261ccfac8699534ff584a2f93d5dcd384529d855;hp=856c860a0288511a8229c4292d405448cf6d3030;hpb=47f31bce47b182aa55c02c7872d7e473d3ab10f2;p=quix0rs-gnu-social.git diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 856c860a02..10fd33088d 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -23,7 +23,7 @@ * @package StatusNet * @author Evan Prodromou * @author Zach Copley - * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2008-2011 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/ */ @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/accountsettingsaction.php'; + define('MAX_ORIGINAL', 480); @@ -49,7 +49,7 @@ define('MAX_ORIGINAL', 480); * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class GrouplogoAction extends GroupDesignAction +class GrouplogoAction extends GroupAction { var $mode = null; var $imagefile = null; @@ -60,14 +60,13 @@ class GrouplogoAction extends GroupDesignAction /** * Prepare to run */ - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); if (!common_logged_in()) { // TRANS: Client error displayed when trying to create a group while not logged in. $this->clientError(_('You must be logged in to create a group.')); - return false; } $nickname_arg = $this->trimmed('nickname'); @@ -78,30 +77,27 @@ class GrouplogoAction extends GroupDesignAction if ($nickname_arg != $nickname) { $args = array('nickname' => $nickname); common_redirect(common_local_url('grouplogo', $args), 301); - return false; } if (!$nickname) { // TRANS: Client error displayed when trying to change group logo settings without providing a nickname. $this->clientError(_('No nickname.'), 404); - return false; } $groupid = $this->trimmed('groupid'); if ($groupid) { - $this->group = User_group::staticGet('id', $groupid); + $this->group = User_group::getKV('id', $groupid); } else { - $local = Local_group::staticGet('nickname', $nickname); + $local = Local_group::getKV('nickname', $nickname); if ($local) { - $this->group = User_group::staticGet('id', $local->group_id); + $this->group = User_group::getKV('id', $local->group_id); } } if (!$this->group) { // TRANS: Client error displayed when trying to update logo settings for a non-existing group. $this->clientError(_('No such group.'), 404); - return false; } $cur = common_current_user(); @@ -109,15 +105,14 @@ class GrouplogoAction extends GroupDesignAction if (!$cur->isAdmin($this->group)) { // TRANS: Client error displayed when trying to change group logo settings while not being a group admin. $this->clientError(_('You must be an admin to edit the group.'), 403); - return false; } return true; } - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); } else { @@ -180,9 +175,8 @@ class GrouplogoAction extends GroupDesignAction if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed coming across a request from a user without a profile. - $this->serverError(_('User without matching profile.')); - return; + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); } $original = $this->group->original_logo; @@ -204,7 +198,7 @@ class GrouplogoAction extends GroupDesignAction $this->elementStart('li', array('id' => 'avatar_original', 'class' => 'avatar_view')); // TRANS: Uploaded original file in group logo form. - $this->element('h2', null, _("Original")); + $this->element('h2', null, _('Original')); $this->elementStart('div', array('id'=>'avatar_original_view')); $this->element('img', array('src' => $this->group->original_logo, 'alt' => $this->group->nickname)); @@ -216,7 +210,7 @@ class GrouplogoAction extends GroupDesignAction $this->elementStart('li', array('id' => 'avatar_preview', 'class' => 'avatar_view')); // TRANS: Header for preview of to be displayed group logo. - $this->element('h2', null, _("Preview")); + $this->element('h2', null, _('Preview')); $this->elementStart('div', array('id'=>'avatar_preview_view')); $this->element('img', array('src' => $this->group->homepage_logo, 'width' => AVATAR_PROFILE_SIZE, @@ -267,7 +261,7 @@ class GrouplogoAction extends GroupDesignAction array('id' => 'avatar_original', 'class' => 'avatar_view')); // TRANS: Header for originally uploaded file before a crop on the group logo page. - $this->element('h2', null, _("Original")); + $this->element('h2', null, _('Original')); $this->elementStart('div', array('id'=>'avatar_original_view')); $this->element('img', array('src' => Avatar::url($this->filedata['filename']), 'width' => $this->filedata['width'], @@ -280,7 +274,7 @@ class GrouplogoAction extends GroupDesignAction array('id' => 'avatar_preview', 'class' => 'avatar_view')); // TRANS: Header for the cropped group logo on the group logo page. - $this->element('h2', null, _("Preview")); + $this->element('h2', null, _('Preview')); $this->elementStart('div', array('id'=>'avatar_preview_view')); $this->element('img', array('src' => Avatar::url($this->filedata['filename']), 'width' => AVATAR_PROFILE_SIZE, @@ -389,7 +383,6 @@ class GrouplogoAction extends GroupDesignAction if (!$filedata) { // TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present. $this->serverError(_('Lost our file data.')); - return; } // If image is not being cropped assume pos & dimentions of original @@ -438,7 +431,7 @@ class GrouplogoAction extends GroupDesignAction function showStylesheets() { parent::showStylesheets(); - $this->cssLink('css/jquery.Jcrop.css','base','screen, projection, tv'); + $this->cssLink('js/extlib/jquery-jcrop/css/jcrop.css','base','screen, projection, tv'); } /** @@ -451,16 +444,10 @@ class GrouplogoAction extends GroupDesignAction parent::showScripts(); if ($this->mode == 'crop') { - $this->script('jcrop/jquery.Jcrop.min.js'); - $this->script('jcrop/jquery.Jcrop.go.js'); + $this->script('extlib/jquery-jcrop/jcrop.js'); + $this->script('jcrop.go.js'); } $this->autofocus('avatarfile'); } - - function showLocalNav() - { - $nav = new GroupNav($this, $this->group); - $nav->show(); - } }