gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- output error message if ENABLE_INSTALL_TOOL could not be deleted

Browse Source
This commit is contained in:
steinm 2011-11-06 10:25:07 +00:00
parent 51e5e17b9d
commit 3693847620
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
install/install.php
View File

@ -89,7 +89,7 @@ function printCheckError($resCheck) { /* {{{ */
*/ */
define("LETODMS_INSTALL", "on"); define("LETODMS_INSTALL", "on");
include("../inc/inc.Settings.php"); require_once('../inc/inc.ClassSettings.php');
$configDir = Settings::getConfigDir(); $configDir = Settings::getConfigDir();
@ -102,7 +102,10 @@ if (!file_exists($configDir."/ENABLE_INSTALL_TOOL")) {
} }
if (!file_exists($configDir."/settings.xml")) { if (!file_exists($configDir."/settings.xml")) {
copy("settings.xml.template_install", $configDir."/settings.xml"); if(!copy("settings.xml.template_install", $configDir."/settings.xml")) {
echo "Could not create initial configuration file from template. Check directory permission of conf/.";
exit;
}
} }
// Set folders settings // Set folders settings
@ -122,11 +125,14 @@ do {
if(!$settings->_rootDir) if(!$settings->_rootDir)
$settings->_rootDir = $rootDir; $settings->_rootDir = $rootDir;
//$settings->_coreDir = $settings->_rootDir; //$settings->_coreDir = $settings->_rootDir;
//$settings->_luceneDir = $settings->_rootDir; //$settings->_luceneClassDir = $settings->_rootDir;
if(!$settings->_contentDir)
$settings->_contentDir = $settings->_rootDir . 'data/';
//$settings->_ADOdbPath = $settings->_rootDir; //$settings->_ADOdbPath = $settings->_rootDir;
//$settings->_httpRoot = $httpRoot; if(!$settings->_contentDir) {
$settings->_contentDir = $settings->_rootDir . 'data/';
$settings->_luceneDir = $settings->_rootDir . 'data/lucene/';
$settings->_stagingDir = $settings->_rootDir . 'data/staging/';
}
$settings->_httpRoot = $httpRoot;
/** /**
* Include GUI + Language * Include GUI + Language
@ -160,6 +166,10 @@ if (isset($_GET['disableinstall'])) {
echo getMLText("settings_install_disabled"); echo getMLText("settings_install_disabled");
echo "<br/><br/>"; echo "<br/><br/>";
echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>'; echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
} else {
echo getMLText("settings_cannot_disable");
echo "<br/><br/>";
echo '<a href="install.php">' . getMLText("back") . '</a>';
} }
} else { } else {
echo getMLText("settings_cannot_disable"); echo getMLText("settings_cannot_disable");
@ -275,8 +285,6 @@ if ($action=="setSettings") {
} // create database } // create database
if (!$hasError) { if (!$hasError) {
// Save settings
$settings->save();
// Show Web page // Show Web page
echo getMLText("settings_install_success"); echo getMLText("settings_install_success");
@ -288,6 +296,8 @@ if ($action=="setSettings") {
echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>'; echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
} }
} }
// Save settings
$settings->save();
// Back link // Back link
echo '<br/>'; echo '<br/>';