CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config.master.php text fixes and remove old autoloader comment block

Browse Source
This commit is contained in:
Clemens Schwaighofer
2022-03-16 15:46:31 +09:00
parent dfbc2fee29
commit b075ee3dc5
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/configs/config.master.php
View File

@@ -212,7 +212,7 @@ list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
define('HOST_NAME', $HOST_NAME); define('HOST_NAME', $HOST_NAME);
// BAIL ON MISSING MASTER SITE CONFIG // BAIL ON MISSING MASTER SITE CONFIG
if (!isset($SITE_CONFIG[HOST_NAME]['location'])) { if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
echo 'Missing SITE_CONFIG entry for: "' . HOST_NAME . '" . Contact Administrator'; echo 'Missing SITE_CONFIG entry for: "' . HOST_NAME . '". Contact Administrator';
exit; exit;
} }
// BAIL ON MISSING DB CONFIG: // BAIL ON MISSING DB CONFIG:
@@ -229,7 +229,7 @@ if (
empty($DB_CONFIG[$SITE_CONFIG[HOST_NAME]['db_host']])) empty($DB_CONFIG[$SITE_CONFIG[HOST_NAME]['db_host']]))
) )
) { ) {
echo 'No matching DB config found for: "' . HOST_NAME . '" . Contact Administrator'; echo 'No matching DB config found for: "' . HOST_NAME . '". Contact Administrator';
exit; exit;
} }
// set SSL on // set SSL on
@@ -245,7 +245,7 @@ if (
} }
// define the db config set name, the db config and the db schema // 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_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
define('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : []); define('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ?? []);
// because we can't change constant, but we want to for db debug flag // because we can't change constant, but we want to for db debug flag
$GLOBALS['DB_CONIFG'] = DB_CONFIG; $GLOBALS['DB_CONIFG'] = DB_CONFIG;
// define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']); // define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
@@ -302,7 +302,4 @@ if (defined('DEBUG') && DEBUG == false) {
$DEBUG_ALL_OVERRIDE = false; $DEBUG_ALL_OVERRIDE = false;
} }
/************* AUTO LOADER *******************/
// **DEPRECATED** MOVED TO config.php
// __END__ // __END__