@@ -73,7 +73,8 @@ |
||
| 73 | 73 | if (is_a($stat, midcom_services_indexer_client::class)) { |
| 74 | 74 | try { |
| 75 | 75 | $stat->reindex(); |
| 76 | - } catch (RequestException $e) { |
|
| 76 | + } |
|
| 77 | + catch (RequestException $e) { |
|
| 77 | 78 | if ($e->hasResponse()) { |
| 78 | 79 | $crawler = new Crawler($e->getResponse()->getBody()->getContents()); |
| 79 | 80 | $body = $crawler->filterXPath('//body')->html(); |
@@ -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); |
@@ -122,7 +122,8 @@ discard block |
||
| 122 | 122 | try { |
| 123 | 123 | $creator = new midcom_db_person($view_metadata->get('creator')); |
| 124 | 124 | $creator_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$creator->guid}/\">$creator->name</a>"; |
| 125 | - } catch (midcom_error $e) { |
|
| 125 | + } |
|
| 126 | + catch (midcom_error $e) { |
|
| 126 | 127 | $creator_string = $l10n->get('unknown person'); |
| 127 | 128 | } |
| 128 | 129 | $created = (int) $view_metadata->get('created'); |
@@ -135,7 +136,8 @@ discard block |
||
| 135 | 136 | try { |
| 136 | 137 | $editor = new midcom_db_person($view_metadata->get('revisor')); |
| 137 | 138 | $editor_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$editor->guid}/\">$editor->name</a>"; |
| 138 | - } catch (midcom_error $e) { |
|
| 139 | + } |
|
| 140 | + catch (midcom_error $e) { |
|
| 139 | 141 | $editor_string = $l10n->get('unknown person'); |
| 140 | 142 | } |
| 141 | 143 | |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | |
| 128 | 128 | $edited = (int) $view_metadata->get('revised'); |
| 129 | 129 | $revision = $view_metadata->get('revision'); |
| 130 | - if ( $revision > 0 |
|
| 130 | + if ($revision > 0 |
|
| 131 | 131 | && $edited != $created) { |
| 132 | 132 | try { |
| 133 | 133 | $editor = new midcom_db_person($view_metadata->get('revisor')); |
@@ -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') { |
@@ -87,7 +87,8 @@ |
||
| 87 | 87 | $param = $param->__object; |
| 88 | 88 | } |
| 89 | 89 | $this->_user_cache[$id] = new midcom_core_user($param); |
| 90 | - } catch (midcom_error $e) { |
|
| 90 | + } |
|
| 91 | + catch (midcom_error $e) { |
|
| 91 | 92 | // Keep it silent while missing user object can mess here |
| 92 | 93 | $this->_user_cache[$id] = null; |
| 93 | 94 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | return null; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - if ( midcom::get()->config->get('auth_check_client_ip') |
|
| 103 | + if (midcom::get()->config->get('auth_check_client_ip') |
|
| 104 | 104 | && $data['clientip'] != $request->getClientIp()) { |
| 105 | 105 | debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO); |
| 106 | 106 | debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}."); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | return null; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if ( !$this->check_timestamp($data['timestamp'], $user) |
|
| 117 | + if (!$this->check_timestamp($data['timestamp'], $user) |
|
| 118 | 118 | || !$this->authenticate($user->username, '', true)) { |
| 119 | 119 | $this->logout($user); |
| 120 | 120 | return null; |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | $parent = $object->get_parent(); |
| 166 | 166 | |
| 167 | - if ( is_a($object, midcom_db_parameter::class) |
|
| 167 | + if (is_a($object, midcom_db_parameter::class) |
|
| 168 | 168 | && !empty($parent->guid)) { |
| 169 | 169 | // Add "parameters" list to breadcrumb if we're in a param |
| 170 | 170 | $breadcrumb[] = [ |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | $i = 0; |
| 177 | - while ( !empty($parent->guid) |
|
| 177 | + while (!empty($parent->guid) |
|
| 178 | 178 | && $i < 10) { |
| 179 | 179 | $i++; |
| 180 | 180 | $parent_reflector = midcom_helper_reflector::get($parent); |
@@ -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 | |