Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 7783b6a256f5a4c723f1454dd4b424d458775174..4166b4d53949d4f9cb5b1f9467c045b224ef98e0 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -120,16 +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'];
+                               $resolution = $r[0]['scale'];
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];
-                       }
-                       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;
+                       } 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;
                        }
                }
        }
@@ -197,12 +197,13 @@ function photo_init(&$a) {
        // 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");
+               $basepath = $a->get_basepath();
+               if (!is_dir($basepath."/photo"))
+                       if (is_writable($basepath))
+                               mkdir($basepath."/photo");
 
-               if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
-                       file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+               if (is_dir($basepath."/photo"))
+                       file_put_contents($basepath."/photo/".$file, $data);
        }
 
        killme();