diff --git a/.htaccess b/.htaccess
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 26a2b6f..6585f1d
--- a/README.md
+++ b/README.md
@@ -4,6 +4,10 @@ PictShare is an multi lingual, open source image hosting service with a simple r
+The filter update is out!
+========
+[Check it out](#filters)
+
## Why would I want to host my own images?
If you own a server (even an home server) you can host your own PictShare instance so you have full control over your content and can delete images hasslefree.
@@ -30,6 +34,24 @@ Just by editing the URL and adding the size (in width**x**height) the image gets
You can limit the number of resizes per image in the ```index.php``` file
+## Filters
+PictShare also supports multiple filters (at once) that you can apply just by changing the URL.
+Filters that need values are set like this: ```filtername_value```. Eg: ```pixelate_10```
+
+Original URL: ```https://www.pictshare.net/b260e36b60.jpg```
+
+| Filter | Paramter | Example URL | Result |
+| ---------------------------------------------------------------------- |
+| negative | -none- | https://pictshare.net/negative/b260e36b60.jpg |  |
+| grayscale | -none- | https://pictshare.net/negative/b260e36b60.jpg |  |
+| brightness | -255 to 255 | https://pictshare.net/brightness_100/b260e36b60.jpg |  |
+| edgedetect | -none- | https://pictshare.net/edgedetect/b260e36b60.jpg |  |
+| smooth | -10 to 2048 | https://pictshare.net/smooth_3/b260e36b60.jpg |  |
+| contrast | -100 to 100 | https://pictshare.net/contrast_-90/b260e36b60.jpg |  |
+| pixelate | -100 to 100 | https://pictshare.net/pixelate_10/b260e36b60.jpg |  |
+
+
+
## How does the external-upload-API work?
### From URL
diff --git a/classes/easyphpthumbnail.php b/classes/easyphpthumbnail.php
index 2014d60..35f7e8a 100644
--- a/classes/easyphpthumbnail.php
+++ b/classes/easyphpthumbnail.php
@@ -733,6 +733,16 @@ class easyphpthumbnail {
$this->Displacementmapthumb = array(0,'',0,0,0,25,25);
}
+
+ public function getIm()
+ {
+ return $this->im;
+ }
+
+ public function getThumb()
+ {
+ return $this->thumb;
+ }
/**
* Class destructor
diff --git a/classes/image.php b/classes/image.php
index 67b92fe..50695fb 100644
--- a/classes/image.php
+++ b/classes/image.php
@@ -60,4 +60,93 @@ class Image
return '/'.$filename;
}
+
+ function rotate(&$im,$direction)
+ {
+ switch($direction)
+ {
+ case 'upside': $angle = 180;break;
+ case 'left': $angle = 90;break;
+ case 'right': $angle = -90;break;
+ default: $angle = 0;break;
+ }
+
+ $im = imagerotate($im,$angle,0);
+ }
+
+ /**
+ * From: https://stackoverflow.com/questions/4590441/php-thumbnail-image-resizing-with-proportions
+ */
+ function resize(&$img,$size)
+ {
+ if(!is_numeric($size))
+ $size = explode('x',$size);
+
+ if(is_array($size))
+ {
+ $maxwidth = $size[0];
+ $maxheight = $size[1];
+ }
+ else if($size)
+ {
+ $maxwidth = $size;
+ $maxheight = $size;
+ }
+
+ $width = imagesx($img);
+ $height = imagesy($img);
+
+ if($maxwidth>$width)$maxwidth = $width;
+ if($maxheight>$height)$maxheight = $height;
+
+ if ($height > $width)
+ {
+ $ratio = $maxheight / $height;
+ $newheight = $maxheight;
+ $newwidth = $width * $ratio;
+ }
+ else
+ {
+ $ratio = $maxwidth / $width;
+ $newwidth = $maxwidth;
+ $newheight = $height * $ratio;
+ }
+
+ $newimg = imagecreatetruecolor($newwidth,$newheight);
+
+ $palsize = ImageColorsTotal($img);
+ for ($i = 0; $i < $palsize; $i++)
+ {
+ $colors = ImageColorsForIndex($img, $i);
+ ImageColorAllocate($newimg, $colors['red'], $colors['green'], $colors['blue']);
+ }
+
+ imagecopyresized($newimg, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
+
+ $img = $newimg;
+ }
+
+ function filter(&$im,$vars)
+ {
+
+ foreach($vars as $var)
+ {
+ if(strpos($var,'_'))
+ {
+ $a = explode('_',$var);
+ $var = $a[0];
+ $val = $a[1];
+ }
+ switch($var)
+ {
+ case 'negative': imagefilter($im,IMG_FILTER_NEGATE); break;
+ case 'grayscale': imagefilter($im,IMG_FILTER_GRAYSCALE); break;
+ case 'brightness': imagefilter($im,IMG_FILTER_BRIGHTNESS,$val); break;
+ case 'edgedetect': imagefilter($im,IMG_FILTER_EDGEDETECT); break;
+ case 'smooth': imagefilter($im,IMG_FILTER_SMOOTH,$val); break;
+ case 'contrast': imagefilter($im,IMG_FILTER_CONTRAST,$val); break;
+ case 'pixelate': imagefilter($im,IMG_FILTER_PIXELATE,$val); break;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/inc/core.php b/inc/core.php
index 6f6c301..3e06f69 100644
--- a/inc/core.php
+++ b/inc/core.php
@@ -41,6 +41,11 @@ function aasort (&$array, $key)
$array=$ret;
}
+function sanatizeString($string)
+{
+ return preg_replace("/[^a-zA-Z0-9._]+/", "", $string);
+}
+
function callHook()
{
@@ -48,34 +53,98 @@ function callHook()
global $default;
$urlArray = explode("/",$url);
+ whatToDo($urlArray);
+}
+
+function whatToDo($url)
+{
$pm = new PictshareModel();
- $u1 = preg_replace("/[^a-zA-Z0-9._]+/", "", $urlArray[0]);
- $u2 = preg_replace("/[^a-zA-Z0-9._]+/", "", $urlArray[1]);
+ foreach($url as $el)
+ {
+ $el = sanatizeString($el);
+ $el = strtolower($el);
+ if(!$el) continue;
+
+ if(isImage($el))
+ $data['hash']=$el;
+ else if(isSize($el))
+ $data['size'] = $el;
+ else if(isRotation($el))
+ $data['rotate'] = $el;
+ else if(isFilter($el))
+ $data['filter'][] = $el;
+ else if($legacy = isLegacyThumbnail($el)) //so old uploads will still work
+ {
+ $data['hash'] = $legacy['hash'];
+ $data['size'] = $legacy['size'];
+ }
+ }
- if(isImage($u1)) // render the image
- renderImage($u1);
- else if($u1=='store' || $u1=='originals') //render also with legacy urls
- renderImage($u2);
- else if(isResizedImage($u1,$u2)) // resize and render
- renderResizedImage($u1,$u2);
- else if($u1=='thumbs')
- renderLegacyResized($u2);
- else if(!$u1)
+ if(!is_array($data) || !$data['hash'])
{
if($_POST['submit']==$pm->translate(3))
$o=$pm->ProcessUploads();
else
$o.= $pm->renderUploadForm();
+
+ $vars['content'] = $o;
+ $vars['slogan'] = $pm->translate(2);
+
+ render($vars);
}
else
- header("HTTP/1.0 404 Not Found");
+ renderImage($data);
+}
+
+function isLegacyThumbnail($val)
+{
+ if(strpos($val,'_'))
+ {
+ $a = explode('_',$val);
+ $size = $a[0];
+ $hash = $a[1];
+ if(!isSize($size) || !isImage($hash)) return false;
+ return array('hash'=>$hash,'size'=>$size);
+ }
+ else return false;
+}
+
+function isFilter($var)
+{
+ if(strpos($var,'_'))
+ {
+ $a = explode('_',$var);
+ $var = $a[0];
+ $val = $a[1];
+ if(!is_numeric($val)) return false;
+ }
- $vars['content'] = $o;
- $vars['slogan'] = $pm->translate(2);
-
- render($vars);
+ switch($var)
+ {
+ case 'negative':
+ case 'grayscale':
+ case 'brightness':
+ case 'edgedetect':
+ case 'smooth':
+ case 'contrast':
+ case 'pixelate': return true;
+
+ default: return false;
+ }
+}
+
+function isRotation($var)
+{
+ switch($var)
+ {
+ case 'upside':
+ case 'left':
+ case 'right': return true;
+
+ default: return false;
+ }
}
function renderLegacyResized($path)
@@ -95,15 +164,24 @@ function renderLegacyResized($path)
renderResizedImage($size,$hash);
}
-function renderImage($hash,$file=false)
+function renderImage($data)
{
-
+ $hash = $data['hash'];
$pm = new PictshareModel();
- if(!$file) $file = DS.$hash;
- $path = ROOT.DS.'upload'.DS.$hash.$file;
+ $base_path = ROOT.DS.'upload'.DS.$hash.DS;
+ $path = $base_path.$hash;
$type = $pm->isTypeAllowed($pm->getTypeOfFile($path));
+ $cached = false;
- if($pm->countResizedImages($hash)>MAX_RESIZED_IMAGES) //if the number of max resized images is reached, just show the real one
+ $cachename = getCacheName($data);
+ $cachepath = $base_path.$cachename;
+ if(file_exists($cachepath))
+ {
+ $path = $cachepath;
+ $cached = true;
+ }
+
+ if($pm->countResizedImages($hash)>=MAX_RESIZED_IMAGES) //if the number of max resized images is reached, just show the real one
$path = ROOT.DS.'upload'.DS.$hash.DS.$hash;
switch($type)
@@ -111,16 +189,31 @@ function renderImage($hash,$file=false)
case 'jpg':
header ("Content-type: image/jpeg");
$im = imagecreatefromjpeg($path);
+ if(!$cached)
+ {
+ changeImage($im,$data);
+ imagejpeg($im,$cachepath,95);
+ }
imagejpeg($im);
break;
case 'png':
header ("Content-type: image/png");
$im = imagecreatefrompng($path);
+ if(!$cached)
+ {
+ changeImage($im,$data);
+ imagepng($im,$cachepath,1);
+ }
imagepng($im);
break;
case 'gif':
header ("Content-type: image/gif");
$im = imagecreatefromgif($path);
+ if(!$cached)
+ {
+ changeImage($im,$data);
+ imagegif($im,$cachepath);
+ }
imagegif($im);
break;
}
@@ -128,17 +221,48 @@ function renderImage($hash,$file=false)
exit();
}
-function renderResizedImage($size,$hash)
+function changeImage(&$im,$data)
{
- $pm = new PictshareModel();
- $im = new Image();
+ $image = new Image();
+ foreach($data as $action=>$val)
+ {
+
+ switch($action)
+ {
+ case 'rotate': $image->rotate($im,$val);break;
+ case 'size': $image->resize($im,$val);break;
+ case 'filter': $image->filter($im,$val);break;
+ }
+ }
+}
+
+function getCacheName($data)
+{
+ ksort($data);
+ $name = array();
+ foreach($data as $key=>$val)
+ {
+ if($key!='hash')
+ {
+ if(!is_array($val))
+ $name[] = $key.'_'.$val;
+ else
+ foreach($val as $valdata)
+ $name[] = $valdata;
+ }
+
+ }
- if(is_numeric($size))
- $path = $im->getImage($hash,$size);
- else
- $path = $im->getImage($hash,explode('x',$size));
+ return implode('.',$name).'.'.$data['hash'];
+}
+
+function isSize($var)
+{
+ if(is_numeric($var)) return true;
+ $a = explode('x',$var);
+ if(count($a)!=2 || !is_numeric($a[0]) || !is_numeric($a[1])) return false;
- renderImage($hash,$path);
+ return true;
}
function isImage($hash)
@@ -148,15 +272,6 @@ function isImage($hash)
return $pm->hashExists($hash);
}
-function isResizedImage($resize,$hash)
-{
- if(!isImage($hash) || !$resize || !$hash) return false;
- $a = explode('x',$resize);
- if(!is_numeric($resize) && count($a)!=2) return false;
-
- return true;
-}
-
function render($variables=null)
{
if(is_array($variables))
diff --git a/models/pictsharemodel.php b/models/pictsharemodel.php
index 30a6674..930ed5c 100644
--- a/models/pictsharemodel.php
+++ b/models/pictsharemodel.php
@@ -102,7 +102,7 @@ class PictshareModel extends Model
return array('status'=>'ERR','reason'=>'wrong filetype');
if($dup_id)
- return array('status'=>'OK','type'=>$type,'hash'=>$hash,'url'=>DOMAINPATH.$hash);
+ return array('status'=>'OK','type'=>$type,'hash'=>$hash,'url'=>DOMAINPATH.$hash,'domain'=>DOMAINPATH);
mkdir(ROOT.DS.'upload'.DS.$hash);
$file = ROOT.DS.'upload'.DS.$hash.DS.$hash;
@@ -122,7 +122,7 @@ class PictshareModel extends Model
fclose($fh);
}
- return array('status'=>'OK','type'=>$type,'hash'=>$hash,'url'=>DOMAINPATH.$hash);
+ return array('status'=>'OK','type'=>$type,'hash'=>$hash,'url'=>DOMAINPATH.$hash,'domain'=>DOMAINPATH);
}
function ProcessUploads()
diff --git a/template.php b/template.php
index c835b66..31dc5d9 100644
--- a/template.php
+++ b/template.php
@@ -13,12 +13,11 @@
-
- PictShare - Free picture hosting
+ PictShare - Free image hosting
-
-
+
+