@@ -9,64 +9,64 @@ |
||
9 | 9 | |
10 | 10 | # Cadmium |
11 | 11 | |
12 | -define('CADMIUM_NAME', 'Cadmium CMS'); |
|
13 | -define('CADMIUM_HOME', 'http://cadmium-cms.com'); |
|
12 | +define('CADMIUM_NAME', 'Cadmium CMS'); |
|
13 | +define('CADMIUM_HOME', 'http://cadmium-cms.com'); |
|
14 | 14 | |
15 | -define('CADMIUM_VERSION', '0.4.9'); |
|
16 | -define('CADMIUM_COPY', '2017'); |
|
15 | +define('CADMIUM_VERSION', '0.4.9'); |
|
16 | +define('CADMIUM_COPY', '2017'); |
|
17 | 17 | |
18 | 18 | # Third-party |
19 | 19 | |
20 | -define('JQUERY_VERSION', '3.2.1'); |
|
21 | -define('SEMANTIC_UI_VERSION', '2.2.13'); |
|
22 | -define('CKEDITOR_VERSION', '4.7.3'); |
|
23 | -define('ACE_VERSION', '1.2.6'); |
|
20 | +define('JQUERY_VERSION', '3.2.1'); |
|
21 | +define('SEMANTIC_UI_VERSION', '2.2.13'); |
|
22 | +define('CKEDITOR_VERSION', '4.7.3'); |
|
23 | +define('ACE_VERSION', '1.2.6'); |
|
24 | 24 | |
25 | 25 | # Sections |
26 | 26 | |
27 | -define('SECTION_SITE', 'site'); |
|
28 | -define('SECTION_ADMIN', 'admin'); |
|
27 | +define('SECTION_SITE', 'site'); |
|
28 | +define('SECTION_ADMIN', 'admin'); |
|
29 | 29 | |
30 | 30 | # Access |
31 | 31 | |
32 | -define('ACCESS_PUBLIC', 0); |
|
33 | -define('ACCESS_REGISTERED', 1); |
|
34 | -define('ACCESS_ADMINISTRATOR', 2); |
|
32 | +define('ACCESS_PUBLIC', 0); |
|
33 | +define('ACCESS_REGISTERED', 1); |
|
34 | +define('ACCESS_ADMINISTRATOR', 2); |
|
35 | 35 | |
36 | 36 | # Frequency |
37 | 37 | |
38 | -define('FREQUENCY_ALWAYS', 'always'); |
|
39 | -define('FREQUENCY_HOURLY', 'hourly'); |
|
40 | -define('FREQUENCY_DAILY', 'daily'); |
|
41 | -define('FREQUENCY_WEEKLY', 'weekly'); |
|
42 | -define('FREQUENCY_MONTHLY', 'monthly'); |
|
43 | -define('FREQUENCY_YEARLY', 'yearly'); |
|
44 | -define('FREQUENCY_NEVER', 'never'); |
|
38 | +define('FREQUENCY_ALWAYS', 'always'); |
|
39 | +define('FREQUENCY_HOURLY', 'hourly'); |
|
40 | +define('FREQUENCY_DAILY', 'daily'); |
|
41 | +define('FREQUENCY_WEEKLY', 'weekly'); |
|
42 | +define('FREQUENCY_MONTHLY', 'monthly'); |
|
43 | +define('FREQUENCY_YEARLY', 'yearly'); |
|
44 | +define('FREQUENCY_NEVER', 'never'); |
|
45 | 45 | |
46 | 46 | # Rank |
47 | 47 | |
48 | -define('RANK_GUEST', 0); |
|
49 | -define('RANK_USER', 1); |
|
50 | -define('RANK_ADMINISTRATOR', 2); |
|
48 | +define('RANK_GUEST', 0); |
|
49 | +define('RANK_USER', 1); |
|
50 | +define('RANK_ADMINISTRATOR', 2); |
|
51 | 51 | |
52 | 52 | # Sex |
53 | 53 | |
54 | -define('SEX_NOT_SELECTED', 0); |
|
55 | -define('SEX_MALE', 1); |
|
56 | -define('SEX_FEMALE', 2); |
|
54 | +define('SEX_NOT_SELECTED', 0); |
|
55 | +define('SEX_MALE', 1); |
|
56 | +define('SEX_FEMALE', 2); |
|
57 | 57 | |
58 | 58 | # Status |
59 | 59 | |
60 | -define('STATUS_ONLINE', 0); |
|
61 | -define('STATUS_MAINTENANCE', 1); |
|
62 | -define('STATUS_UPDATE', 2); |
|
60 | +define('STATUS_ONLINE', 0); |
|
61 | +define('STATUS_MAINTENANCE', 1); |
|
62 | +define('STATUS_UPDATE', 2); |
|
63 | 63 | |
64 | 64 | # Target |
65 | 65 | |
66 | -define('TARGET_SELF', 0); |
|
67 | -define('TARGET_BLANK', 1); |
|
66 | +define('TARGET_SELF', 0); |
|
67 | +define('TARGET_BLANK', 1); |
|
68 | 68 | |
69 | 69 | # Visibility |
70 | 70 | |
71 | -define('VISIBILITY_DRAFT', 0); |
|
72 | -define('VISIBILITY_PUBLISHED', 1); |
|
71 | +define('VISIBILITY_DRAFT', 0); |
|
72 | +define('VISIBILITY_PUBLISHED', 1); |
@@ -30,12 +30,16 @@ discard block |
||
30 | 30 | |
31 | 31 | $languages = [Extend\Languages::getPrimary('path'), Extend\Languages::get('path')]; $phrases = static::PHRASES; |
32 | 32 | |
33 | - if (Extend\Addons::isInited()) $phrases = array_merge($phrases, array_keys(Extend\Addons::getItems())); |
|
33 | + if (Extend\Addons::isInited()) { |
|
34 | + $phrases = array_merge($phrases, array_keys(Extend\Addons::getItems())); |
|
35 | + } |
|
34 | 36 | |
35 | - foreach (array_unique($languages) as $path) foreach ($phrases as $name) { |
|
37 | + foreach (array_unique($languages) as $path) { |
|
38 | + foreach ($phrases as $name) { |
|
36 | 39 | |
37 | 40 | Language::load($path . 'Phrases/' . $name . '.php'); |
38 | 41 | } |
42 | + } |
|
39 | 43 | } |
40 | 44 | |
41 | 45 | /** |
@@ -86,7 +90,9 @@ discard block |
||
86 | 90 | |
87 | 91 | # Set timezone |
88 | 92 | |
89 | - if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) date_default_timezone_set($timezone); |
|
93 | + if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) { |
|
94 | + date_default_timezone_set($timezone); |
|
95 | + } |
|
90 | 96 | |
91 | 97 | # Init utils |
92 | 98 |