- be sure customer-docroot-prefix is never the same or within the fcgid-configurations-folder
This commit is contained in:
@@ -28,6 +28,7 @@ return array(
|
|||||||
'varname' => 'documentroot_prefix',
|
'varname' => 'documentroot_prefix',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '/var/customers/webs/',
|
'default' => '/var/customers/webs/',
|
||||||
|
'plausibility_check_method' => 'checkPathConflicts',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
),
|
),
|
||||||
'system_ipaddress' => array(
|
'system_ipaddress' => array(
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_type' => 'dir',
|
'string_type' => 'dir',
|
||||||
'default' => '/var/www/php-fcgi-scripts/',
|
'default' => '/var/www/php-fcgi-scripts/',
|
||||||
|
'plausibility_check_method' => 'checkPathConflicts',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
),
|
),
|
||||||
'system_mod_fcgid_tmpdir' => array(
|
'system_mod_fcgid_tmpdir' => array(
|
||||||
|
|||||||
60
lib/functions/validate/function.checkPathConflicts.php
Normal file
60
lib/functions/validate/function.checkPathConflicts.php
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This file is part of the Froxlor project.
|
||||||
|
* 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 Froxlor team <team@froxlor.org> (2010-)
|
||||||
|
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
|
||||||
|
* @package Functions
|
||||||
|
* @version $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
function checkPathConflicts($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
|
||||||
|
{
|
||||||
|
global $settings;
|
||||||
|
if((int)$settings['system']['mod_fcgid'] == 1)
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* fcgid-configdir has changed ->
|
||||||
|
* check against customer-doc-prefix
|
||||||
|
*/
|
||||||
|
if($fieldname == "system_mod_fcgid_configdir")
|
||||||
|
{
|
||||||
|
$newdir = makeCorrectDir($newfieldvalue);
|
||||||
|
$cdir = makeCorrectDir($settings['system']['documentroot_prefix']);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* customer-doc-prefix has changed ->
|
||||||
|
* check against fcgid-configdir
|
||||||
|
*/
|
||||||
|
elseif($fieldname == "system_documentroot_prefix")
|
||||||
|
{
|
||||||
|
$newdir = makeCorrectDir($newfieldvalue);
|
||||||
|
$cdir = makeCorrectDir($settings['system']['mod_fcgid_configdir']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// neither dir can be within the other nor can they be equal
|
||||||
|
if(substr($newdir, 0, strlen($cdir)) == $cdir
|
||||||
|
|| substr($cdir, 0, strlen($newdir)) == $newdir
|
||||||
|
|| $newdir == $cdir
|
||||||
|
) {
|
||||||
|
$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'fcgidpathcannotbeincustomerdoc');
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_OK);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $returnvalue;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user