@@ -32,7 +32,7 @@ |
||
| 32 | 32 | echo " <td><a href='" . $data['router']->generate('preview', ['guid' => $guid, 'revision' => $number]) . "'>{$revision['version']}</a></td>\n"; |
| 33 | 33 | echo " <td>" . $formatter->datetime($revision['date']) . "</td>\n"; |
| 34 | 34 | |
| 35 | - if ( $revision['user'] |
|
| 35 | + if ($revision['user'] |
|
| 36 | 36 | && $user = midcom::get()->auth->get_user($revision['user'])) { |
| 37 | 37 | $person_label = $user->get_storage()->name; |
| 38 | 38 | echo " <td>{$person_label}</td>\n"; |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | |
| 18 | 18 | public function form_widget_simple(FormView $view, array $data) |
| 19 | 19 | { |
| 20 | - if ( !empty($data['value']) |
|
| 20 | + if (!empty($data['value']) |
|
| 21 | 21 | || is_numeric($data['value'])) { |
| 22 | 22 | return $data['value']; |
| 23 | 23 | } |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | |
| 144 | 144 | public function form_widget_simple(FormView $view, array $data) |
| 145 | 145 | { |
| 146 | - if ( !empty($data['value']) |
|
| 146 | + if (!empty($data['value']) |
|
| 147 | 147 | || is_numeric($data['value'])) { |
| 148 | 148 | return $this->escape($data['value']); |
| 149 | 149 | } |
@@ -45,7 +45,8 @@ discard block |
||
| 45 | 45 | $object = self::_load_backend($backend, $params); |
| 46 | 46 | debug_add('Using backend ' . $backend); |
| 47 | 47 | return $object; |
| 48 | - } catch (midcom_error $e) { |
|
| 48 | + } |
|
| 49 | + catch (midcom_error $e) { |
|
| 49 | 50 | debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage()); |
| 50 | 51 | } |
| 51 | 52 | } |
@@ -80,7 +81,8 @@ discard block |
||
| 80 | 81 | $ret = $this->mail($message); |
| 81 | 82 | $this->error = null; |
| 82 | 83 | return $ret; |
| 83 | - } catch (Exception $e) { |
|
| 84 | + } |
|
| 85 | + catch (Exception $e) { |
|
| 84 | 86 | $this->error = $e->getMessage(); |
| 85 | 87 | return false; |
| 86 | 88 | } |
@@ -33,7 +33,8 @@ |
||
| 33 | 33 | { |
| 34 | 34 | try { |
| 35 | 35 | midcom::get()->cache->invalidate_all(); |
| 36 | - } catch (\Throwable $e) { |
|
| 36 | + } |
|
| 37 | + catch (\Throwable $e) { |
|
| 37 | 38 | $output->writeln($e->getMessage()); |
| 38 | 39 | } |
| 39 | 40 | $fs = new Filesystem; |
@@ -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 | } |