whitespace in User_group
This commit is contained in:
parent
01fce5df27
commit
2d6a9b4fbe
|
@ -92,14 +92,14 @@ class User_group extends Memcached_DataObject
|
||||||
$orig = clone($this);
|
$orig = clone($this);
|
||||||
$this->original_logo = common_avatar_url($filename);
|
$this->original_logo = common_avatar_url($filename);
|
||||||
$this->homepage_logo = common_avatar_url($this->scale($filename,
|
$this->homepage_logo = common_avatar_url($this->scale($filename,
|
||||||
AVATAR_PROFILE_SIZE,
|
AVATAR_PROFILE_SIZE,
|
||||||
$type));
|
$type));
|
||||||
$this->stream_logo = common_avatar_url($this->scale($filename,
|
$this->stream_logo = common_avatar_url($this->scale($filename,
|
||||||
AVATAR_STREAM_SIZE,
|
AVATAR_STREAM_SIZE,
|
||||||
$type));
|
$type));
|
||||||
$this->mini_logo = common_avatar_url($this->scale($filename,
|
$this->mini_logo = common_avatar_url($this->scale($filename,
|
||||||
AVATAR_MINI_SIZE,
|
AVATAR_MINI_SIZE,
|
||||||
$type));
|
$type));
|
||||||
common_debug(common_log_objstring($this));
|
common_debug(common_log_objstring($this));
|
||||||
return $this->update($orig);
|
return $this->update($orig);
|
||||||
}
|
}
|
||||||
|
@ -116,13 +116,13 @@ class User_group extends Memcached_DataObject
|
||||||
$info = @getimagesize($filepath);
|
$info = @getimagesize($filepath);
|
||||||
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case IMAGETYPE_GIF:
|
case IMAGETYPE_GIF:
|
||||||
$image_src = imagecreatefromgif($filepath);
|
$image_src = imagecreatefromgif($filepath);
|
||||||
break;
|
break;
|
||||||
case IMAGETYPE_JPEG:
|
case IMAGETYPE_JPEG:
|
||||||
$image_src = imagecreatefromjpeg($filepath);
|
$image_src = imagecreatefromjpeg($filepath);
|
||||||
break;
|
break;
|
||||||
case IMAGETYPE_PNG:
|
case IMAGETYPE_PNG:
|
||||||
$image_src = imagecreatefrompng($filepath);
|
$image_src = imagecreatefrompng($filepath);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -136,25 +136,25 @@ class User_group extends Memcached_DataObject
|
||||||
ImageColorTransparent($image_dest, $background);
|
ImageColorTransparent($image_dest, $background);
|
||||||
imagealphablending($image_dest, false);
|
imagealphablending($image_dest, false);
|
||||||
|
|
||||||
imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $info[0], $info[1]);
|
imagecopyresized($image_dest, $image_src,
|
||||||
|
0, 0, 0, 0,
|
||||||
|
$size, $size, $info[0], $info[1]);
|
||||||
|
|
||||||
$cur = common_current_user();
|
$outname = common_avatar_filename($this->id,
|
||||||
|
|
||||||
$outname = common_avatar_filename($cur->id,
|
|
||||||
image_type_to_extension($type),
|
image_type_to_extension($type),
|
||||||
null,
|
$size,
|
||||||
common_timestamp());
|
common_timestamp());
|
||||||
|
|
||||||
$outpath = common_avatar_path($outname);
|
$outpath = common_avatar_path($outname);
|
||||||
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case IMAGETYPE_GIF:
|
case IMAGETYPE_GIF:
|
||||||
imagegif($image_dest, $outpath);
|
imagegif($image_dest, $outpath);
|
||||||
break;
|
break;
|
||||||
case IMAGETYPE_JPEG:
|
case IMAGETYPE_JPEG:
|
||||||
imagejpeg($image_dest, $outpath);
|
imagejpeg($image_dest, $outpath);
|
||||||
break;
|
break;
|
||||||
case IMAGETYPE_PNG:
|
case IMAGETYPE_PNG:
|
||||||
imagepng($image_dest, $outpath);
|
imagepng($image_dest, $outpath);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user