viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

install changes

Browse Source
This commit is contained in:
Taras Machyshyn
2014-03-07 12:26:43 +02:00
parent 55d297e080
commit ebf8b2e74b
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.htaccess
View File

@@ -1,4 +1,9 @@
<IfModule mod_rewrite.c>
#SetEnv HTTP_MOD_REWRITE On
SetEnv ESPO_MR On
RewriteEngine On
RewriteRule reset/?$ reset.html [QSA,L]
</IfModule>

24
application/Espo/Core/Utils/Metadata.php
View File

@@ -170,7 +170,7 @@ class Metadata
$GLOBALS['log']->emergency('Metadata:getMetadata() - metadata unite file cannot be created');
}
$data = $this->setLanguage($data);
$data = $this->setLanguageFromConfig($data);
}
else if (file_exists($this->cacheFile)) {
$data = $this->getFileManager()->getContents($this->cacheFile);
@@ -189,21 +189,23 @@ class Metadata
* @param array $data Meta
* @return array $data
*/
protected function setLanguage($data)
protected function setLanguageFromConfig($data)
{
$entityList = array(
'Settings',
'Preferences',
);
$languageList = $this->getConfig()->get('languageList');
$language = $this->getConfig()->get('language');
if (isset($data['entityDefs']['Settings']['fields']['language'])) {
$data['entityDefs']['Settings']['fields']['language']['options'] = $languageList;
$data['entityDefs']['Settings']['fields']['language']['default'] = $language;
foreach ($entityList as $entityName) {
if (isset($data['entityDefs'][$entityName]['fields']['language'])) {
$data['entityDefs'][$entityName]['fields']['language']['options'] = $languageList;
$data['entityDefs'][$entityName]['fields']['language']['default'] = $language;
}
}
if (isset($data['entityDefs']['Preferences']['fields']['language'])) {
$data['entityDefs']['Preferences']['fields']['language']['options'] = $languageList;
$data['entityDefs']['Preferences']['fields']['language']['default'] = $language;
}
return $data;
}

4
install/core/SystemTest.php
View File

@@ -80,6 +80,10 @@ class SystemTest
return true;
} elseif (isset($_SERVER['IIS_UrlRewriteModule'])) {
return true;
} elseif (getenv('ESPO_MR')=='On' ) {
echo true;
} elseif (isset($_SERVER['ESPO_MR'])) {
echo true;
}
return false;

6
install/index.php
View File

@@ -15,22 +15,20 @@ $installer = new Installer();
// check if app was installed
if ($installer->isInstalled() && !isset($_SESSION['install']['installProcess'])) {
$url = "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
$url = str_replace('install/', '', $url);
$url = str_replace('install', '', $url);
$url = preg_replace('/install\/?/', '', $url, 1);
$url = strtok($url, '#');
$url = strtok($url, '?');
header("Location: {$url}");
exit;
}
else {
// double check if infinite loop
$_SESSION['install']['installProcess'] = true;
}
$smarty->caching = false;
$smarty->setTemplateDir('install/core/tpl');
// temp save all settings
$ignore = array('desc', 'dbName', 'hostName', 'dbUserName', 'dbUserPass', 'dbDriver');
if (!empty($_REQUEST)) {

3
install/js/install.js
View File

@@ -576,8 +576,7 @@ InstallScript.prototype.callbackChecking = function(data) {
InstallScript.prototype.goToEspo = function() {
var loc = window.location.href;
loc = loc.replace('install/', '');
loc = loc.replace('install', '');
loc = loc.replace(/install\/?/, '');
window.location.replace(loc);
}