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

fixed problem with rewriting default setting options

Browse Source
This commit is contained in:
Taras Machyshyn
2014-05-07 11:04:46 +03:00
parent f3f2f00628
commit e145b2a488
3 changed files with 126 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/Espo/Core/Utils/Config.php
View File

@@ -143,7 +143,12 @@ class Config
$config = array();
}
$this->configData = Util::merge((array) $defaultConfig, (array) $config);
if (!empty($defaultConfig['rewriteOptions'])) {
$this->configData = Util::merge((array) $defaultConfig, (array) $config, 1, $defaultConfig['rewriteOptions']);
} else {
$this->configData = Util::merge((array) $defaultConfig, (array) $config);
}
$this->adminItems = $this->getRestrictItems();
return $this->configData;

229
application/Espo/Core/defaults/config.php
View File

@@ -21,118 +21,125 @@
************************************************************************/
return array (
'configPath' => 'data/config.php',
'cachePath' => 'data/cache',
'configPath' => 'data/config.php',
'cachePath' => 'data/cache',
'database' =>
array (
'driver' => 'pdo_mysql',
'host' => 'localhost',
),
'useCache' => true,
'recordsPerPage' => 20,
'recordsPerPageSmall' => 5,
'applicationName' => 'EspoCRM',
'version' => '@@version',
'timeZone' => 'UTC',
'dateFormat' => 'MM/DD/YYYY',
'timeFormat' => 'HH:mm',
'weekStart' => 0,
'thousandSeparator' => ',',
'decimalMark' => '.',
'currencyList' =>
array (
),
'defaultCurrency' => 'USD',
'outboundEmailIsShared' => true,
'outboundEmailFromName' => 'EspoCRM',
'outboundEmailFromAddress' => '',
'smtpServer' => '',
'smtpPort' => 25,
'smtpAuth' => true,
'smtpSecurity' => '',
'smtpUsername' => '',
'smtpPassword' => '',
'languageList' => array(
'en_US',
),
'language' => 'en_US',
'logger' =>
array (
'path' => 'data/logs/espo.log',
'level' => 'ERROR', /*DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY*/
'isRotate' => true, /*rotate every day every logs files*/
'maxRotateFiles' => 30, /*max number of rotate files*/
),
'defaultPermissions' =>
array (
'dir' => '0775',
'file' => '0664',
'user' => '',
'group' => '',
),
'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,
'database' =>
array (
'driver' => 'pdo_mysql',
'host' => 'localhost',
),
),
'globalSearchEntityList' =>
array (
0 => 'Account',
1 => 'Contact',
2 => 'Lead',
3 => 'Prospect',
4 => 'Opportunity',
),
'crud' => array(
'get' => 'read',
'post' => 'create',
'put' => 'update',
'patch' => 'patch',
'delete' => 'delete',
),
'systemUser' => array(
'id' => 'system',
'userName' => 'system',
'firstName' => '',
'lastName' => 'System',
),
'systemItems' =>
array (
'systemItems',
'adminItems',
'configPath',
'cachePath',
'database',
'crud',
'logger',
'isInstalled',
'defaultPermissions',
'systemUser',
),
'adminItems' =>
array (
'devMode',
'outboundEmailIsShared',
'outboundEmailFromName',
'outboundEmailFromAddress',
'smtpServer',
'smtpPort',
'smtpAuth',
'smtpSecurity',
'smtpUsername',
'smtpPassword',
'cron',
),
"tabList" => array("Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Prospect", "Email"),
"quickCreateList" => array("Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Prospect"),
'isInstalled' => false,
'useCache' => true,
'recordsPerPage' => 20,
'recordsPerPageSmall' => 5,
'applicationName' => 'EspoCRM',
'version' => '@@version',
'timeZone' => 'UTC',
'dateFormat' => 'MM/DD/YYYY',
'timeFormat' => 'HH:mm',
'weekStart' => 0,
'thousandSeparator' => ',',
'decimalMark' => '.',
'currencyList' =>
array (
),
'defaultCurrency' => 'USD',
'outboundEmailIsShared' => true,
'outboundEmailFromName' => 'EspoCRM',
'outboundEmailFromAddress' => '',
'smtpServer' => '',
'smtpPort' => 25,
'smtpAuth' => true,
'smtpSecurity' => '',
'smtpUsername' => '',
'smtpPassword' => '',
'languageList' => array(
'en_US',
),
'language' => 'en_US',
'logger' =>
array (
'path' => 'data/logs/espo.log',
'level' => 'ERROR', /*DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY*/
'isRotate' => true, /*rotate every day every logs files*/
'maxRotateFiles' => 30, /*max number of rotate files*/
),
'defaultPermissions' =>
array (
'dir' => '0775',
'file' => '0664',
'user' => '',
'group' => '',
),
'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,
),
),
'globalSearchEntityList' =>
array (
0 => 'Account',
1 => 'Contact',
2 => 'Lead',
3 => 'Prospect',
4 => 'Opportunity',
),
'crud' => array(
'get' => 'read',
'post' => 'create',
'put' => 'update',
'patch' => 'patch',
'delete' => 'delete',
),
'systemUser' => array(
'id' => 'system',
'userName' => 'system',
'firstName' => '',
'lastName' => 'System',
),
'systemItems' =>
array (
'systemItems',
'adminItems',
'configPath',
'cachePath',
'database',
'crud',
'logger',
'isInstalled',
'defaultPermissions',
'systemUser',
'rewriteOptions',
),
'adminItems' =>
array (
'devMode',
'outboundEmailIsShared',
'outboundEmailFromName',
'outboundEmailFromAddress',
'smtpServer',
'smtpPort',
'smtpAuth',
'smtpSecurity',
'smtpUsername',
'smtpPassword',
'cron',
),
'rewriteOptions' =>
array (
'tabList',
'quickCreateList',
'globalSearchEntityList',
),
"tabList" => array("Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Prospect", "Email"),
"quickCreateList" => array("Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Prospect"),
'isInstalled' => false,
);

24
install/core/init/config.php
View File

@@ -18,28 +18,8 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
************************************************************************/
return array(
'tabList' =>
array (
'Account',
'Contact',
'Lead',
'Prospect',
'Opportunity',
'Calendar',
'Meeting',
'Call',
'Task',
'Case',
),
'quickCreateList' =>
array (
'Contact',
'Lead',
'Meeting',
'Call',
'Task',
),
);