@@ -64,7 +64,8 @@ |
||
64 | 64 | try { |
65 | 65 | $this->__object = $this->__midcom_class_name__::get_cached($this->__identifier); |
66 | 66 | return true; |
67 | - } catch (midcom_error $e) { |
|
67 | + } |
|
68 | + catch (midcom_error $e) { |
|
68 | 69 | $e->log(); |
69 | 70 | } |
70 | 71 | return false; |
@@ -166,7 +166,7 @@ |
||
166 | 166 | $address = addslashes($address); |
167 | 167 | return preg_replace_callback( |
168 | 168 | '/href="(http:\/\/.*?)"/i', |
169 | - function ($match) use ($address) { |
|
169 | + function($match) use ($address) { |
|
170 | 170 | return 'href="' . str_replace("URL", rawurlencode($match[1]), $address) . '"'; |
171 | 171 | }, |
172 | 172 | $html); |
@@ -148,13 +148,13 @@ |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
151 | - * Inserts a link detector to the given HTML source. All outgoing |
|
152 | - * HTTP links in the source HTML are replaced with the given |
|
153 | - * link detector address so that the token "URL" is replaced with |
|
154 | - * encoded form of the original link. It is expected that the link detector |
|
155 | - * address points to a script that records the passed link and |
|
156 | - * forwards the client to the real link target. |
|
157 | - */ |
|
151 | + * Inserts a link detector to the given HTML source. All outgoing |
|
152 | + * HTTP links in the source HTML are replaced with the given |
|
153 | + * link detector address so that the token "URL" is replaced with |
|
154 | + * encoded form of the original link. It is expected that the link detector |
|
155 | + * address points to a script that records the passed link and |
|
156 | + * forwards the client to the real link target. |
|
157 | + */ |
|
158 | 158 | private function _insert_link_detector(string $html, string $address) : string |
159 | 159 | { |
160 | 160 | $address = addslashes($address); |
@@ -575,7 +575,8 @@ |
||
575 | 575 | $param = $param->__object; |
576 | 576 | } |
577 | 577 | $this->_group_cache[$id] = new midcom_core_group($param); |
578 | - } catch (midcom_error $e) { |
|
578 | + } |
|
579 | + catch (midcom_error $e) { |
|
579 | 580 | debug_add("Group with identifier {$id} could not be loaded: " . $e->getMessage(), MIDCOM_LOG_WARN); |
580 | 581 | $this->_group_cache[$id] = null; |
581 | 582 | } |
@@ -221,7 +221,7 @@ |
||
221 | 221 | return true; |
222 | 222 | } |
223 | 223 | if ($user === null) { |
224 | - $user =& $this->user; |
|
224 | + $user = & $this->user; |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | if ($user == 'EVERYONE') { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | protected function add_string_field(string $key, string $type) |
66 | 66 | { |
67 | - if ( $key == 'component' |
|
67 | + if ($key == 'component' |
|
68 | 68 | && $type == midcom_db_topic::class) { |
69 | 69 | $this->_add_component_dropdown($key); |
70 | 70 | return; |
@@ -134,12 +134,12 @@ discard block |
||
134 | 134 | parent::add_longtext_field($key); |
135 | 135 | |
136 | 136 | // Check the user preference and configuration |
137 | - if ( in_array($key, ['content', 'description']) |
|
137 | + if (in_array($key, ['content', 'description']) |
|
138 | 138 | && midgard_admin_asgard_plugin::get_preference('tinymce_enabled')) { |
139 | 139 | $this->schema['fields'][$key]['widget'] = 'tinymce'; |
140 | 140 | } |
141 | 141 | |
142 | - if ( in_array($key, ['value', 'code']) |
|
142 | + if (in_array($key, ['value', 'code']) |
|
143 | 143 | && midgard_admin_asgard_plugin::get_preference('codemirror_enabled')) { |
144 | 144 | $this->schema['fields'][$key]['widget'] = 'codemirror'; |
145 | 145 | } |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | if ($score1 > $score2) { |
258 | 258 | return 1; |
259 | 259 | } |
260 | - if ( $score1 < 3 |
|
260 | + if ($score1 < 3 |
|
261 | 261 | || $score1 > 6) { |
262 | 262 | return strnatcmp($first, $second); |
263 | 263 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | { |
278 | 278 | $success = true; |
279 | 279 | foreach ($this->_request_data['config']->_global as $global_key => $global_value) { |
280 | - if ( isset($config[$global_key]) |
|
280 | + if (isset($config[$global_key]) |
|
281 | 281 | && $config[$global_key] != $global_value) { |
282 | 282 | continue; |
283 | 283 | // Skip the ones we will set next |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | } |
291 | 291 | |
292 | 292 | foreach ($config as $key => $value) { |
293 | - if ( is_array($value) |
|
293 | + if (is_array($value) |
|
294 | 294 | || is_object($value)) { |
295 | 295 | /** |
296 | 296 | * See http://trac.midgard-project.org/ticket/1442 |
@@ -61,11 +61,11 @@ |
||
61 | 61 | $fields[$key] = $this->detect_schema($key, $value); |
62 | 62 | } |
63 | 63 | |
64 | - if ( !isset($this->config->_local[$key]) |
|
64 | + if (!isset($this->config->_local[$key]) |
|
65 | 65 | || $this->config->_local[$key] == $this->config->_global[$key]) { |
66 | 66 | // No local configuration setting, note to user that this is the global value |
67 | 67 | $fields[$key]['title'] = $schema->get_l10n()->get($fields[$key]['title']); |
68 | - $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') .")</span>"; |
|
68 | + $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') . ")</span>"; |
|
69 | 69 | } |
70 | 70 | } |
71 | 71 |
@@ -179,9 +179,9 @@ discard block |
||
179 | 179 | $files = []; |
180 | 180 | $pattern = $component_dir . '*.{' . $this->_i18n->get_current_language() . ',' . $this->_i18n->get_fallback_language() . '}.txt'; |
181 | 181 | |
182 | - foreach (glob($pattern, GLOB_NOSORT|GLOB_BRACE) as $path) { |
|
182 | + foreach (glob($pattern, GLOB_NOSORT | GLOB_BRACE) as $path) { |
|
183 | 183 | $entry = basename($path); |
184 | - if ( str_starts_with($entry, 'index') |
|
184 | + if (str_starts_with($entry, 'index') |
|
185 | 185 | || str_starts_with($entry, 'handler') |
186 | 186 | || str_starts_with($entry, 'urlmethod')) { |
187 | 187 | // Ignore dotfiles, handlers & index.lang.txt |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | $data = []; |
233 | 233 | |
234 | 234 | $exec_path = midcom::get()->componentloader->path_to_snippetpath($component) . '/exec/'; |
235 | - if ( !is_dir($exec_path) |
|
235 | + if (!is_dir($exec_path) |
|
236 | 236 | || !is_readable($exec_path)) { |
237 | 237 | // Directory not accessible, skip loading it |
238 | 238 | return $data; |
@@ -43,7 +43,8 @@ discard block |
||
43 | 43 | { |
44 | 44 | try { |
45 | 45 | $tmp = midgard_object_class::get_object_by_guid($guid); |
46 | - } catch (mgd_exception $e) { |
|
46 | + } |
|
47 | + catch (mgd_exception $e) { |
|
47 | 48 | debug_add('Loading object by GUID ' . $guid . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_INFO); |
48 | 49 | |
49 | 50 | throw new midcom_error_midgard($e, $guid); |
@@ -163,7 +164,8 @@ discard block |
||
163 | 164 | |
164 | 165 | try { |
165 | 166 | return $this->get_cached($classname, $parent_guid); |
166 | - } catch (midcom_error $e) { |
|
167 | + } |
|
168 | + catch (midcom_error $e) { |
|
167 | 169 | return null; |
168 | 170 | } |
169 | 171 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | throw new midcom_error_midgard($e, $guid); |
70 | 70 | } |
71 | - if ( get_class($tmp) == 'midgard_person' |
|
71 | + if (get_class($tmp) == 'midgard_person' |
|
72 | 72 | && $this->person_class != 'midgard_person') { |
73 | 73 | $tmp = new $this->person_class($guid); |
74 | 74 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | $object = new $classname($src); |
100 | 100 | $cache[$classname][$object->guid] = $object; |
101 | - $cache[$classname][$object->id] =& $cache[$classname][$object->guid]; |
|
101 | + $cache[$classname][$object->id] = & $cache[$classname][$object->guid]; |
|
102 | 102 | return $cache[$classname][$object->guid]; |
103 | 103 | } |
104 | 104 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | return true; |
146 | 146 | } |
147 | 147 | |
148 | - if ( isset($object->__object) |
|
148 | + if (isset($object->__object) |
|
149 | 149 | && is_object($object->__object) |
150 | 150 | && $object->__object instanceof $class) { |
151 | 151 | // Decorator whose MgdSchema object matches |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | return $this->get_parent_data_uncached($object); |
169 | 169 | }); |
170 | 170 | |
171 | - if ( empty($parent_guid) |
|
171 | + if (empty($parent_guid) |
|
172 | 172 | || $parent_guid === $object->guid) { |
173 | 173 | return null; |
174 | 174 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | //Check up |
144 | - if ( !$this->up |
|
144 | + if (!$this->up |
|
145 | 145 | && $this->title != '__org_openpsa_calendar') { |
146 | 146 | $root_event = org_openpsa_calendar_interface::find_root_event(); |
147 | 147 | $this->up = $root_event->id; |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | |
167 | 167 | private function _check_timerange() : bool |
168 | 168 | { |
169 | - if ( !$this->start |
|
169 | + if (!$this->start |
|
170 | 170 | || !$this->end) { |
171 | 171 | debug_add('Event must have start and end timestamps'); |
172 | 172 | midcom_connection::set_error(MGD_ERR_RANGE); |