@@ -2,18 +2,18 @@ discard block |
||
2 | 2 | |
3 | 3 | if ($_SERVER['SCRIPT_FILENAME'] == 'protected/yiic.php') |
4 | 4 | { |
5 | - echo "Use of `yiic.php` has been deprecated for CiiMS. Uses `index.php` instead\n"; |
|
6 | - die(); |
|
5 | + echo "Use of `yiic.php` has been deprecated for CiiMS. Uses `index.php` instead\n"; |
|
6 | + die(); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | if (getenv('CIIMS_INSTALL') == "true") |
10 | 10 | { |
11 | - if (!defined('CIIMS_INSTALL')) |
|
12 | - define('CIIMS_INSTALL', true); |
|
11 | + if (!defined('CIIMS_INSTALL')) |
|
12 | + define('CIIMS_INSTALL', true); |
|
13 | 13 | } |
14 | 14 | |
15 | 15 | if (!defined('CIIMS_INSTALL')) |
16 | - define('CIIMS_INSTALL', false); |
|
16 | + define('CIIMS_INSTALL', false); |
|
17 | 17 | |
18 | 18 | error_reporting(-1); |
19 | 19 | ini_set('display_errors', 'true'); |
@@ -29,18 +29,18 @@ discard block |
||
29 | 29 | Yii::setPathOfAlias('vendor', __DIR__.DS.'..'.DS.'vendor'.DS); |
30 | 30 | |
31 | 31 | if (!isset($_SERVER['CIIMS_ENV'])) |
32 | - $_SERVER['CIIMS_ENV'] = 'main'; |
|
32 | + $_SERVER['CIIMS_ENV'] = 'main'; |
|
33 | 33 | |
34 | 34 | $config = __DIR__.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
35 | 35 | $defaultConfig=__DIR__.DS.'config'.DS.'main.default.php'; |
36 | 36 | |
37 | 37 | if (file_exists(__DIR__.DS.'/config/main.php')) |
38 | - $config = require $config; |
|
38 | + $config = require $config; |
|
39 | 39 | else |
40 | - $config = array(); |
|
40 | + $config = array(); |
|
41 | 41 | |
42 | 42 | if (CIIMS_INSTALL) |
43 | - $config = array(); |
|
43 | + $config = array(); |
|
44 | 44 | |
45 | 45 | $defaultConfig = require $defaultConfig; |
46 | 46 | |
@@ -53,14 +53,14 @@ discard block |
||
53 | 53 | $env=@getenv('YII_CONSOLE_COMMANDS'); |
54 | 54 | |
55 | 55 | if(!empty($env)) |
56 | - $app->commandRunner->addCommands($env); |
|
56 | + $app->commandRunner->addCommands($env); |
|
57 | 57 | |
58 | 58 | $modules = array_filter(glob(__DIR__.'/modules/*', GLOB_ONLYDIR)); |
59 | 59 | |
60 | 60 | foreach ($modules as $module) |
61 | 61 | { |
62 | - if (file_exists($module.'/commands')) |
|
63 | - $app->commandRunner->addCommands($module.'/commands'); |
|
62 | + if (file_exists($module.'/commands')) |
|
63 | + $app->commandRunner->addCommands($module.'/commands'); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | return $app->run(); |
@@ -8,12 +8,14 @@ discard block |
||
8 | 8 | |
9 | 9 | if (getenv('CIIMS_INSTALL') == "true") |
10 | 10 | { |
11 | - if (!defined('CIIMS_INSTALL')) |
|
12 | - define('CIIMS_INSTALL', true); |
|
13 | -} |
|
11 | + if (!defined('CIIMS_INSTALL')) { |
|
12 | + define('CIIMS_INSTALL', true); |
|
13 | + } |
|
14 | + } |
|
14 | 15 | |
15 | -if (!defined('CIIMS_INSTALL')) |
|
16 | +if (!defined('CIIMS_INSTALL')) { |
|
16 | 17 | define('CIIMS_INSTALL', false); |
18 | +} |
|
17 | 19 | |
18 | 20 | error_reporting(-1); |
19 | 21 | ini_set('display_errors', 'true'); |
@@ -28,19 +30,22 @@ discard block |
||
28 | 30 | |
29 | 31 | Yii::setPathOfAlias('vendor', __DIR__.DS.'..'.DS.'vendor'.DS); |
30 | 32 | |
31 | -if (!isset($_SERVER['CIIMS_ENV'])) |
|
33 | +if (!isset($_SERVER['CIIMS_ENV'])) { |
|
32 | 34 | $_SERVER['CIIMS_ENV'] = 'main'; |
35 | +} |
|
33 | 36 | |
34 | 37 | $config = __DIR__.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
35 | 38 | $defaultConfig=__DIR__.DS.'config'.DS.'main.default.php'; |
36 | 39 | |
37 | -if (file_exists(__DIR__.DS.'/config/main.php')) |
|
40 | +if (file_exists(__DIR__.DS.'/config/main.php')) { |
|
38 | 41 | $config = require $config; |
39 | -else |
|
42 | +} else { |
|
40 | 43 | $config = array(); |
44 | +} |
|
41 | 45 | |
42 | -if (CIIMS_INSTALL) |
|
46 | +if (CIIMS_INSTALL) { |
|
43 | 47 | $config = array(); |
48 | +} |
|
44 | 49 | |
45 | 50 | $defaultConfig = require $defaultConfig; |
46 | 51 | |
@@ -52,15 +57,17 @@ discard block |
||
52 | 57 | $app->commandRunner->addCommands(YII_PATH.'/cli/commands'); |
53 | 58 | $env=@getenv('YII_CONSOLE_COMMANDS'); |
54 | 59 | |
55 | -if(!empty($env)) |
|
60 | +if(!empty($env)) { |
|
56 | 61 | $app->commandRunner->addCommands($env); |
62 | +} |
|
57 | 63 | |
58 | 64 | $modules = array_filter(glob(__DIR__.'/modules/*', GLOB_ONLYDIR)); |
59 | 65 | |
60 | 66 | foreach ($modules as $module) |
61 | 67 | { |
62 | - if (file_exists($module.'/commands')) |
|
63 | - $app->commandRunner->addCommands($module.'/commands'); |
|
64 | -} |
|
68 | + if (file_exists($module.'/commands')) { |
|
69 | + $app->commandRunner->addCommands($module.'/commands'); |
|
70 | + } |
|
71 | + } |
|
65 | 72 | |
66 | 73 | return $app->run(); |
@@ -6,35 +6,35 @@ discard block |
||
6 | 6 | die(); |
7 | 7 | } |
8 | 8 | |
9 | -if (getenv('CIIMS_INSTALL') == "true") |
|
9 | +if (getenv ('CIIMS_INSTALL') == "true") |
|
10 | 10 | { |
11 | - if (!defined('CIIMS_INSTALL')) |
|
12 | - define('CIIMS_INSTALL', true); |
|
11 | + if (!defined ('CIIMS_INSTALL')) |
|
12 | + define ('CIIMS_INSTALL', true); |
|
13 | 13 | } |
14 | 14 | |
15 | -if (!defined('CIIMS_INSTALL')) |
|
16 | - define('CIIMS_INSTALL', false); |
|
15 | +if (!defined ('CIIMS_INSTALL')) |
|
16 | + define ('CIIMS_INSTALL', false); |
|
17 | 17 | |
18 | -error_reporting(-1); |
|
19 | -ini_set('display_errors', 'true'); |
|
18 | +error_reporting (-1); |
|
19 | +ini_set ('display_errors', 'true'); |
|
20 | 20 | date_default_timezone_set ('UTC'); |
21 | -defined('DS') or define('DS', DIRECTORY_SEPARATOR); |
|
21 | +defined ('DS') or define ('DS', DIRECTORY_SEPARATOR); |
|
22 | 22 | |
23 | -defined('YII_DEBUG') or define('YII_DEBUG', true); |
|
23 | +defined ('YII_DEBUG') or define ('YII_DEBUG', true); |
|
24 | 24 | |
25 | 25 | // Include the composer dependencies |
26 | 26 | require(__DIR__.DS.'..'.DS.'vendor'.DS.'autoload.php'); |
27 | 27 | require(__DIR__.DS.'..'.DS.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yii.php'); |
28 | 28 | |
29 | -Yii::setPathOfAlias('vendor', __DIR__.DS.'..'.DS.'vendor'.DS); |
|
29 | +Yii::setPathOfAlias ('vendor', __DIR__.DS.'..'.DS.'vendor'.DS); |
|
30 | 30 | |
31 | 31 | if (!isset($_SERVER['CIIMS_ENV'])) |
32 | 32 | $_SERVER['CIIMS_ENV'] = 'main'; |
33 | 33 | |
34 | 34 | $config = __DIR__.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
35 | -$defaultConfig=__DIR__.DS.'config'.DS.'main.default.php'; |
|
35 | +$defaultConfig = __DIR__.DS.'config'.DS.'main.default.php'; |
|
36 | 36 | |
37 | -if (file_exists(__DIR__.DS.'/config/main.php')) |
|
37 | +if (file_exists (__DIR__.DS.'/config/main.php')) |
|
38 | 38 | $config = require $config; |
39 | 39 | else |
40 | 40 | $config = array(); |
@@ -44,23 +44,23 @@ discard block |
||
44 | 44 | |
45 | 45 | $defaultConfig = require $defaultConfig; |
46 | 46 | |
47 | -$config = CMap::mergeArray($defaultConfig, $config); |
|
47 | +$config = CMap::mergeArray ($defaultConfig, $config); |
|
48 | 48 | |
49 | 49 | unset($config['components']['user']); |
50 | 50 | |
51 | -$app=Yii::createConsoleApplication($config); |
|
52 | -$app->commandRunner->addCommands(YII_PATH.'/cli/commands'); |
|
53 | -$env=@getenv('YII_CONSOLE_COMMANDS'); |
|
51 | +$app = Yii::createConsoleApplication ($config); |
|
52 | +$app->commandRunner->addCommands (YII_PATH.'/cli/commands'); |
|
53 | +$env = @getenv ('YII_CONSOLE_COMMANDS'); |
|
54 | 54 | |
55 | -if(!empty($env)) |
|
56 | - $app->commandRunner->addCommands($env); |
|
55 | +if (!empty($env)) |
|
56 | + $app->commandRunner->addCommands ($env); |
|
57 | 57 | |
58 | -$modules = array_filter(glob(__DIR__.'/modules/*', GLOB_ONLYDIR)); |
|
58 | +$modules = array_filter (glob (__DIR__.'/modules/*', GLOB_ONLYDIR)); |
|
59 | 59 | |
60 | 60 | foreach ($modules as $module) |
61 | 61 | { |
62 | - if (file_exists($module.'/commands')) |
|
63 | - $app->commandRunner->addCommands($module.'/commands'); |
|
62 | + if (file_exists ($module.'/commands')) |
|
63 | + $app->commandRunner->addCommands ($module.'/commands'); |
|
64 | 64 | } |
65 | 65 | |
66 | -return $app->run(); |
|
66 | +return $app->run (); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | // Bypass Yiic entirely and use this instead as the cli bootstrapper |
14 | 14 | if (php_sapi_name() === 'cli') |
15 | - return require BASEDIR.'protected'.DS.'yiic.php'; |
|
15 | + return require BASEDIR.'protected'.DS.'yiic.php'; |
|
16 | 16 | |
17 | 17 | // Disable Error Reporting and set some constants |
18 | 18 | error_reporting(0); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | |
23 | 23 | // This is the configuration file |
24 | 24 | if (!isset($_SERVER['CIIMS_ENV'])) |
25 | - $_SERVER['CIIMS_ENV'] = 'main'; |
|
25 | + $_SERVER['CIIMS_ENV'] = 'main'; |
|
26 | 26 | |
27 | 27 | $config = BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
28 | 28 | $defaultConfig = BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | // If we don't have a configuration file, run the installer. |
31 | 31 | if (!file_exists($config) && file_exists('install.php')) |
32 | 32 | { |
33 | - require('install.php'); |
|
34 | - exit(); |
|
33 | + require('install.php'); |
|
34 | + exit(); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $config = require($config); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | // Include the ClassMap for enhanced performance if we're not in debug mode |
56 | 56 | if (!YII_DEBUG) |
57 | - require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php'; |
|
57 | + require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php'; |
|
58 | 58 | |
59 | 59 | $config['components']['db']['enableProfiling'] = YII_DEBUG; |
60 | 60 | $config['components']['db']['enableParamLogging'] = YII_DEBUG; |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | // If debug mode is enabled, show us every possible error anywhere. |
63 | 63 | if (YII_DEBUG && YII_TRACE_LEVEL == 3) |
64 | 64 | { |
65 | - error_reporting(-1); |
|
66 | - ini_set('display_errors', 'true'); |
|
65 | + error_reporting(-1); |
|
66 | + ini_set('display_errors', 'true'); |
|
67 | 67 | |
68 | - // Enable WebLogRouteLogging |
|
69 | - $config['preload'][] = 'log'; |
|
68 | + // Enable WebLogRouteLogging |
|
69 | + $config['preload'][] = 'log'; |
|
70 | 70 | |
71 | - // Enable all the logging routes |
|
72 | - foreach ($config['components']['log']['routes'] as $k=>$v) |
|
73 | - $config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG; |
|
71 | + // Enable all the logging routes |
|
72 | + foreach ($config['components']['log']['routes'] as $k=>$v) |
|
73 | + $config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | // Run the Yii application instance |
@@ -11,8 +11,9 @@ discard block |
||
11 | 11 | defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS); |
12 | 12 | |
13 | 13 | // Bypass Yiic entirely and use this instead as the cli bootstrapper |
14 | -if (php_sapi_name() === 'cli') |
|
14 | +if (php_sapi_name() === 'cli') { |
|
15 | 15 | return require BASEDIR.'protected'.DS.'yiic.php'; |
16 | +} |
|
16 | 17 | |
17 | 18 | // Disable Error Reporting and set some constants |
18 | 19 | error_reporting(0); |
@@ -21,8 +22,9 @@ discard block |
||
21 | 22 | |
22 | 23 | |
23 | 24 | // This is the configuration file |
24 | -if (!isset($_SERVER['CIIMS_ENV'])) |
|
25 | +if (!isset($_SERVER['CIIMS_ENV'])) { |
|
25 | 26 | $_SERVER['CIIMS_ENV'] = 'main'; |
27 | +} |
|
26 | 28 | |
27 | 29 | $config = BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
28 | 30 | $defaultConfig = BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
@@ -53,8 +55,9 @@ discard block |
||
53 | 55 | $config = CMap::mergeArray($defaultConfig, $config); |
54 | 56 | |
55 | 57 | // Include the ClassMap for enhanced performance if we're not in debug mode |
56 | -if (!YII_DEBUG) |
|
58 | +if (!YII_DEBUG) { |
|
57 | 59 | require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php'; |
60 | +} |
|
58 | 61 | |
59 | 62 | $config['components']['db']['enableProfiling'] = YII_DEBUG; |
60 | 63 | $config['components']['db']['enableParamLogging'] = YII_DEBUG; |
@@ -69,9 +72,10 @@ discard block |
||
69 | 72 | $config['preload'][] = 'log'; |
70 | 73 | |
71 | 74 | // Enable all the logging routes |
72 | - foreach ($config['components']['log']['routes'] as $k=>$v) |
|
73 | - $config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG; |
|
74 | -} |
|
75 | + foreach ($config['components']['log']['routes'] as $k=>$v) { |
|
76 | + $config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG; |
|
77 | + } |
|
78 | + } |
|
75 | 79 | |
76 | 80 | // Run the Yii application instance |
77 | 81 | Yii::createWebApplication($config)->run(); |
@@ -7,17 +7,17 @@ discard block |
||
7 | 7 | * You should _never_ have to change _anything_ in this file _ever_ |
8 | 8 | */ |
9 | 9 | |
10 | -defined('DS') or define('DS', DIRECTORY_SEPARATOR); |
|
11 | -defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS); |
|
10 | +defined ('DS') or define ('DS', DIRECTORY_SEPARATOR); |
|
11 | +defined ('BASEDIR') or define ('BASEDIR', __DIR__.DS.'..'.DS); |
|
12 | 12 | |
13 | 13 | // Bypass Yiic entirely and use this instead as the cli bootstrapper |
14 | -if (php_sapi_name() === 'cli') |
|
14 | +if (php_sapi_name () === 'cli') |
|
15 | 15 | return require BASEDIR.'protected'.DS.'yiic.php'; |
16 | 16 | |
17 | 17 | // Disable Error Reporting and set some constants |
18 | -error_reporting(0); |
|
19 | -ini_set('display_errors', 'false'); |
|
20 | -date_default_timezone_set('UTC'); |
|
18 | +error_reporting (0); |
|
19 | +ini_set ('display_errors', 'false'); |
|
20 | +date_default_timezone_set ('UTC'); |
|
21 | 21 | |
22 | 22 | |
23 | 23 | // This is the configuration file |
@@ -28,15 +28,15 @@ discard block |
||
28 | 28 | $defaultConfig = BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
29 | 29 | |
30 | 30 | // If we don't have a configuration file, run the installer. |
31 | -if (!file_exists($config) && file_exists('install.php')) |
|
31 | +if (!file_exists ($config) && file_exists ('install.php')) |
|
32 | 32 | { |
33 | 33 | require('install.php'); |
34 | 34 | exit(); |
35 | 35 | } |
36 | 36 | |
37 | 37 | $config = require($config); |
38 | -defined('YII_DEBUG') or define('YII_DEBUG',isset($config['params']['debug']) ? $config['params']['debug'] : false); |
|
39 | -defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',isset($config['params']['trace']) ? $config['params']['trace'] : 0); |
|
38 | +defined ('YII_DEBUG') or define ('YII_DEBUG', isset($config['params']['debug']) ? $config['params']['debug'] : false); |
|
39 | +defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', isset($config['params']['trace']) ? $config['params']['trace'] : 0); |
|
40 | 40 | |
41 | 41 | // Load the config file |
42 | 42 | $defaultConfig = require($defaultConfig); |
@@ -45,12 +45,12 @@ discard block |
||
45 | 45 | require_once BASEDIR.'vendor'.DS.'autoload.php'; |
46 | 46 | require_once BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.(YII_DEBUG ? 'yii.php' : 'yiilite.php'); |
47 | 47 | |
48 | -Yii::setPathOfAlias('vendor', BASEDIR.'vendor'); |
|
49 | -Yii::setPathOfAlias('base', BASEDIR); |
|
50 | -Yii::setPathOfAlias('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller')); |
|
48 | +Yii::setPathOfAlias ('vendor', BASEDIR.'vendor'); |
|
49 | +Yii::setPathOfAlias ('base', BASEDIR); |
|
50 | +Yii::setPathOfAlias ('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias ('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller')); |
|
51 | 51 | |
52 | 52 | // Merge it with our default config file |
53 | -$config = CMap::mergeArray($defaultConfig, $config); |
|
53 | +$config = CMap::mergeArray ($defaultConfig, $config); |
|
54 | 54 | |
55 | 55 | // Include the ClassMap for enhanced performance if we're not in debug mode |
56 | 56 | if (!YII_DEBUG) |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | // If debug mode is enabled, show us every possible error anywhere. |
63 | 63 | if (YII_DEBUG && YII_TRACE_LEVEL == 3) |
64 | 64 | { |
65 | - error_reporting(-1); |
|
66 | - ini_set('display_errors', 'true'); |
|
65 | + error_reporting (-1); |
|
66 | + ini_set ('display_errors', 'true'); |
|
67 | 67 | |
68 | 68 | // Enable WebLogRouteLogging |
69 | 69 | $config['preload'][] = 'log'; |
@@ -74,4 +74,4 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | // Run the Yii application instance |
77 | -Yii::createWebApplication($config)->run(); |
|
77 | +Yii::createWebApplication ($config)->run (); |
@@ -26,8 +26,8 @@ |
||
26 | 26 | defined('CIIMS_INSTALL') or define('CIIMS_INSTALL', true); |
27 | 27 | if (!file_exists($mainConfig) && !file_exists($yiiPath)) |
28 | 28 | { |
29 | - require(dirname(__FILE__).'/protected/modules/install/init.php'); |
|
30 | - exit(); |
|
29 | + require(dirname(__FILE__).'/protected/modules/install/init.php'); |
|
30 | + exit(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | require_once($yiiPath); |
@@ -9,10 +9,10 @@ discard block |
||
9 | 9 | * Otherwise, this is a basic Yii App running only the install module |
10 | 10 | */ |
11 | 11 | |
12 | -defined('DS') or define('DS', DIRECTORY_SEPARATOR); |
|
13 | -defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS); |
|
14 | -error_reporting(-1); |
|
15 | -ini_set('display_errors', 'true'); |
|
12 | +defined ('DS') or define ('DS', DIRECTORY_SEPARATOR); |
|
13 | +defined ('BASEDIR') or define ('BASEDIR', __DIR__.DS.'..'.DS); |
|
14 | +error_reporting (-1); |
|
15 | +ini_set ('display_errors', 'true'); |
|
16 | 16 | |
17 | 17 | $yiiPath = BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yiilite.php'; |
18 | 18 | require_once BASEDIR.'vendor'.DS.'autoload.php'; |
@@ -21,18 +21,18 @@ discard block |
||
21 | 21 | $mainConfig = BASEDIR.'protected'.DS.'config'.DS.'main.php'; |
22 | 22 | $ciimsConfig = require($config); |
23 | 23 | |
24 | -defined('YII_DEBUG') or define('YII_DEBUG',true); |
|
25 | -defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
|
26 | -defined('CIIMS_INSTALL') or define('CIIMS_INSTALL', true); |
|
27 | -if (!file_exists($mainConfig) && !file_exists($yiiPath)) |
|
24 | +defined ('YII_DEBUG') or define ('YII_DEBUG', true); |
|
25 | +defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', 3); |
|
26 | +defined ('CIIMS_INSTALL') or define ('CIIMS_INSTALL', true); |
|
27 | +if (!file_exists ($mainConfig) && !file_exists ($yiiPath)) |
|
28 | 28 | { |
29 | - require(dirname(__FILE__).'/protected/modules/install/init.php'); |
|
29 | + require(dirname (__FILE__).'/protected/modules/install/init.php'); |
|
30 | 30 | exit(); |
31 | 31 | } |
32 | 32 | |
33 | 33 | require_once($yiiPath); |
34 | -Yii::setPathOfAlias('vendor', BASEDIR.'vendor'); |
|
35 | -Yii::setPathOfAlias('base', BASEDIR); |
|
34 | +Yii::setPathOfAlias ('vendor', BASEDIR.'vendor'); |
|
35 | +Yii::setPathOfAlias ('base', BASEDIR); |
|
36 | 36 | |
37 | -$app = Yii::createWebApplication($config); |
|
38 | -$app->run(); |
|
37 | +$app = Yii::createWebApplication ($config); |
|
38 | +$app->run (); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
13 | 13 | |
14 | 14 | if (!isset($_SERVER['CIIMS_ENV'])) |
15 | - $_SERVER['CIIMS_ENV'] = 'main'; |
|
15 | + $_SERVER['CIIMS_ENV'] = 'main'; |
|
16 | 16 | |
17 | 17 | $config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
18 | 18 | $defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | |
32 | 32 | // Set the request component in the test script |
33 | 33 | $config['components']['request'] = array( |
34 | - 'class' => 'vendor.codeception.YiiBridge.web.CodeceptionHttpRequest' |
|
34 | + 'class' => 'vendor.codeception.YiiBridge.web.CodeceptionHttpRequest' |
|
35 | 35 | ); |
36 | 36 | |
37 | 37 | // Return for Codeception |
38 | 38 | return array( |
39 | - 'class' => 'CWebApplication', |
|
40 | - 'config' => $config |
|
39 | + 'class' => 'CWebApplication', |
|
40 | + 'config' => $config |
|
41 | 41 | ); |
@@ -11,8 +11,9 @@ |
||
11 | 11 | defined('YII_DEBUG') or define('YII_DEBUG',true); |
12 | 12 | defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
13 | 13 | |
14 | -if (!isset($_SERVER['CIIMS_ENV'])) |
|
14 | +if (!isset($_SERVER['CIIMS_ENV'])) { |
|
15 | 15 | $_SERVER['CIIMS_ENV'] = 'main'; |
16 | +} |
|
16 | 17 | |
17 | 18 | $config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php'; |
18 | 19 | $defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php'; |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Set Error Reporting Levels |
4 | -error_reporting(-1); |
|
5 | -ini_set('display_errors', 'true'); |
|
6 | -date_default_timezone_set('UTC'); |
|
4 | +error_reporting (-1); |
|
5 | +ini_set ('display_errors', 'true'); |
|
6 | +date_default_timezone_set ('UTC'); |
|
7 | 7 | |
8 | 8 | // Definitions |
9 | -defined('DS') or define('DS', DIRECTORY_SEPARATOR); |
|
10 | -defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS); |
|
11 | -defined('YII_DEBUG') or define('YII_DEBUG',true); |
|
12 | -defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); |
|
9 | +defined ('DS') or define ('DS', DIRECTORY_SEPARATOR); |
|
10 | +defined ('BASEDIR') or define ('BASEDIR', __DIR__.DS.'..'.DS); |
|
11 | +defined ('YII_DEBUG') or define ('YII_DEBUG', true); |
|
12 | +defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', 3); |
|
13 | 13 | |
14 | 14 | if (!isset($_SERVER['CIIMS_ENV'])) |
15 | 15 | $_SERVER['CIIMS_ENV'] = 'main'; |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | require_once BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yii.php'; |
22 | 22 | require_once BASEDIR.'vendor'.DS.'autoload.php'; |
23 | 23 | |
24 | -Yii::setPathOfAlias('vendor', BASEDIR.'vendor'); |
|
25 | -Yii::setPathOfAlias('base', BASEDIR); |
|
26 | -Yii::setPathOfAlias('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller')); |
|
24 | +Yii::setPathOfAlias ('vendor', BASEDIR.'vendor'); |
|
25 | +Yii::setPathOfAlias ('base', BASEDIR); |
|
26 | +Yii::setPathOfAlias ('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias ('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller')); |
|
27 | 27 | |
28 | -$config = CMap::mergeArray($defaultConfig, $config); |
|
28 | +$config = CMap::mergeArray ($defaultConfig, $config); |
|
29 | 29 | |
30 | 30 | $_SERVER['SERVER_NAME'] = 'localhost'; |
31 | 31 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | * |
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | -return array ( |
|
19 | +return array( |
|
20 | 20 | '< Previous' => '', |
21 | 21 | '<< First' => '', |
22 | 22 | 'CApcCache requires PHP apc extension to be loaded.' => '', |
@@ -17,5 +17,5 @@ |
||
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | 19 | return array ( |
20 | - 'Unable to save change key' => '', |
|
20 | + 'Unable to save change key' => '', |
|
21 | 21 | ); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | * |
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | -return array ( |
|
19 | +return array( |
|
20 | 20 | '< Previous' => '', |
21 | 21 | '<< First' => '', |
22 | 22 | 'CApcCache requires PHP apc extension to be loaded.' => '', |
@@ -17,6 +17,6 @@ |
||
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | 19 | return array ( |
20 | - 'Activate Your Account' => '', |
|
21 | - 'Your Password Reset Information' => '', |
|
20 | + 'Activate Your Account' => '', |
|
21 | + 'Your Password Reset Information' => '', |
|
22 | 22 | ); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | * |
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | -return array ( |
|
19 | +return array( |
|
20 | 20 | '< Previous' => '', |
21 | 21 | '<< First' => '', |
22 | 22 | 'CApcCache requires PHP apc extension to be loaded.' => '', |
@@ -17,7 +17,7 @@ |
||
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | 19 | return array ( |
20 | - 'Change Theme Settings' => '', |
|
21 | - 'There are no settings for this section.' => '', |
|
22 | - 'Unable to save uploaded image.' => '', |
|
20 | + 'Change Theme Settings' => '', |
|
21 | + 'There are no settings for this section.' => '', |
|
22 | + 'Unable to save uploaded image.' => '', |
|
23 | 23 | ); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | * |
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | -return array ( |
|
19 | +return array( |
|
20 | 20 | '< Previous' => '', |
21 | 21 | '<< First' => '', |
22 | 22 | 'CApcCache requires PHP apc extension to be loaded.' => '', |
@@ -17,13 +17,13 @@ |
||
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | 19 | return array ( |
20 | - 'Could not save uploaded file. The upload was cancelled, or server error encountered' => '', |
|
21 | - 'File has an invalid extension, it should be one of {{these}}.' => '', |
|
22 | - 'File is empty' => '', |
|
23 | - 'File is too large' => '', |
|
24 | - 'No files were uploaded.' => '', |
|
25 | - 'The server encountered an error during uploading. Please verify that you have saufficient space in the container and that your quota has not been reached.' => '', |
|
26 | - 'Unable to attach OpenStack Container.' => '', |
|
27 | - 'increase post_max_size and upload_max_filesize to {{size}}' => '', |
|
28 | - '{{dir}} Server error. Upload directory isn\'t writable.' => '', |
|
20 | + 'Could not save uploaded file. The upload was cancelled, or server error encountered' => '', |
|
21 | + 'File has an invalid extension, it should be one of {{these}}.' => '', |
|
22 | + 'File is empty' => '', |
|
23 | + 'File is too large' => '', |
|
24 | + 'No files were uploaded.' => '', |
|
25 | + 'The server encountered an error during uploading. Please verify that you have saufficient space in the container and that your quota has not been reached.' => '', |
|
26 | + 'Unable to attach OpenStack Container.' => '', |
|
27 | + 'increase post_max_size and upload_max_filesize to {{size}}' => '', |
|
28 | + '{{dir}} Server error. Upload directory isn\'t writable.' => '', |
|
29 | 29 | ); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | * |
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | -return array ( |
|
19 | +return array( |
|
20 | 20 | '< Previous' => '', |
21 | 21 | '<< First' => '', |
22 | 22 | 'CApcCache requires PHP apc extension to be loaded.' => '', |
@@ -17,7 +17,7 @@ |
||
17 | 17 | * NOTE, this file must be saved in UTF-8 encoding. |
18 | 18 | */ |
19 | 19 | return array ( |
20 | - 'The requested post cannot be found.' => '', |
|
21 | - 'The specified post cannot be found.' => '', |
|
22 | - 'Use of CiiController::sendEmail is deprecated, and will be dropped in a future version. Use EmailSettings::send instead' => '', |
|
20 | + 'The requested post cannot be found.' => '', |
|
21 | + 'The specified post cannot be found.' => '', |
|
22 | + 'Use of CiiController::sendEmail is deprecated, and will be dropped in a future version. Use EmailSettings::send instead' => '', |
|
23 | 23 | ); |