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

secure included webinterface-modules; add settings-functions to Froxlor-ApiCommand

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-22 21:05:58 +01:00
parent dfb5d33a56
commit d9ec214e17
5 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,26 +20,23 @@
/**
* Function which returns a correct dirname, means to add slashes at the beginning and at the end if there weren't some
*
* @param string The dirname
* @param string $dir
* The dirname
*
* @return string The corrected dirname
* @author Florian Lippert <flo@syscp.org>
*/
function makeCorrectDir($dir) {
if (version_compare("5.4.6", PHP_VERSION, ">")) {
assert('is_string($dir) && strlen($dir) > 0 /* $dir does not look like an actual folder name */');
} else {
assert('is_string($dir) && strlen($dir) > 0', 'Value "' . $dir .'" does not look like an actual folder name');
function makeCorrectDir($dir)
{
if (is_string($dir) && strlen($dir) > 0) {
$dir = trim($dir);
if (substr($dir, - 1, 1) != '/') {
$dir .= '/';
}
if (substr($dir, 0, 1) != '/') {
$dir = '/' . $dir;
}
$dir = makeSecurePath($dir);
return $dir;
}
$dir = trim($dir);
if (substr($dir, -1, 1) != '/') {
$dir.= '/';
}
if (substr($dir, 0, 1) != '/') {
$dir = '/' . $dir;
}
$dir = makeSecurePath($dir);
return $dir;
throw new Exception("Cannot validate directory in " . __FUNCTION__ . " which is very dangerous.");
}