diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e695242fc..002bb3312 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -95,6 +95,8 @@ class Settings { /* {{{ */ var $_coreDir = null; // Path to SeedDMS_Lucene var $_luceneClassDir = null; + // The base URL without _httpRoot + var $_baseUrl = ""; // The relative path in the URL, after the domain part. var $_httpRoot = "/seeddms/"; // Where the uploaded files are stored (best to choose a directory that @@ -565,6 +567,7 @@ class Settings { /* {{{ */ if($node) { $tab = $node[0]->attributes(); $this->_rootDir = strval($tab["rootDir"]); + $this->_baseUrl = strval($tab["baseUrl"]); $this->_httpRoot = strval($tab["httpRoot"]); $this->_contentDir = strval($tab["contentDir"]); if($this->_contentDir && substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR) @@ -935,6 +938,7 @@ class Settings { /* {{{ */ $this->getXMLNode($xml, '/configuration', 'system'); $node = $this->getXMLNode($xml, '/configuration/system', 'server'); $this->setXMLAttributValue($node, "rootDir", $this->_rootDir); + $this->setXMLAttributValue($node, "baseUrl", $this->_baseUrl); $this->setXMLAttributValue($node, "httpRoot", $this->_httpRoot); $this->setXMLAttributValue($node, "contentDir", $this->_contentDir); $this->setXMLAttributValue($node, "cacheDir", $this->_cacheDir); diff --git a/op/op.Settings.php b/op/op.Settings.php index 33cbecbaa..dfd8206d4 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -167,6 +167,7 @@ if ($action == "saveSettings") // SETTINGS - SYSTEM - SERVER setDirValue("rootDir"); + setStrValue("baseUrl"); setStrValue("httpRoot"); setDirValue("contentDir"); setDirValue("cacheDir"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 761939b44..20cbc8142 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -407,6 +407,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk)) --> showConfigHeadline('settings_Server'); ?> showConfigText('settings_rootDir', 'rootDir'); ?> +showConfigText('settings_baseUrl', 'baseUrl'); ?> showConfigText('settings_httpRoot', 'httpRoot'); ?> showConfigText('settings_contentDir', 'contentDir'); ?> showConfigText('settings_backupDir', 'backupDir'); ?>