Merge pull request #2902 from tobiasd/20161110-lng

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index fab34a62f03b395f33749d12e5cbb7b0e2634319..0d60282d5ffc19f7fa39d93f9edfb12722ba25dc 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -72,7 +72,7 @@ function photo_init(&$a) {
 
                $uid = str_replace(array('.jpg','.png'),array('',''), $person);
 
-               $r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
+               $r = qu("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
                        intval($resolution),
                        intval($uid)
                );
@@ -102,7 +102,7 @@ function photo_init(&$a) {
                }
 
         // check if the photo exists and get the owner of the photo
-               $r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
+               $r = qu("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
                        dbesc($photo),
                        intval($resolution)
                );
@@ -112,7 +112,7 @@ function photo_init(&$a) {
 
                        // Now we'll see if we can access the photo
 
-                       $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
+                       $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
                                dbesc($photo),
                                intval($resolution)
                        );
@@ -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();