X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgrouplogo.php;h=0d9c135785ad5264cccc398ae574fd0233746404;hb=e868ac41cd8221c45dfed56a43d155fb2307a7e4;hp=e4a497cf8faafbbe4815c7e2a82868a0c8bb73b8;hpb=adaad5bb5ea45c7647f5c1de881881861d85ae39;p=quix0rs-gnu-social.git diff --git a/actions/grouplogo.php b/actions/grouplogo.php index e4a497cf8f..0d9c135785 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -23,18 +23,12 @@ * @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/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/accountsettingsaction.php'; - -define('MAX_ORIGINAL', 480); +if (!defined('GNUSOCIAL')) { exit(1); } /** * Upload an avatar @@ -49,7 +43,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,15 +54,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'); @@ -79,30 +71,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 having a 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(); @@ -110,15 +99,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 { @@ -181,9 +169,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; @@ -205,7 +192,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)); @@ -217,7 +204,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, @@ -247,7 +234,6 @@ class GrouplogoAction extends GroupDesignAction $this->elementEnd('fieldset'); $this->elementEnd('form'); - } function showCropForm() @@ -269,7 +255,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'], @@ -282,7 +268,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, @@ -304,7 +290,6 @@ class GrouplogoAction extends GroupDesignAction $this->elementEnd('ul'); $this->elementEnd('fieldset'); $this->elementEnd('form'); - } /** @@ -392,7 +377,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 @@ -400,13 +384,20 @@ class GrouplogoAction extends GroupDesignAction $dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0; $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$filedata['width']; $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height']; - $size = min($dest_w, $dest_h); - $size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size; + $size = min($dest_w, $dest_h, common_config('avatar', 'maxsize')); + $box = array('width' => $size, 'height' => $size, + 'x' => $dest_x, 'y' => $dest_y, + 'w' => $dest_w, 'h' => $dest_h); - $imagefile = new ImageFile($this->group->id, $filedata['filepath']); - $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h); + $profile = $this->group->getProfile(); - if ($this->group->setOriginal($filename)) { + $imagefile = new ImageFile(null, $filedata['filepath']); + $filename = Avatar::filename($profile->getID(), image_type_to_extension($imagefile->preferredType()), + $size, common_timestamp()); + + $imagefile->resizeTo(Avatar::path($filename), $box); + + if ($profile->setOriginal($filename)) { @unlink($filedata['filepath']); unset($_SESSION['FILEDATA']); $this->mode = 'upload'; @@ -438,11 +429,10 @@ class GrouplogoAction extends GroupDesignAction * * @return void */ - 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'); } /** @@ -450,22 +440,15 @@ class GrouplogoAction extends GroupDesignAction * * @return void */ - function showScripts() { 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(); - } }