Merge pull request #2094 from annando/1511-api

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 93db82a6418c9dc789e9678c7be505340c7330be..fab34a62f03b395f33749d12e5cbb7b0e2634319 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -101,17 +101,18 @@ function photo_init(&$a) {
                        $photo = substr($photo,0,-2);
                }
 
-               $r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d LIMIT 1",
+        // check if the photo exists and get the owner of the photo
+               $r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
                        dbesc($photo),
                        intval($resolution)
                );
                if(count($r)) {
-                       
+
                        $sql_extra = permissions_sql($r[0]['uid']);
 
                        // Now we'll see if we can access the photo
 
-                       $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d $sql_extra LIMIT 1",
+                       $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
                                dbesc($photo),
                                intval($resolution)
                        );
@@ -119,28 +120,16 @@ function photo_init(&$a) {
                        $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
 
                        if(count($r)) {
+                               $resolution = $r[0]['scale'];
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];
-                       }
-                       else {
-
-                               // Does the picture exist? It may be a remote person with no credentials,
-                               // but who should otherwise be able to view it. Show a default image to let 
-                               // them know permissions was denied. It may be possible to view the image 
-                               // through an authenticated profile visit.
-                               // There won't be many completely unauthorised people seeing this because
-                               // they won't have the photo link, so there's a reasonable chance that the person
-                               // might be able to obtain permission to view it.
- 
-                               $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d LIMIT 1",
-                                       dbesc($photo),
-                                       intval($resolution)
-                               );
-                               if(count($r)) {
-                                       $data = file_get_contents('images/nosign.jpg');
-                                       $mimetype = 'image/jpeg';
-                                       $prvcachecontrol = true;
-                               }
+                       } else {
+                               // The picure exists. We already checked with the first query.
+                               // obviously, this is not an authorized viev!
+                               $data = file_get_contents('images/nosign.jpg');
+                               $mimetype = 'image/jpeg';
+                               $prvcachecontrol = true;
+                               $public = false;
                        }
                }
        }
@@ -169,10 +158,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();
                }
@@ -203,9 +195,15 @@ function photo_init(&$a) {
        echo $data;
 
        // If the photo is public and there is an existing photo directory store the photo there
-       if ($public and ($file != ""))
+       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