gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 22:47:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- searchConfigFilePath() uses getConfigDir() to get configuration directory

Browse Source
This commit is contained in:
steinm 2012-04-16 19:37:46 +00:00
parent 53c7829806
commit 122da09a18
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
inc/inc.ClassSettings.php
View File

@ -627,43 +627,53 @@ class Settings { /* {{{ */
function searchConfigFilePath() { /* {{{ */ function searchConfigFilePath() { /* {{{ */
$configFilePath = null; $configFilePath = null;
if($configDir = $this->getConfigDir()) {
if (file_exists($configDir."/settings.xml"))
return $configDir."/settings.xml";
}
/*
// Search config file // Search config file
$_tmp = dirname($_SERVER['SCRIPT_FILENAME']); $_tmp = dirname($_SERVER['SCRIPT_FILENAME']);
if(is_link($_tmp)) if(is_link($_tmp)) {
{
$_arr = preg_split('/\//', $_tmp); $_arr = preg_split('/\//', $_tmp);
array_pop($_arr); array_pop($_arr);
$configFilePath = implode('/', $_arr)."/conf/settings.xml"; $configFilePath = implode('/', $_arr)."/conf/settings.xml";
} } else {
else
{
if (file_exists("../conf/settings.xml")) if (file_exists("../conf/settings.xml"))
$configFilePath = "../conf/settings.xml"; $configFilePath = "../conf/settings.xml";
else if (file_exists("conf/settings.xml")) else if (file_exists("conf/settings.xml"))
$configFilePath = "conf/settings.xml"; $configFilePath = "conf/settings.xml";
else
{
// echo "Configuration file not found <br>";
// echo "Please create conf/settings.xml file. You can use installation procedure or 'conf/settings.xml.template' file to help you";
// exit;
}
} }
*/
return $configFilePath; return $configFilePath;
} /* }}} */ } /* }}} */
/** /**
* Returns absolute path for configuration files respecting links * Returns absolute path for configuration files respecting links
* *
* This function checks three directories for a configuration directory
* 1. The directory where the current script is located adding '/conf'
* 2. The parent directory of the current script adding '/conf'
* 3. The directory /etc/letodms
* @return NULL|string config directory * @return NULL|string config directory
*/ */
function getConfigDir() { /* {{{ */ function getConfigDir() { /* {{{ */
$_tmp = dirname($_SERVER['SCRIPT_FILENAME']); $_tmp = dirname($_SERVER['SCRIPT_FILENAME']);
$_arr = preg_split('/\//', $_tmp); $_arr = preg_split('/\//', $_tmp);
array_pop($_arr); $configDir = null;
if(file_exists(implode('/', $_arr)."/conf/"))
$configDir = implode('/', $_arr)."/conf/";
else {
array_pop($_arr);
if(file_exists(implode('/', $_arr)."/conf/")) {
$configDir = implode('/', $_arr)."/conf/";
} else {
if(file_exists('/etc/letodms'))
$configDir = '/etc/letodms';
}
}
$configDir = implode('/', $_arr)."/conf/";
return $configDir; return $configDir;
} /* }}} */ } /* }}} */
@ -918,6 +928,7 @@ class Settings { /* {{{ */
"systemerror" => $connTmp->ErrorMsg() "systemerror" => $connTmp->ErrorMsg()
); );
} else { } else {
/*
$dms = new LetoDMS_Core_DMS($db, $this->_contentDir.$this->_contentOffsetDir); $dms = new LetoDMS_Core_DMS($db, $this->_contentDir.$this->_contentOffsetDir);
if(!$dms->checkVersion()) { if(!$dms->checkVersion()) {
@ -928,6 +939,7 @@ class Settings { /* {{{ */
"suggestion" => 'updateDatabase' "suggestion" => 'updateDatabase'
); );
} }
*/
} }
} }
} }