timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Split user config from application config

Browse Source
This commit is contained in:
Timothy Warren 2017-02-10 15:50:07 -05:00
parent 8f8c413927
commit 1ec7322b18
9 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/config/base_config.php → app/appConf/base_config.php
View File

0
app/config/menus.php → app/appConf/menus.php
View File

0
app/config/minify_config.php → app/appConf/minify_config.php
View File

0
app/config/minify_css_groups.php → app/appConf/minify_css_groups.php
View File

0
app/config/minify_js_groups.php → app/appConf/minify_js_groups.php
View File

0
app/config/routes.php → app/appConf/routes.php
View File

3
index.php
View File

@ -41,6 +41,7 @@ function _dir()
// Define base directories // Define base directories
$APP_DIR = _dir(__DIR__, 'app'); $APP_DIR = _dir(__DIR__, 'app');
$APPCONF_DIR = _dir($APP_DIR, 'appConf');
$CONF_DIR = _dir($APP_DIR, 'config'); $CONF_DIR = _dir($APP_DIR, 'config');
// Load composer autoloader // Load composer autoloader
@ -61,7 +62,7 @@ $whoops->register();
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Dependency Injection setup // Dependency Injection setup
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
require _dir($CONF_DIR, 'base_config.php'); // $base_config require _dir($APPCONF_DIR, 'base_config.php'); // $base_config
$di = require _dir($APP_DIR, 'bootstrap.php'); $di = require _dir($APP_DIR, 'bootstrap.php');
$config = loadToml($CONF_DIR); $config = loadToml($CONF_DIR);

2
public/css.php
View File

@ -160,7 +160,7 @@ class CSSMin extends BaseMin {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
//Get config files //Get config files
$config = require('../app/config/minify_config.php'); $config = require('../app/appConf/minify_config.php');
$groups = require($config['css_groups_file']); $groups = require($config['css_groups_file']);
if ( ! array_key_exists($_GET['g'], $groups)) if ( ! array_key_exists($_GET['g'], $groups))

2
public/js.php
View File

@ -233,7 +233,7 @@ class JSMin extends BaseMin {
// ! Start Minifying // ! Start Minifying
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
$config = require_once('../app/config/minify_config.php'); $config = require_once('../app/appConf/minify_config.php');
$groups = require_once($config['js_groups_file']); $groups = require_once($config['js_groups_file']);
$cache_dir = "{$config['js_root']}cache"; $cache_dir = "{$config['js_root']}cache";