Merge pull request #927 from annando/master

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index e37b9273859e940e8ca13e5cd4ac5f13f4d44e49..434193f71318edc6b9b63abac8feefb8d95a6b4c 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -7,6 +7,7 @@ function photo_init(&$a) {
        global $_SERVER;
 
        $prvcachecontrol = false;
+       $file = "";
 
        switch($a->argc) {
                case 4:
@@ -20,6 +21,7 @@ function photo_init(&$a) {
                        break;
                case 2:
                        $photo = $a->argv[1];
+                       $file = $photo;
                        break;
                case 1:
                default:
@@ -42,7 +44,6 @@ function photo_init(&$a) {
                exit;
        }
 
-
        $default = 'images/person-175.jpg';
 
        if(isset($type)) {
@@ -94,7 +95,7 @@ function photo_init(&$a) {
                foreach( Photo::supportedTypes() as $m=>$e){
                        $photo = str_replace(".$e",'',$photo);
                }
-       
+
                if(substr($photo,-2,1) == '-') {
                        $resolution = intval(substr($photo,-1,1));
                        $photo = substr($photo,0,-2);
@@ -105,7 +106,7 @@ function photo_init(&$a) {
                        intval($resolution)
                );
                if(count($r)) {
-                       
+
                        $sql_extra = permissions_sql($r[0]['uid']);
 
                        // Now we'll see if we can access the photo
@@ -115,6 +116,8 @@ function photo_init(&$a) {
                                intval($resolution)
                        );
 
+                       $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+
                        if(count($r)) {
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];
@@ -166,10 +169,13 @@ function photo_init(&$a) {
                }
        }
 
-       if(isset($customres) && $customres > 0 && $customres < 500) {
+       // Resize only if its not a GIF
+       if ($mime != "image/gif") {
                $ph = new Photo($data, $mimetype);
                if($ph->is_valid()) {
-                       $ph->scaleImageSquare($customres);
+                       if(isset($customres) && $customres > 0 && $customres < 500) {
+                               $ph->scaleImageSquare($customres);
+                       }
                        $data = $ph->imageString();
                        $mimetype = $ph->getType();
                }
@@ -198,6 +204,18 @@ function photo_init(&$a) {
                header("Cache-Control: max-age=31536000");
        }
        echo $data;
+
+       // If the photo is public and there is an existing photo directory store the photo there
+       if ($public and ($file != "")) {
+               // If the photo path isn't there, try to create it
+               if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+                       if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+                               mkdir($_SERVER["DOCUMENT_ROOT"]."/photo");
+
+               if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+                       file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+       }
+
        killme();
        // NOTREACHED
 }