diff options
| -rw-r--r-- | actions/all.php | 11 | ||||
| -rw-r--r-- | actions/avatarsettings.php | 83 | ||||
| -rw-r--r-- | actions/finishopenidlogin.php | 2 | ||||
| -rw-r--r-- | actions/grouplogo.php | 86 | ||||
| -rw-r--r-- | actions/login.php | 1 | ||||
| -rw-r--r-- | actions/openidlogin.php | 13 | ||||
| -rw-r--r-- | actions/showstream.php | 7 | ||||
| -rw-r--r-- | actions/tagrss.php | 16 | ||||
| -rw-r--r-- | classes/Avatar.php | 96 | ||||
| -rw-r--r-- | classes/Profile.php | 67 | ||||
| -rw-r--r-- | classes/User.php | 11 | ||||
| -rwxr-xr-x | classes/User_group.php | 77 | ||||
| -rw-r--r-- | lib/imagefile.php | 124 | ||||
| -rw-r--r-- | lib/settingsaction.php | 7 | ||||
| -rw-r--r-- | lib/util.php | 105 |
15 files changed, 284 insertions, 422 deletions
diff --git a/actions/all.php b/actions/all.php index 428466f24..b03ad7ec3 100644 --- a/actions/all.php +++ b/actions/all.php @@ -101,4 +101,15 @@ class AllAction extends Action $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->page, 'all', array('nickname' => $this->user->nickname)); } + + function showPageTitle() + { + $user =& common_current_user(); + if ($user && ($user->id == $this->user->id)) { + $this->element('h1', NULL, _("You and friends")); + } else { + $this->element('h1', NULL, sprintf(_('%s and friends'), $this->user->nickname)); + } + } + } diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 3029b0621..68c6ce701 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -34,6 +34,8 @@ if (!defined('LACONICA')) { require_once INSTALLDIR.'/lib/accountsettingsaction.php'; +define('MAX_ORIGINAL', 480); + /** * Upload an avatar * @@ -286,7 +288,7 @@ class AvatarsettingsAction extends AccountSettingsAction $filepath = common_avatar_path($filename); - move_uploaded_file($imagefile->filename, $filepath); + move_uploaded_file($imagefile->filepath, $filepath); $filedata = array('filename' => $filename, 'filepath' => $filepath, @@ -312,10 +314,6 @@ class AvatarsettingsAction extends AccountSettingsAction function cropAvatar() { - $user = common_current_user(); - - $profile = $user->getProfile(); - $filedata = $_SESSION['FILEDATA']; if (!$filedata) { @@ -323,73 +321,22 @@ class AvatarsettingsAction extends AccountSettingsAction return; } - $x = $this->arg('avatar_crop_x'); - $y = $this->arg('avatar_crop_y'); - $w = ($this->arg('avatar_crop_w')) ? $this->arg('avatar_crop_w') : $filedata['width']; - $h = ($this->arg('avatar_crop_h')) ? $this->arg('avatar_crop_h') : $filedata['height']; - - $filepath = common_avatar_path($filedata['filename']); - - if (!file_exists($filepath)) { - $this->serverError(_('Lost our file.')); - return; - } - - switch ($filedata['type']) { - case IMAGETYPE_GIF: - $image_src = imagecreatefromgif($filepath); - break; - case IMAGETYPE_JPEG: - $image_src = imagecreatefromjpeg($filepath); - break; - case IMAGETYPE_PNG: - $image_src = imagecreatefrompng($filepath); - break; - default: - $this->serverError(_('Unknown file type')); - return; - } - - common_debug("W = $w, H = $h, X = $x, Y = $y"); - - $image_dest = imagecreatetruecolor($w, $h); - - $background = imagecolorallocate($image_dest, 0, 0, 0); - ImageColorTransparent($image_dest, $background); - imagealphablending($image_dest, false); - - imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $w, $h, $w, $h); - - $cur = common_current_user(); - - $filename = common_avatar_filename($cur->id, - image_type_to_extension($filedata['type']), - null, - common_timestamp()); - - $filepath = common_avatar_path($filename); - - switch ($filedata['type']) { - case IMAGETYPE_GIF: - imagegif($image_dest, $filepath); - break; - case IMAGETYPE_JPEG: - imagejpeg($image_dest, $filepath); - break; - case IMAGETYPE_PNG: - imagepng($image_dest, $filepath); - break; - default: - $this->serverError(_('Unknown file type')); - return; - } + // If image is not being cropped assume pos & dimentions of original + $dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0; + $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; $user = common_current_user(); + $profile = $user->getProfile(); - $profile = $cur->getProfile(); + $imagefile = new ImageFile($user->id, $filedata['filepath']); + $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h); - if ($profile->setOriginal($filepath)) { - @unlink(common_avatar_path($filedata['filename'])); + if ($profile->setOriginal($filename)) { + @unlink($filedata['filepath']); unset($_SESSION['FILEDATA']); $this->mode = 'upload'; $this->showForm(_('Avatar updated.'), true); diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index 880a9505b..bc9151120 100644 --- a/actions/finishopenidlogin.php +++ b/actions/finishopenidlogin.php @@ -30,7 +30,7 @@ class FinishopenidloginAction extends Action function handle($args) { parent::handle($args); - if (common_logged_in()) { + if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $token = $this->trimmed('token'); diff --git a/actions/grouplogo.php b/actions/grouplogo.php index ba9cdfe2a..294005f1b 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -350,7 +350,7 @@ class GrouplogoAction extends Action $filepath = common_avatar_path($filename); - move_uploaded_file($imagefile->filename, $filepath); + move_uploaded_file($imagefile->filepath, $filepath); $filedata = array('filename' => $filename, 'filepath' => $filepath, @@ -364,7 +364,7 @@ class GrouplogoAction extends Action $this->mode = 'crop'; - $this->showForm(_('Pick a square area of the image to be your avatar'), + $this->showForm(_('Pick a square area of the image to be the logo.'), true); } @@ -376,80 +376,26 @@ class GrouplogoAction extends Action function cropLogo() { - $user = common_current_user(); - - $profile = $user->getProfile(); - $filedata = $_SESSION['FILEDATA']; if (!$filedata) { $this->serverError(_('Lost our file data.')); return; } - - $x = $this->arg('avatar_crop_x'); - $y = $this->arg('avatar_crop_y'); - $w = ($this->arg('avatar_crop_w')) ? $this->arg('avatar_crop_w') : $filedata['width']; - $h = ($this->arg('avatar_crop_h')) ? $this->arg('avatar_crop_h') : $filedata['height']; - - $filepath = common_avatar_path($filedata['filename']); - - if (!file_exists($filepath)) { - $this->serverError(_('Lost our file.')); - return; - } - - switch ($filedata['type']) { - case IMAGETYPE_GIF: - $image_src = imagecreatefromgif($filepath); - break; - case IMAGETYPE_JPEG: - $image_src = imagecreatefromjpeg($filepath); - break; - case IMAGETYPE_PNG: - $image_src = imagecreatefrompng($filepath); - break; - default: - $this->serverError(_('Unknown file type')); - return; - } - - $size = ($w > MAX_ORIGINAL) ? MAX_ORIGINAL : $w; - - $image_dest = imagecreatetruecolor($size, $size); - - $background = imagecolorallocate($image_dest, 0, 0, 0); - ImageColorTransparent($image_dest, $background); - imagealphablending($image_dest, false); - - imagecopyresized($image_dest, $image_src, - 0, 0, $x, $y, - $size, $size, $w, $h); - - $filename = common_avatar_filename($this->group->id, - image_type_to_extension($filedata['type']), - null, - 'group-'.common_timestamp()); - - $filepath = common_avatar_path($filename); - - switch ($filedata['type']) { - case IMAGETYPE_GIF: - imagegif($image_dest, $filepath); - break; - case IMAGETYPE_JPEG: - imagejpeg($image_dest, $filepath); - break; - case IMAGETYPE_PNG: - imagepng($image_dest, $filepath); - break; - default: - $this->serverError(_('Unknown file type')); - return; - } - - if ($this->group->setOriginal($filename, $filedata['type'])) { - @unlink(common_avatar_path($filedata['filename'])); + + // If image is not being cropped assume pos & dimentions of original + $dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0; + $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; + + $imagefile = new ImageFile($this->group->id, $filedata['filepath']); + $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h); + + if ($this->group->setOriginal($filename)) { + @unlink($filedata['filepath']); unset($_SESSION['FILEDATA']); $this->mode = 'upload'; $this->showForm(_('Logo updated.'), true); diff --git a/actions/login.php b/actions/login.php index 98cc8a855..71e467929 100644 --- a/actions/login.php +++ b/actions/login.php @@ -78,6 +78,7 @@ class LoginAction extends Action } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); } else { + common_ensure_session(); $this->showForm(); } } diff --git a/actions/openidlogin.php b/actions/openidlogin.php index 7a267a2bd..1a4372d73 100644 --- a/actions/openidlogin.php +++ b/actions/openidlogin.php @@ -26,7 +26,7 @@ class OpenidloginAction extends Action function handle($args) { parent::handle($args); - if (common_logged_in()) { + if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $openid_url = $this->trimmed('openid_url'); @@ -59,7 +59,16 @@ class OpenidloginAction extends Action function getInstructions() { - return _('Login with an [OpenID](%%doc.openid%%) account.'); + if (common_logged_in() && !common_is_real_login() && + common_get_returnto()) { + // rememberme logins have to reauthenticate before + // changing any profile settings (cookie-stealing protection) + return _('For security reasons, please re-login with your ' . + '[OpenID](%%doc.openid%%) ' . + 'before changing your settings.'); + } else { + return _('Login with an [OpenID](%%doc.openid%%) account.'); + } } function showPageNotice() diff --git a/actions/showstream.php b/actions/showstream.php index 90ffcacf9..4b1679969 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -140,7 +140,12 @@ class ShowstreamAction extends Action function showPageTitle() { - $this->element('h1', NULL, $this->profile->nickname._("'s profile")); + $user =& common_current_user(); + if ($user && ($user->id == $this->profile->id)) { + $this->element('h1', NULL, _("Your profile")); + } else { + $this->element('h1', NULL, sprintf(_('%s\'s profile'), $this->profile->nickname)); + } } function showPageNoticeBlock() diff --git a/actions/tagrss.php b/actions/tagrss.php index b4c2dcdff..a77fa12c9 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -25,12 +25,12 @@ require_once(INSTALLDIR.'/lib/rssaction.php'); class TagrssAction extends Rss10Action { + var $tag; - function init() - { - $tag = $this->trimmed('tag'); + function prepare($args) { + parent::prepare($args); + $tag = common_canonical_tag($this->trimmed('tag')); $this->tag = Notice_tag::staticGet('tag', $tag); - if (!$this->tag) { $this->clientError(_('No such tag.')); return false; @@ -39,7 +39,7 @@ class TagrssAction extends Rss10Action } } - function get_notices($limit=0) + function getNotices($limit=0) { $tag = $this->tag; @@ -48,7 +48,6 @@ class TagrssAction extends Rss10Action } $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit); - while ($notice->fetch()) { $notices[] = clone($notice); } @@ -56,10 +55,9 @@ class TagrssAction extends Rss10Action return $notices; } - function get_channel() + function getChannel() { - $tag = $this->tag->tag; - + $tagname = $this->tag->tag; $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)), 'title' => $tagname, 'link' => common_local_url('tagrss', array('tag' => $tagname)), diff --git a/classes/Avatar.php b/classes/Avatar.php index 9ae920647..6a9ea7686 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -36,102 +36,6 @@ class Avatar extends Memcached_DataObject @unlink(common_avatar_path($filename)); } } - - # Create and save scaled version of this avatar - # XXX: maybe break into different methods - - function scale($size) - { - - $image_s = imagecreatetruecolor($size, $size); - $image_a = $this->to_image(); - $square = min($this->width, $this->height); - imagecolortransparent($image_s, imagecolorallocate($image_s, 0, 0, 0)); - imagealphablending($image_s, false); - imagesavealpha($image_s, true); - imagecopyresampled($image_s, $image_a, 0, 0, 0, 0, - $size, $size, $square, $square); - - $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png"; - - $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp()); - - if ($this->mediatype == 'image/jpeg') { - imagejpeg($image_s, common_avatar_path($filename)); - } else { - imagepng($image_s, common_avatar_path($filename)); - } - - $scaled = DB_DataObject::factory('avatar'); - $scaled->profile_id = $this->profile_id; - $scaled->width = $size; - $scaled->height = $size; - $scaled->original = false; - $scaled->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png'; - $scaled->filename = $filename; - $scaled->url = common_avatar_url($filename); - $scaled->created = DB_DataObject_Cast::dateTime(); # current time - - if ($scaled->insert()) { - return $scaled; - } else { - return null; - } - } - - function scale_and_crop($size, $x, $y, $w, $h) - { - - $image_s = imagecreatetruecolor($size, $size); - $image_a = $this->to_image(); - - # Retain alpha channel info if possible for .pngs - $background = imagecolorallocate($image_s, 0, 0, 0); - ImageColorTransparent($image_s, $background); - imagealphablending($image_s, false); - - imagecopyresized($image_s, $image_a, 0, 0, $x, $y, $size, $size, $w, $h); - - $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png"; - - $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp()); - - if ($this->mediatype == 'image/jpeg') { - imagejpeg($image_s, common_avatar_path($filename)); - } else { - imagepng($image_s, common_avatar_path($filename)); - } - - $cropped = DB_DataObject::factory('avatar'); - $cropped->profile_id = $this->profile_id; - $cropped->width = $size; - $cropped->height = $size; - $cropped->original = false; - $cropped->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png'; - $cropped->filename = $filename; - $cropped->url = common_avatar_url($filename); - $cropped->created = DB_DataObject_Cast::dateTime(); # current time - - if ($cropped->insert()) { - return $cropped; - } else { - return NULL; - } - } - - function to_image() - { - $filepath = common_avatar_path($this->filename); - if ($this->mediatype == 'image/gif') { - return imagecreatefromgif($filepath); - } else if ($this->mediatype == 'image/jpeg') { - return imagecreatefromjpeg($filepath); - } else if ($this->mediatype == 'image/png') { - return imagecreatefrompng($filepath); - } else { - return NULL; - } - } function &pkeyGet($kv) { diff --git a/classes/Profile.php b/classes/Profile.php index ab5a48e57..5be632f87 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -69,28 +69,15 @@ class Profile extends Memcached_DataObject } } - function setOriginal($source) + function setOriginal($filename) { - - $info = @getimagesize($source); - - if (!$info) { - return null; - } - - $filename = common_avatar_filename($this->id, - image_type_to_extension($info[2]), - null, common_timestamp()); - $filepath = common_avatar_path($filename); - - copy($source, $filepath); + $imagefile = new ImageFile($this->id, common_avatar_path($filename)); $avatar = new Avatar(); - $avatar->profile_id = $this->id; - $avatar->width = $info[0]; - $avatar->height = $info[1]; - $avatar->mediatype = image_type_to_mime_type($info[2]); + $avatar->width = $imagefile->width; + $avatar->height = $imagefile->height; + $avatar->mediatype = image_type_to_mime_type($imagefile->type); $avatar->filename = $filename; $avatar->original = true; $avatar->url = common_avatar_url($filename); @@ -98,21 +85,29 @@ class Profile extends Memcached_DataObject # XXX: start a transaction here - if (!$this->delete_avatars()) { - @unlink($filepath); - return null; - } - - if (!$avatar->insert()) { - @unlink($filepath); + if (!$this->delete_avatars() || !$avatar->insert()) { + @unlink(common_avatar_path($filename)); return null; } foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { # We don't do a scaled one if original is our scaled size if (!($avatar->width == $size && $avatar->height == $size)) { - $s = $avatar->scale($size); - if (!$s) { + + $scaled_filename = $imagefile->resize($size); + + //$scaled = DB_DataObject::factory('avatar'); + $scaled = new Avatar(); + $scaled->profile_id = $this->id; + $scaled->width = $size; + $scaled->height = $size; + $scaled->original = false; + $scaled->mediatype = image_type_to_mime_type($imagefile->type); + $scaled->filename = $scaled_filename; + $scaled->url = common_avatar_url($scaled_filename); + $scaled->created = DB_DataObject_Cast::dateTime(); # current time + + if (!$scaled->insert()) { return null; } } @@ -121,24 +116,6 @@ class Profile extends Memcached_DataObject return $avatar; } - function crop_avatars($x, $y, $w, $h) - { - - $avatar = $this->getOriginalAvatar(); - $this->delete_avatars(false); # don't delete original - - foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { - # We don't do a scaled one if original is our scaled size - if (!($avatar->width == $size && $avatar->height == $size)) { - $s = $avatar->scale_and_crop($size, $x, $y, $w, $h); - if (!$s) { - return NULL; - } - } - } - return true; - } - function delete_avatars($original=true) { $avatar = new Avatar(); diff --git a/classes/User.php b/classes/User.php index b1c061c18..a6a1b11b9 100644 --- a/classes/User.php +++ b/classes/User.php @@ -630,4 +630,15 @@ class User extends Memcached_DataObject return $profile; } + + function hasOpenID() + { + $oid = new User_openid(); + + $oid->user_id = $this->id; + + $cnt = $oid->find(); + + return ($cnt > 0); + } } diff --git a/classes/User_group.php b/classes/User_group.php index 522dd8143..340d7f67a 100755 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -88,81 +88,16 @@ class User_group extends Memcached_DataObject return $members; } - function setOriginal($filename, $type) + function setOriginal($filename) { + $imagefile = new ImageFile($this->id, common_avatar_path($filename)); + $orig = clone($this); $this->original_logo = common_avatar_url($filename); - $this->homepage_logo = common_avatar_url($this->scale($filename, - AVATAR_PROFILE_SIZE, - $type)); - $this->stream_logo = common_avatar_url($this->scale($filename, - AVATAR_STREAM_SIZE, - $type)); - $this->mini_logo = common_avatar_url($this->scale($filename, - AVATAR_MINI_SIZE, - $type)); + $this->homepage_logo = common_avatar_url($imagefile->resize(AVATAR_PROFILE_SIZE)); + $this->stream_logo = common_avatar_url($imagefile->resize(AVATAR_STREAM_SIZE)); + $this->mini_logo = common_avatar_url($imagefile->resize(AVATAR_MINI_SIZE)); common_debug(common_log_objstring($this)); return $this->update($orig); } - - function scale($filename, $size, $type) - { - $filepath = common_avatar_path($filename); - - if (!file_exists($filepath)) { - $this->serverError(_('Lost our file.')); - return; - } - - $info = @getimagesize($filepath); - - switch ($type) { - case IMAGETYPE_GIF: - $image_src = imagecreatefromgif($filepath); - break; - case IMAGETYPE_JPEG: - $image_src = imagecreatefromjpeg($filepath); - break; - case IMAGETYPE_PNG: - $image_src = imagecreatefrompng($filepath); - break; - default: - $this->serverError(_('Unknown file type')); - return; - } - - $image_dest = imagecreatetruecolor($size, $size); - - $background = imagecolorallocate($image_dest, 0, 0, 0); - ImageColorTransparent($image_dest, $background); - imagealphablending($image_dest, false); - - imagecopyresized($image_dest, $image_src, - 0, 0, 0, 0, - $size, $size, $info[0], $info[1]); - - $outname = common_avatar_filename($this->id, - image_type_to_extension($type), - $size, - common_timestamp()); - - $outpath = common_avatar_path($outname); - - switch ($type) { - case IMAGETYPE_GIF: - imagegif($image_dest, $outpath); - break; - case IMAGETYPE_JPEG: - imagejpeg($image_dest, $outpath); - break; - case IMAGETYPE_PNG: - imagepng($image_dest, $outpath); - break; - default: - $this->serverError(_('Unknown file type')); - return; - } - - return $outname; - } } diff --git a/lib/imagefile.php b/lib/imagefile.php index 7f1db892c..5e9913235 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -47,18 +47,22 @@ if (!defined('LACONICA')) { class ImageFile { - var $filename = null; - var $barename = null; - var $type = null; - var $height = null; - var $width = null; + var $id; + var $filepath; + var $barename; + var $type; + var $height; + var $width; - function __construct($filename=null, $type=null, $width=null, $height=null) + function __construct($id=null, $filepath=null, $type=null, $width=null, $height=null) { - $this->filename = $filename; - $this->type = $type; - $this->width = $type; - $this->height = $type; + $this->id = $id; + $this->filepath = $filepath; + + $info = @getimagesize($this->filepath); + $this->type = ($info) ? $info[2]:$type; + $this->width = ($info) ? $info[0]:$width; + $this->height = ($info) ? $info[1]:$height; } static function fromUpload($param='upload') @@ -78,32 +82,100 @@ class ImageFile throw new Exception(_('System error uploading file.')); return; } - - $imagefile = new ImageFile($_FILES[$param]['tmp_name']); - $info = @getimagesize($imagefile->filename); - + + $info = @getimagesize($_FILES[$param]['tmp_name']); + if (!$info) { - @unlink($imagefile->filename); + @unlink($_FILES[$param]['tmp_name']); throw new Exception(_('Not an image or corrupt file.')); return; } + + if ($info[2] !== IMAGETYPE_GIF && + $info[2] !== IMAGETYPE_JPEG && + $info[2] !== IMAGETYPE_PNG) { + + @unlink($_FILES[$param]['tmp_name']); + throw new Exception(_('Unsupported image file format.')); + return; + } - $imagefile->width = $info[0]; - $imagefile->height = $info[1]; + return new ImageFile(null, $_FILES[$param]['tmp_name']); + } + + function resize($size, $x = 0, $y = 0, $w = null, $h = null) + { + $w = ($w === null) ? $this->width:$w; + $h = ($h === null) ? $this->height:$h; - switch ($info[2]) { - case IMAGETYPE_GIF: - case IMAGETYPE_JPEG: - case IMAGETYPE_PNG: - $imagefile->type = $info[2]; + if (!file_exists($this->filepath)) { + throw new Exception(_('Lost our file.')); + return; + } + + switch ($this->type) { + case IMAGETYPE_GIF: + $image_src = imagecreatefromgif($this->filepath); break; - default: - @unlink($imagefile->filename); - throw new Exception(_('Unsupported image file format.')); + case IMAGETYPE_JPEG: + $image_src = imagecreatefromjpeg($this->filepath); + break; + case IMAGETYPE_PNG: + $image_src = imagecreatefrompng($this->filepath); + break; + default: + throw new Exception(_('Unknown file type')); + return; + } + + $image_dest = imagecreatetruecolor($size, $size); + + if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG) { + + $transparent_idx = imagecolortransparent($image_src); + + if ($transparent_idx >= 0) { + + $transparent_color = imagecolorsforindex($image_src, $transparent_idx); + $transparent_idx = imagecolorallocate($image_dest, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); + imagefill($image_dest, 0, 0, $transparent_idx); + imagecolortransparent($image_dest, $transparent_idx); + + } elseif ($this->type == IMAGETYPE_PNG) { + + imagealphablending($image_dest, false); + $transparent = imagecolorallocatealpha($image_dest, 0, 0, 0, 127); + imagefill($image_dest, 0, 0, $transparent); + imagesavealpha($image_dest, true); + + } + } + + imagecopyresampled($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $w, $h); + + $outname = common_avatar_filename($this->id, + image_type_to_extension($this->type), + $size, + common_timestamp()); + + $outpath = common_avatar_path($outname); + + switch ($this->type) { + case IMAGETYPE_GIF: + imagegif($image_dest, $outpath); + break; + case IMAGETYPE_JPEG: + imagejpeg($image_dest, $outpath); + break; + case IMAGETYPE_PNG: + imagepng($image_dest, $outpath); + break; + default: + throw new Exception(_('Unknown file type')); return; } - return $imagefile; + return $outname; } function unlink() diff --git a/lib/settingsaction.php b/lib/settingsaction.php index dfe1f114b..53c807c6f 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -76,7 +76,12 @@ class SettingsAction extends Action // change important settings or see private info, and // _all_ our settings are important common_set_returnto($this->selfUrl()); - common_redirect(common_local_url('login')); + $user = common_current_user(); + if ($user->hasOpenID()) { + common_redirect(common_local_url('openidlogin')); + } else { + common_redirect(common_local_url('login')); + } } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); } else { diff --git a/lib/util.php b/lib/util.php index 8f93a8319..cbff35a9d 100644 --- a/lib/util.php +++ b/lib/util.php @@ -386,46 +386,85 @@ function common_render_text($text) $r = htmlspecialchars($text); $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r); - $r = preg_replace_callback('@(ftp|http|https|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://[^\]>\s]+@', 'common_render_uri_thingy', $r); - $r = preg_replace_callback('@(mailto|aim|tel):[^\]>\s]+@', 'common_render_uri_thingy', $r); // Pseudo-protocols don't require '//' after ':'. - $r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); + $r = common_replace_urls_callback($r, 'common_linkify'); + $r = preg_replace('/(^|\(|\[|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); // XXX: machine tags return $r; } -function common_render_uri_thingy($matches) -{ - $uri = $matches[0]; - $trailer = ''; - - // Some heuristics for extracting URIs from surrounding punctuation - // Strip from trailing text... - if (preg_match('/^(.*)([,.:"\']+)$/', $uri, $matches)) { - $uri = $matches[1]; - $trailer = $matches[2]; - } +function common_replace_urls_callback($text, $callback) { + // Start off with a regex + preg_match_all('#(?:(?:(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://|(?:mailto|aim|tel):)[^.\s]+\.[^\s]+|(?:[^.\s/]+\.)+(?:museum|travel|[a-z]{2,4})(?:[:/][^\s]*)?)#i', $text, $matches); + + // Then clean up what the regex left behind + $offset = 0; + foreach($matches[0] as $url) { + $url = htmlspecialchars_decode($url); + + // Make sure we didn't pick up an email address + if (preg_match('#^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$#i', $url)) continue; + + // Remove trailing punctuation + $url = rtrim($url, '.?!,;:\'"`'); + + // Remove surrounding parens and the like + preg_match('/[)\]>]+$/', $url, $trailing); + if (isset($trailing[0])) { + preg_match_all('/[(\[<]/', $url, $opened); + preg_match_all('/[)\]>]/', $url, $closed); + $unopened = count($closed[0]) - count($opened[0]); + + // Make sure not to take off more closing parens than there are at the end + $unopened = ($unopened > mb_strlen($trailing[0])) ? mb_strlen($trailing[0]):$unopened; + + $url = ($unopened > 0) ? mb_substr($url, 0, $unopened * -1):$url; + } - $pairs = array( - ']' => '[', // technically disallowed in URIs, but used in Java docs - ')' => '(', // far too frequent in Wikipedia and MSDN - ); - $final = substr($uri, -1, 1); - if (isset($pairs[$final])) { - $openers = substr_count($uri, $pairs[$final]); - $closers = substr_count($uri, $final); - if ($closers > $openers) { - // Assume the paren was opened outside the URI - $uri = substr($uri, 0, -1); - $trailer = $final . $trailer; + // Remove trailing punctuation again (in case there were some inside parens) + $url = rtrim($url, '.?!,;:\'"`'); + + // Make sure we didn't capture part of the next sentence + preg_match('#((?:[^.\s/]+\.)+)(museum|travel|[a-z]{2,4})#i', $url, $url_parts); + + // Were the parts capitalized any? + $last_part = (mb_strtolower($url_parts[2]) !== $url_parts[2]) ? true:false; + $prev_part = (mb_strtolower($url_parts[1]) !== $url_parts[1]) ? true:false; + + // If the first part wasn't cap'd but the last part was, we captured too much + if ((!$prev_part && $last_part)) { + $url = substr_replace($url, '', mb_strpos($url, '.'.$url_parts[2], 0)); } - } - if ($longurl = common_longurl($uri)) { + + // Capture the new TLD + preg_match('#((?:[^.\s/]+\.)+)(museum|travel|[a-z]{2,4})#i', $url, $url_parts); + + $tlds = array('ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'biz', 'bj', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc', 'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm', 'zw'); + + if (!in_array($url_parts[2], $tlds)) continue; + + // Call user specified func + $modified_url = $callback($url); + + // Replace it! + $start = mb_strpos($text, $url, $offset); + $text = substr_replace($text, $modified_url, $start, mb_strlen($url)); + $offset = $start + mb_strlen($modified_url); + } + + return $text; +} + +function common_linkify($url) { + $display = $url; + $url = (!preg_match('#^([a-z]+://|(mailto|aim|tel):)#i', $url)) ? 'http://'.$url:$url; + + if ($longurl = common_longurl($url)) { $longurl = htmlentities($longurl, ENT_QUOTES, 'UTF-8'); - $title = " title='$longurl'"; + $title = "title=\"$longurl\""; } else $title = ''; - - return '<a href="' . $uri . '"' . $title . ' class="extlink">' . $uri . '</a>' . $trailer; + + return "<a href=\"$url\" $title class=\"extlink\">$display</a>"; } function common_longurl($short_url) @@ -449,7 +488,7 @@ function common_shorten_links($text) static $cache = array(); if (isset($cache[$text])) return $cache[$text]; // \s = not a horizontal whitespace character (since PHP 5.2.4) - return $cache[$text] = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text); + return $cache[$text] = common_replace_urls_callback($text, 'common_shorten_link');; } function common_shorten_link($url, $reverse = false) @@ -697,6 +736,8 @@ function common_fancy_url($action, $args=null) return common_path("api/statuses/public_timeline.atom"); case 'publicxrds': return common_path('xrds'); + case 'tagrss': + return common_path('tag/' . $args['tag'] . '/rss'); case 'featuredrss': return common_path('featuredrss'); case 'favoritedrss': |