summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/imagefile.php124
-rw-r--r--lib/util.php103
2 files changed, 169 insertions, 58 deletions
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/util.php b/lib/util.php
index 8f93a8319..579f964ac 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)