Switch all array init calles to no space before bracket

Also bug fix in Form General for load int PK calls with non int types
This commit is contained in:
Clemens Schwaighofer
2019-09-20 11:10:13 +09:00
parent 8ade113070
commit ef1df6f171
26 changed files with 398 additions and 397 deletions
+2 -2
View File
@@ -8,8 +8,8 @@
*********************************************************************/
// please be VERY carefull only to change the right side
$DB_CONFIG = array (
'test' => array (
$DB_CONFIG = array(
'test' => array(
'db_name' => 'gullevek',
'db_user' => 'gullevek',
'db_pass' => 'gullevek',
+2 -2
View File
@@ -13,9 +13,9 @@
*********************************************************************/
// each host has a different db_host
$SITE_CONFIG = array (
$SITE_CONFIG = array(
// development host
'soba.tokyo.tequila.jp' => array (
'soba.tokyo.tequila.jp' => array(
// db config selection
'db_host' => 'test',
// other db connections
+4 -4
View File
@@ -172,14 +172,14 @@ if (file_exists(BASE.CONFIGS.'config.host.php')) {
require BASE.CONFIGS.'config.host.php';
}
if (!isset($SITE_CONFIG)) {
$SITE_CONFIG = array ();
$SITE_CONFIG = array();
}
/************* DB ACCESS *****************/
if (file_exists(BASE.CONFIGS.'config.db.php')) {
require BASE.CONFIGS.'config.db.php';
}
if (!isset($DB_CONFIG)) {
$DB_CONFIG = array ();
$DB_CONFIG = array();
}
/************* OTHER PATHS *****************/
if (file_exists(BASE.CONFIGS.'config.path.php')) {
@@ -219,7 +219,7 @@ if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVE
}
// define the db config set name, the db config and the db schema
DEFINE('DB_CONFIG_NAME', $SITE_CONFIG[$HOST_NAME]['db_host']);
DEFINE('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array ());
DEFINE('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
// DEFINE('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
// DEFINE('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
// override for login and global schemas
@@ -253,7 +253,7 @@ DEFINE('JAVASCRIPT', 'frontend.js');
// DEFINE('SOME_ID', <SOME VALUE>);
/************* CONVERT *******************/
$paths = array (
$paths = array(
'/bin',
'/usr/bin',
'/usr/local/bin'
+2 -2
View File
@@ -10,8 +10,8 @@
// File and Folder paths
// ID is TARGET (first array element)
/*$PATHS = array (
'test' => array (
/*$PATHS = array(
'test' => array(
'csv_path' => '',
'perl_bin' => '',
'other_url' => '',
+1 -1
View File
@@ -22,7 +22,7 @@ if (!defined('DS')) {
exit('Base config unloadable');
}
// find trigger name "admin/" or "frontend/" in the getcwd() folder
foreach (array ('admin', 'frontend') as $folder) {
foreach (array('admin', 'frontend') as $folder) {
if (strstr(getcwd(), DS.$folder)) {
define('CONTENT_PATH', $folder.DS);
break;