- Search in relative path for security settings if they were not found in the default location.

Till Brehm · Till Brehm · commit e14a82779bd6 · 2014-08-14T22:41:45.000+02:00
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
@@ -59,7 +59,9 @@ public function get_security_config($section = '') {
 		global $app;
 
 		$app->uses('ini_parser');
-		$security_config = $app->ini_parser->parse_ini_string(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
+		$security_config_path = '/usr/local/ispconfig/security/security_settings.ini';
+		if(!is_file($security_config_path)) $security_config_path = realpath(ISPC_ROOT_PATH.'/../security/security_settings.ini');
+		$security_config = $app->ini_parser->parse_ini_string(file_get_contents($security_config_path));
 
 		return ($section == '') ? $security_config : $security_config[$section];
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,9 @@ public function get_security_config($section = '') {`
`59`	`59`	`global $app;`
`60`	`60`
`61`	`61`	`$app->uses('ini_parser');`
`62`		`- $security_config = $app->ini_parser->parse_ini_string(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));`
	`62`	`+ $security_config_path = '/usr/local/ispconfig/security/security_settings.ini';`
	`63`	`+ if(!is_file($security_config_path)) $security_config_path = realpath(ISPC_ROOT_PATH.'/../security/security_settings.ini');`
	`64`	`+ $security_config = $app->ini_parser->parse_ini_string(file_get_contents($security_config_path));`
`63`	`65`
`64`	`66`	`return ($section == '') ? $security_config : $security_config[$section];`
`65`	`67`	`}`