nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2161 from ddorian1/release-3.4.3-rc

Browse source 
fix path for photo and proxy
This commit is contained in:
Michael Vogel 2015-12-10 21:20:37 +01:00
commit e8b13bacec
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mod/photo.php
View file

@ -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 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 the photo path isn't there, try to create it
if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/photo")) $basepath = $a->get_basepath();
if (is_writable($_SERVER["DOCUMENT_ROOT"])) if (!is_dir($basepath."/photo"))
mkdir($_SERVER["DOCUMENT_ROOT"]."/photo"); if (is_writable($basepath))
mkdir($basepath."/photo");
if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo")) if (is_dir($basepath."/photo"))
file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data); file_put_contents($basepath."/photo/".$file, $data);
} }
killme(); killme();

15
mod/proxy.php
View file

@ -44,14 +44,15 @@ function proxy_init() {
$thumb = false; $thumb = false;
$size = 1024; $size = 1024;
$sizetype = ""; $sizetype = "";
$basepath = $a->get_basepath();
// If the cache path isn't there, try to create it // If the cache path isn't there, try to create it
if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/proxy")) if (!is_dir($basepath."/proxy"))
if (is_writable($_SERVER["DOCUMENT_ROOT"])) if (is_writable($basepath))
mkdir($_SERVER["DOCUMENT_ROOT"]."/proxy"); mkdir($basepath."/proxy");
// Checking if caching into a folder in the webroot is activated and working // Checking if caching into a folder in the webroot is activated and working
$direct_cache = (is_dir($_SERVER["DOCUMENT_ROOT"]."/proxy") AND is_writable($_SERVER["DOCUMENT_ROOT"]."/proxy")); $direct_cache = (is_dir($basepath."/proxy") AND is_writable($basepath."/proxy"));
// Look for filename in the arguments // Look for filename in the arguments
if ((isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) AND !isset($_REQUEST["url"])) { if ((isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) AND !isset($_REQUEST["url"])) {
@ -211,9 +212,9 @@ function proxy_init() {
// advantage: real file access is really fast // advantage: real file access is really fast
// Otherwise write in cachefile // Otherwise write in cachefile
if ($valid AND $direct_cache) { if ($valid AND $direct_cache) {
file_put_contents($_SERVER["DOCUMENT_ROOT"]."/proxy/".proxy_url($_REQUEST['url'], true), $img_str_orig); file_put_contents($basepath."/proxy/".proxy_url($_REQUEST['url'], true), $img_str_orig);
if ($sizetype <> '') if ($sizetype <> '')
file_put_contents($_SERVER["DOCUMENT_ROOT"]."/proxy/".proxy_url($_REQUEST['url'], true).$sizetype, $img_str); file_put_contents($basepath."/proxy/".proxy_url($_REQUEST['url'], true).$sizetype, $img_str);
} elseif ($cachefile != '') } elseif ($cachefile != '')
file_put_contents($cachefile, $img_str_orig); file_put_contents($cachefile, $img_str_orig);
@ -247,7 +248,7 @@ function proxy_url($url, $writemode = false, $size = "") {
return($url); return($url);
// Creating a sub directory to reduce the amount of files in the cache directory // Creating a sub directory to reduce the amount of files in the cache directory
$basepath = $_SERVER["DOCUMENT_ROOT"]."/proxy"; $basepath = $a->get_basepath()."/proxy";
$path = substr(hash("md5", $url), 0, 2); $path = substr(hash("md5", $url), 0, 2);