MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1808 from annando/issue-1421

Browse source 
The temp path now contains the host name
This commit is contained in:
Tobias Diekershoff 2015-08-12 06:34:19 +02:00
parent 9381a8cd1c 59b2891737
commit b4845230bf
1 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
boot.php
View file

@ -1619,9 +1619,9 @@ if(! function_exists('load_contact_links')) {
$url = normalise_link($rr['url']); $url = normalise_link($rr['url']);
$ret[$url] = $rr; $ret[$url] = $rr;
} }
} } else
else
$ret['empty'] = true; $ret['empty'] = true;
$a->contacts = $ret; $a->contacts = $ret;
return; return;
} }
@ -1659,8 +1659,7 @@ function explode_querystring($query) {
if($arg_st !== false) { if($arg_st !== false) {
$base = substr($query, 0, $arg_st); $base = substr($query, 0, $arg_st);
$arg_st += 1; $arg_st += 1;
} } else {
else {
$base = ''; $base = '';
$arg_st = 0; $arg_st = 0;
} }
@ -1805,15 +1804,23 @@ function get_lockpath() {
} }
function get_temppath() { function get_temppath() {
$a = get_app();
$temppath = get_config("system","temppath"); $temppath = get_config("system","temppath");
if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath))
return($temppath); return($temppath);
$temppath = sys_get_temp_dir(); $temppath = sys_get_temp_dir();
if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) { if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) {
$temppath .= "/".$a->get_hostname();
if (!is_dir($temppath))
mkdir($temppath);
if (is_dir($temppath) AND is_writable($temppath)) {
set_config("system", "temppath", $temppath); set_config("system", "temppath", $temppath);
return($temppath); return($temppath);
} }
}
return(""); return("");
} }