gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-12-13 11:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct rootDir if not set propperly, set contentDir below rootDir

Browse Source
This commit is contained in:
Uwe Steinmann 2017-08-01 10:22:42 +02:00
parent 1339c36d67
commit 64e75e8064
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
install/install.php
View File

@ -160,13 +160,16 @@ do {
if(!$settings->_rootDir) if(!$settings->_rootDir)
$settings->_rootDir = $rootDir; $settings->_rootDir = $rootDir;
//$settings->_coreDir = $settings->_rootDir; elseif(realpath ("..") != realpath($settings->_rootDir)) { // Fix rootDir if required
//$settings->_luceneClassDir = $settings->_rootDir; $msg = "Your Root directory has been modified to fit your installation path!";
$settings->_rootDir = realpath ("..")."/";
}
if(!$settings->_contentDir) { if(!$settings->_contentDir) {
$settings->_contentDir = $settings->_rootDir . 'data/'; $settings->_contentDir = realpath($settings->_rootDir."..") . '/data/';
$settings->_luceneDir = $settings->_rootDir . 'data/lucene/'; $settings->_luceneDir = $settings->_contentDir . 'lucene/';
$settings->_stagingDir = $settings->_rootDir . 'data/staging/'; $settings->_stagingDir = $settings->_contentDir . 'staging/';
$settings->_cacheDir = $settings->_rootDir . 'data/cache/'; $settings->_cacheDir = $settings->_contentDir . 'cache/';
} else { } else {
if(!$settings->_cacheDir) { if(!$settings->_cacheDir) {
$settings->_cacheDir = $settings->_contentDir . 'cache/'; $settings->_cacheDir = $settings->_contentDir . 'cache/';
@ -190,6 +193,8 @@ UI::htmlStartPage("INSTALL");
UI::globalBanner(); UI::globalBanner();
UI::contentStart(); UI::contentStart();
UI::contentHeading("SeedDMS Installation for version ".SEEDDMS_VERSION); UI::contentHeading("SeedDMS Installation for version ".SEEDDMS_VERSION);
if(isset($msg))
echo "<div class=\"alert alert-warning\">".$msg."</div>";
UI::contentContainerStart(); UI::contentContainerStart();