Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

.htaccess

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

application/Espo/Core/Utils/Config.php

@@ -125,7 +125,7 @@ class Config
 
 		$config = $this->getFileManager()->getContents($defaultConfig['configPath']);
 		if (empty($config)) {
-			$GLOBALS['log']->emergency('Check syntax or permission of your '.$defaultConfig['configPath']);
+			$config = array();
 		}
 
 		$this->configData =  Util::merge((array) $defaultConfig, (array) $config);

application/Espo/Core/defaults/config.php

@@ -2,7 +2,6 @@
 
 return array (
   'configPath' => 'application/config.php',
-
   'cachePath' => 'data/cache',
 
   'database' => 
@@ -10,6 +9,31 @@ return array (
     'driver' => 'pdo_mysql',
     'host' => 'localhost',    
   ),
+  'useCache' => true,
+  'recordsPerPage' => 20,
+  'recordsPerPageSmall' => 5,
+  'applicationName' => 'EspoCRM',
+  'timeZone' => 'UTC',
+  'dateFormat' => 'MM/DD/YYYY',
+  'timeFormat' => 'HH:mm',
+  'weekStart' => 0,
+  'thousandSeparator' => ',',
+  'decimalMark' => '.',
+  'currencyList' => 
+  array (
+    0 => 'USD',
+    1 => 'EUR',
+  ),
+  'defaultCurrency' => 'USD',
+  'outboundEmailIsShared' => true,
+  'outboundEmailFromName' => 'EspoCRM',
+  'outboundEmailFromAddress' => '',
+  'smtpServer' => '',
+  'smtpPort' => 25,
+  'smtpAuth' => true,
+  'smtpSecurity' => '',
+  'smtpUsername' => '',
+  'smtpPassword' => '',
   'logger' => 
   array (
     'path' => 'data/logs/espo.log',    
@@ -17,7 +41,6 @@ return array (
     'isRotate' => true, /*rotate every day every logs files*/
     'maxRotateFiles' => 30, /*max number of rotate files*/
   ),
-
   'defaultPermissions' =>
   array (
     'dir' => '0775',
@@ -25,29 +48,32 @@ return array (
     'user' => '',
     'group' => '',
   ),
-  'dateFormat' => 'MM/DD/YYYY',
-  'timeFormat' => 'HH:mm',
-
   'cron' => array(
     'maxJobNumber' => 15, /*Max number of jobs per one execution*/    
     'jobPeriod' => 7800, /*Period for jobs, ex. if cron executed at 15:35, it will execute all pending jobs for times from 14:05 to 15:35*/
     'minExecutionTime' => 50, /*to avoid too frequency execution*/
   ),
-
+  'currency' =>
+  array(
+    'base' => 'USD',
+    'rate' => array(
+      'EUR' => 1.37,
+      'GBP' => 1.67,
+    ),    
+  ),
+  'crud' => array(
+    'get' => 'read',
+    'post' => 'create',
+    'put' => 'update',
+    'patch' => 'patch',
+    'delete' => 'delete',
+  ),  
   'systemUser' => array(
     'id' => 'system',
     'userName' => 'system',
     'firstName' => '',
     'lastName' => 'System',    
-  ),
-
-  'crud' => array(
-  	'get' => 'read',
-  	'post' => 'create',
-  	'put' => 'update',
-  	'patch' => 'patch',
-  	'delete' => 'delete',
-  ),
+  ),  
   'systemItems' =>
   array (
     'systemItems',
@@ -62,16 +88,7 @@ return array (
     'defaultPermissions',
     'logger',
     'devMode',
-  ),
-  'currency' =>
-  array(
-    'base' => 'USD',
-    'rate' => array(
-      'EUR' => 1.37,
-      'GBP' => 1.67,
-    ),    
-  ),
-  
+  ),  
 );
 
 ?>

index.php

@@ -1,11 +1,18 @@
 <?php
 
+include "bootstrap.php";
+	
+$app = new \Espo\Core\Application();
+
+$configFile = $app->getContainer()->get('config')->get('configPath');
+if (!file_exists($configFile)) {
+	header("Location: install/");
+	exit;
+}
+
 if (empty($_GET['entryPoint'])) {
 	include "main.html";
 } else {
-	include "bootstrap.php";
-	
-	$app = new \Espo\Core\Application();
 	$app->runEntryPoint($_GET['entryPoint']);
 }
 

tests/testData/Utils/Config/defaultConfig.php

@@ -35,8 +35,7 @@ return array (
     'database',
     'customPath',
     'defaultsPath', 
-    'crud',   
-    'scopeModuleMap',
+    'crud', 
   ),
   'adminItems' =>
   array (