minor installer changes

This commit is contained in:
Taras Machyshyn
2014-03-31 13:18:16 +03:00
parent 09a70ca2c4
commit e27e7a2c7b
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ $data = array(
$lang = (!empty($_SESSION['install']['user-lang']))? $_SESSION['install']['user-lang'] : 'en_US';
if (!$installer->saveData($data, $lang)) {
$result['success'] = false;
$result['errorMsg'] = 'Can not save settings';
$result['errorMsg'] = $langs['Can not save settings'];
}
ob_clean();
+3 -2
View File
@@ -23,10 +23,11 @@
$serverType = $systemHelper->getServerType();
$serverType = 'microsoft-iis';
$rootDir = dirname(__FILE__);
$rootDir = preg_replace('/\/install\/core\/actions\/?/', '', $rootDir, 1);
$cronFile = $rootDir.'/cron.php';
$phpBinDir = (defined("PHP_BINDIR"))? PHP_BINDIR.'/php' : 'php';
$cronFile = $rootDir.DIRECTORY_SEPARATOR.'cron.php';
$phpBinDir = (defined("PHP_BINDIR"))? PHP_BINDIR.DIRECTORY_SEPARATOR.'php' : 'php';
$cronHelp = (isset($langs['cronHelp'][$serverType]))? $langs['cronHelp'][$serverType] : $langs['cronHelp']['default'];
$cronHelp = str_replace('<cron-file>', $cronFile, $cronHelp);