maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

trim path before checking, fixes #927

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-04 16:10:17 +02:00
parent faa8169964
commit 95efc2f3a7
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/functions/filedir/function.makeCorrectDir.php
View File

@@ -25,18 +25,16 @@
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
*/ */
function makeCorrectDir($dir) function makeCorrectDir($dir) {
{
if(substr($dir, -1, 1) != '/') $dir = trim($dir);
{
if (substr($dir, -1, 1) != '/') {
$dir.= '/'; $dir.= '/';
} }
if (substr($dir, 0, 1) != '/') {
if(substr($dir, 0, 1) != '/')
{
$dir = '/' . $dir; $dir = '/' . $dir;
} }
$dir = makeSecurePath($dir); $dir = makeSecurePath($dir);
return $dir; return $dir;
} }