@@ -2,8 +2,8 @@ |
||
2 | 2 | /** |
3 | 3 | * Default Dashboards |
4 | 4 | */ |
5 | -$collection[1]= $xpdo->newObject('modDashboard'); |
|
6 | -$collection[1]->fromArray(array ( |
|
5 | +$collection[1] = $xpdo->newObject('modDashboard'); |
|
6 | +$collection[1]->fromArray(array( |
|
7 | 7 | 'id' => 1, |
8 | 8 | 'name' => 'Default', |
9 | 9 | 'description' => '', |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | $templateGroups = array(); |
7 | 7 | |
8 | 8 | /* administrator group templates */ |
9 | -$templateGroups['1']= $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
9 | +$templateGroups['1'] = $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
10 | 10 | $templateGroups['1']->fromArray(array( |
11 | 11 | 'id' => 1, |
12 | 12 | 'name' => 'Admin', |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | )); |
15 | 15 | |
16 | 16 | /* Object group templates */ |
17 | -$templateGroups['2']= $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
17 | +$templateGroups['2'] = $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
18 | 18 | $templateGroups['2']->fromArray(array( |
19 | 19 | 'id' => 2, |
20 | 20 | 'name' => 'Object', |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | )); |
23 | 23 | |
24 | 24 | /* Resource group templates */ |
25 | -$templateGroups['3']= $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
25 | +$templateGroups['3'] = $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
26 | 26 | $templateGroups['3']->fromArray(array( |
27 | 27 | 'id' => 3, |
28 | 28 | 'name' => 'Resource', |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | )); |
31 | 31 | |
32 | 32 | /* Element group templates */ |
33 | -$templateGroups['4']= $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
33 | +$templateGroups['4'] = $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
34 | 34 | $templateGroups['4']->fromArray(array( |
35 | 35 | 'id' => 4, |
36 | 36 | 'name' => 'Element', |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | )); |
39 | 39 | |
40 | 40 | /* Media Source group templates */ |
41 | -$templateGroups['5']= $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
41 | +$templateGroups['5'] = $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
42 | 42 | $templateGroups['5']->fromArray(array( |
43 | 43 | 'id' => 5, |
44 | 44 | 'name' => 'MediaSource', |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | )); |
47 | 47 | |
48 | 48 | /* Namespace group templates */ |
49 | -$templateGroups['6']= $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
49 | +$templateGroups['6'] = $xpdo->newObject('modAccessPolicyTemplateGroup'); |
|
50 | 50 | $templateGroups['6']->fromArray(array( |
51 | 51 | 'id' => 6, |
52 | 52 | 'name' => 'Namespace', |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -$collection['0']= $xpdo->newObject('modContextSetting'); |
|
3 | -$collection['0']->fromArray(array ( |
|
2 | +$collection['0'] = $xpdo->newObject('modContextSetting'); |
|
3 | +$collection['0']->fromArray(array( |
|
4 | 4 | 'context_key' => 'mgr', |
5 | 5 | 'key' => 'allow_tags_in_post', |
6 | 6 | 'value' => '1', |
@@ -9,8 +9,8 @@ discard block |
||
9 | 9 | 'area' => 'system', |
10 | 10 | 'editedon' => NULL, |
11 | 11 | ), '', true, true); |
12 | -$collection['1']= $xpdo->newObject('modContextSetting'); |
|
13 | -$collection['1']->fromArray(array ( |
|
12 | +$collection['1'] = $xpdo->newObject('modContextSetting'); |
|
13 | +$collection['1']->fromArray(array( |
|
14 | 14 | 'context_key' => 'mgr', |
15 | 15 | 'key' => 'modRequest.class', |
16 | 16 | 'value' => 'modManagerRequest', |
@@ -3,8 +3,8 @@ |
||
3 | 3 | * Default Media Sources |
4 | 4 | * @var xPDO $xpdo |
5 | 5 | */ |
6 | -$collection[1]= $xpdo->newObject('sources.modMediaSource'); |
|
7 | -$collection[1]->fromArray(array ( |
|
6 | +$collection[1] = $xpdo->newObject('sources.modMediaSource'); |
|
7 | +$collection[1]->fromArray(array( |
|
8 | 8 | 'id' => 1, |
9 | 9 | 'name' => 'Filesystem', |
10 | 10 | 'description' => '', |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | * Default Dashboard Widgets |
4 | 4 | */ |
5 | 5 | $widgets = array(); |
6 | -$widgets[1]= $xpdo->newObject('modDashboardWidget'); |
|
7 | -$widgets[1]->fromArray(array ( |
|
6 | +$widgets[1] = $xpdo->newObject('modDashboardWidget'); |
|
7 | +$widgets[1]->fromArray(array( |
|
8 | 8 | 'name' => 'w_newsfeed', |
9 | 9 | 'description' => 'w_newsfeed_desc', |
10 | 10 | 'type' => 'file', |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | 'lexicon' => 'core:dashboards', |
15 | 15 | ), '', true, true); |
16 | 16 | |
17 | -$widgets[2]= $xpdo->newObject('modDashboardWidget'); |
|
18 | -$widgets[2]->fromArray(array ( |
|
17 | +$widgets[2] = $xpdo->newObject('modDashboardWidget'); |
|
18 | +$widgets[2]->fromArray(array( |
|
19 | 19 | 'name' => 'w_securityfeed', |
20 | 20 | 'description' => 'w_securityfeed_desc', |
21 | 21 | 'type' => 'file', |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | 'lexicon' => 'core:dashboards', |
26 | 26 | ), '', true, true); |
27 | 27 | |
28 | -$widgets[3]= $xpdo->newObject('modDashboardWidget'); |
|
29 | -$widgets[3]->fromArray(array ( |
|
28 | +$widgets[3] = $xpdo->newObject('modDashboardWidget'); |
|
29 | +$widgets[3]->fromArray(array( |
|
30 | 30 | 'name' => 'w_whosonline', |
31 | 31 | 'description' => 'w_whosonline_desc', |
32 | 32 | 'type' => 'file', |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | 'lexicon' => 'core:dashboards', |
37 | 37 | ), '', true, true); |
38 | 38 | |
39 | -$widgets[4]= $xpdo->newObject('modDashboardWidget'); |
|
40 | -$widgets[4]->fromArray(array ( |
|
39 | +$widgets[4] = $xpdo->newObject('modDashboardWidget'); |
|
40 | +$widgets[4]->fromArray(array( |
|
41 | 41 | 'name' => 'w_recentlyeditedresources', |
42 | 42 | 'description' => 'w_recentlyeditedresources_desc', |
43 | 43 | 'type' => 'file', |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | 'lexicon' => 'core:dashboards', |
48 | 48 | ), '', true, true); |
49 | 49 | |
50 | -$widgets[5]= $xpdo->newObject('modDashboardWidget'); |
|
51 | -$widgets[5]->fromArray(array ( |
|
50 | +$widgets[5] = $xpdo->newObject('modDashboardWidget'); |
|
51 | +$widgets[5]->fromArray(array( |
|
52 | 52 | 'name' => 'w_configcheck', |
53 | 53 | 'description' => 'w_configcheck_desc', |
54 | 54 | 'type' => 'file', |
@@ -10,9 +10,9 @@ discard block |
||
10 | 10 | $dbase = 'modx3'; |
11 | 11 | $table_prefix = 'modx_'; |
12 | 12 | $database_dsn = 'mysql:host=localhost;dbname=modx3;charset=utf8'; |
13 | -$config_options = array ( |
|
13 | +$config_options = array( |
|
14 | 14 | ); |
15 | -$driver_options = array ( |
|
15 | +$driver_options = array( |
|
16 | 16 | ); |
17 | 17 | |
18 | 18 | $lastInstallTime = 1519931536; |
@@ -23,60 +23,60 @@ discard block |
||
23 | 23 | $uuid = 'c5e00d1a-eb2d-4c19-8688-df80e17009ad'; |
24 | 24 | |
25 | 25 | if (!defined('MODX_CORE_PATH')) { |
26 | - $modx_core_path= '/var/www/public/test/core/'; |
|
26 | + $modx_core_path = '/var/www/public/test/core/'; |
|
27 | 27 | define('MODX_CORE_PATH', $modx_core_path); |
28 | 28 | } |
29 | 29 | if (!defined('MODX_PROCESSORS_PATH')) { |
30 | - $modx_processors_path= '/var/www/public/test/core/model/modx/processors/'; |
|
30 | + $modx_processors_path = '/var/www/public/test/core/model/modx/processors/'; |
|
31 | 31 | define('MODX_PROCESSORS_PATH', $modx_processors_path); |
32 | 32 | } |
33 | 33 | if (!defined('MODX_CONNECTORS_PATH')) { |
34 | - $modx_connectors_path= '/var/www/public/test/connectors/'; |
|
35 | - $modx_connectors_url= '/test/connectors/'; |
|
34 | + $modx_connectors_path = '/var/www/public/test/connectors/'; |
|
35 | + $modx_connectors_url = '/test/connectors/'; |
|
36 | 36 | define('MODX_CONNECTORS_PATH', $modx_connectors_path); |
37 | 37 | define('MODX_CONNECTORS_URL', $modx_connectors_url); |
38 | 38 | } |
39 | 39 | if (!defined('MODX_MANAGER_PATH')) { |
40 | - $modx_manager_path= '/var/www/public/test/manager/'; |
|
41 | - $modx_manager_url= '/test/manager/'; |
|
40 | + $modx_manager_path = '/var/www/public/test/manager/'; |
|
41 | + $modx_manager_url = '/test/manager/'; |
|
42 | 42 | define('MODX_MANAGER_PATH', $modx_manager_path); |
43 | 43 | define('MODX_MANAGER_URL', $modx_manager_url); |
44 | 44 | } |
45 | 45 | if (!defined('MODX_BASE_PATH')) { |
46 | - $modx_base_path= '/var/www/public/test/'; |
|
47 | - $modx_base_url= '/test/'; |
|
46 | + $modx_base_path = '/var/www/public/test/'; |
|
47 | + $modx_base_url = '/test/'; |
|
48 | 48 | define('MODX_BASE_PATH', $modx_base_path); |
49 | 49 | define('MODX_BASE_URL', $modx_base_url); |
50 | 50 | } |
51 | -if(defined('PHP_SAPI') && (PHP_SAPI == "cli" || PHP_SAPI == "embed")) { |
|
51 | +if (defined('PHP_SAPI') && (PHP_SAPI == "cli" || PHP_SAPI == "embed")) { |
|
52 | 52 | $isSecureRequest = false; |
53 | 53 | } else { |
54 | 54 | $isSecureRequest = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port); |
55 | 55 | } |
56 | 56 | if (!defined('MODX_URL_SCHEME')) { |
57 | - $url_scheme= $isSecureRequest ? 'https://' : 'http://'; |
|
57 | + $url_scheme = $isSecureRequest ? 'https://' : 'http://'; |
|
58 | 58 | define('MODX_URL_SCHEME', $url_scheme); |
59 | 59 | } |
60 | 60 | if (!defined('MODX_HTTP_HOST')) { |
61 | - if(defined('PHP_SAPI') && (PHP_SAPI == "cli" || PHP_SAPI == "embed")) { |
|
62 | - $http_host='192.168.33.10'; |
|
61 | + if (defined('PHP_SAPI') && (PHP_SAPI == "cli" || PHP_SAPI == "embed")) { |
|
62 | + $http_host = '192.168.33.10'; |
|
63 | 63 | define('MODX_HTTP_HOST', $http_host); |
64 | 64 | } else { |
65 | - $http_host= array_key_exists('HTTP_HOST', $_SERVER) ? htmlspecialchars($_SERVER['HTTP_HOST'], ENT_QUOTES) : '192.168.33.10'; |
|
65 | + $http_host = array_key_exists('HTTP_HOST', $_SERVER) ? htmlspecialchars($_SERVER['HTTP_HOST'], ENT_QUOTES) : '192.168.33.10'; |
|
66 | 66 | if ($_SERVER['SERVER_PORT'] != 80) { |
67 | - $http_host= str_replace(':' . $_SERVER['SERVER_PORT'], '', $http_host); // remove port from HTTP_HOST |
|
67 | + $http_host = str_replace(':'.$_SERVER['SERVER_PORT'], '', $http_host); // remove port from HTTP_HOST |
|
68 | 68 | } |
69 | - $http_host .= ($_SERVER['SERVER_PORT'] == 80 || $isSecureRequest) ? '' : ':' . $_SERVER['SERVER_PORT']; |
|
69 | + $http_host .= ($_SERVER['SERVER_PORT'] == 80 || $isSecureRequest) ? '' : ':'.$_SERVER['SERVER_PORT']; |
|
70 | 70 | define('MODX_HTTP_HOST', $http_host); |
71 | 71 | } |
72 | 72 | } |
73 | 73 | if (!defined('MODX_SITE_URL')) { |
74 | - $site_url= $url_scheme . $http_host . MODX_BASE_URL; |
|
74 | + $site_url = $url_scheme.$http_host.MODX_BASE_URL; |
|
75 | 75 | define('MODX_SITE_URL', $site_url); |
76 | 76 | } |
77 | 77 | if (!defined('MODX_ASSETS_PATH')) { |
78 | - $modx_assets_path= '/var/www/public/test/assets/'; |
|
79 | - $modx_assets_url= '/test/assets/'; |
|
78 | + $modx_assets_path = '/var/www/public/test/assets/'; |
|
79 | + $modx_assets_url = '/test/assets/'; |
|
80 | 80 | define('MODX_ASSETS_PATH', $modx_assets_path); |
81 | 81 | define('MODX_ASSETS_URL', $modx_assets_url); |
82 | 82 | } |
@@ -88,6 +88,6 @@ discard block |
||
88 | 88 | define('MODX_LOG_LEVEL_DEBUG', 4); |
89 | 89 | } |
90 | 90 | if (!defined('MODX_CACHE_DISABLED')) { |
91 | - $modx_cache_disabled= false; |
|
91 | + $modx_cache_disabled = false; |
|
92 | 92 | define('MODX_CACHE_DISABLED', $modx_cache_disabled); |
93 | 93 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php return array ( |
|
1 | +<?php return array( |
|
2 | 2 | 'type' => 'document', |
3 | 3 | 'contentType' => 'text/html', |
4 | 4 | 'pagetitle' => 'Home', |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | 'content_type' => 1, |
41 | 41 | 'properties' => NULL, |
42 | 42 | 'tv' => |
43 | - array ( |
|
43 | + array( |
|
44 | 44 | ), |
45 | 45 | 'extras' => |
46 | - array ( |
|
46 | + array( |
|
47 | 47 | ), |
48 | 48 | ); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $this->results[] = $message; |
119 | 119 | // now cache it: |
120 | 120 | |
121 | - $simpleCache = new SimpleCache(BLEND_CACHE_DIR . 'modx/'); |
|
121 | + $simpleCache = new SimpleCache(BLEND_CACHE_DIR.'modx/'); |
|
122 | 122 | $simpleCache->set($this->getSeedsDir().'-'.$this->method, $this->results); |
123 | 123 | } |
124 | 124 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | { |
130 | 130 | $key = 'install-config-v'.str_replace(['.', '-'], '_', $this->version).'_install'; |
131 | 131 | |
132 | - $simpleCache = new SimpleCache(BLEND_CACHE_DIR . 'modx/'); |
|
132 | + $simpleCache = new SimpleCache(BLEND_CACHE_DIR.'modx/'); |
|
133 | 133 | $this->install_config = $simpleCache->get($key); |
134 | 134 | } |
135 | 135 | |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | * @param mixed |
139 | 139 | * @return bool|mixed |
140 | 140 | */ |
141 | - protected function getUserInstallConfigValue($key, $default=false) |
|
141 | + protected function getUserInstallConfigValue($key, $default = false) |
|
142 | 142 | { |
143 | 143 | if (isset($this->install_config[$key])) { |
144 | 144 | return $this->install_config[$key]; |
@@ -152,6 +152,6 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function loadCurrentVersionInfo() |
154 | 154 | { |
155 | - $this->current_version = include MODX_CORE_PATH . 'docs/version.inc.php'; |
|
155 | + $this->current_version = include MODX_CORE_PATH.'docs/version.inc.php'; |
|
156 | 156 | } |
157 | 157 | } |
158 | 158 | \ No newline at end of file |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $this->modx->cacheManager->refresh(); |
58 | 58 | |
59 | 59 | $previous_version = $this->modx->getOption('blend.version'); |
60 | - if (!$previous_version || version_compare($this->getVersion(), $previous_version, '>') ) { |
|
60 | + if (!$previous_version || version_compare($this->getVersion(), $previous_version, '>')) { |
|
61 | 61 | |
62 | 62 | /** @var \xPDOManager $manager */ |
63 | 63 | $manager = $this->modx->getManager(); |