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

outsource a few directory-functions in a class; make apache-2.4 not create 'require all granted' if there is an active directory-protection or option set for the customerroot-dir, possibly fixes #1455

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-12-01 08:07:28 +01:00
parent e24e8297f1
commit 3be43c4848
6 changed files with 144 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/functions/filedir/function.isConfigDir.php
View File

@@ -1,48 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Florian Lippert <flo@syscp.org> (2003-2009)
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
*/
/**
* Checks if a given directory is valid for multiple configurations
* or should rather be used as a single file
*
* @param string The dir
* @return bool true if usable as dir, false otherwise
*
* @author Florian Lippert <flo@syscp.org>
*/
function isConfigDir($dir, $ifexists = false) {
if (file_exists($dir)) {
if (is_dir($dir)) {
$returnval = true;
} else {
$returnval = false;
}
} else {
if (!$ifexists) {
if (substr($dir, -1) == '/') {
$returnval = true;
} else {
$returnval = false;
}
} else {
$returnval = false;
}
}
return $returnval;
}