@@ -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); |
@@ -154,7 +154,7 @@ |
||
154 | 154 | $address = addslashes($address); |
155 | 155 | return preg_replace_callback( |
156 | 156 | '/href="(http:\/\/.*?)"/i', |
157 | - function (array $match) use ($address) { |
|
157 | + function(array $match) use ($address) { |
|
158 | 158 | return 'href="' . str_replace("URL", rawurlencode($match[1]), $address) . '"'; |
159 | 159 | }, |
160 | 160 | $html); |
@@ -47,7 +47,8 @@ |
||
47 | 47 | $target = new midcom_db_topic($request->request->getInt('move_to')); |
48 | 48 | $this->_move_object($target); |
49 | 49 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label())); |
50 | - } catch (midcom_error $e) { |
|
50 | + } |
|
51 | + catch (midcom_error $e) { |
|
51 | 52 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error'); |
52 | 53 | } |
53 | 54 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | { |
28 | 28 | $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid); |
29 | 29 | |
30 | - if ( !($this->_object instanceof midcom_db_topic) |
|
30 | + if (!($this->_object instanceof midcom_db_topic) |
|
31 | 31 | && !($this->_object instanceof midcom_db_article)) { |
32 | 32 | throw new midcom_error_notfound("Moving only topics and articles is supported."); |
33 | 33 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | $folder ??= midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC); |
68 | 68 | |
69 | - if ( $this->_object instanceof midcom_db_topic |
|
69 | + if ($this->_object instanceof midcom_db_topic |
|
70 | 70 | && $folder->up == $this->_object->id) { |
71 | 71 | $tree_disabled = true; |
72 | 72 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $selected = ' checked="checked"'; |
80 | 80 | } |
81 | 81 | |
82 | - if ( !($this->_object instanceof midcom_db_topic) |
|
82 | + if (!($this->_object instanceof midcom_db_topic) |
|
83 | 83 | && $folder->component !== $this->current_folder->component) { |
84 | 84 | // Non-topic objects may only be moved under folders of same component |
85 | 85 | $class = 'wrong_component'; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | $result_cache[$cache_key] = []; |
77 | - $ret =& $result_cache[$cache_key]; |
|
77 | + $ret = & $result_cache[$cache_key]; |
|
78 | 78 | |
79 | 79 | if (empty($up)) { |
80 | 80 | // TODO: use reflection to see what kind of property this is ? |
@@ -149,7 +149,7 @@ |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | $reflector = midcom_helper_reflector::get($linked_object); |
152 | - $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) ."</a>"; |
|
152 | + $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) . "</a>"; |
|
153 | 153 | $data['linked_objects'][$entry->linkGuid] = $link_html; |
154 | 154 | $data['linked_raw_objects'][$entry->linkGuid] = $reflector->get_object_label($linked_object); |
155 | 155 | } |
@@ -142,7 +142,8 @@ |
||
142 | 142 | //create reflector with linked object to get the right label |
143 | 143 | try { |
144 | 144 | $linked_object = midcom::get()->dbfactory->get_object_by_guid($entry->linkGuid); |
145 | - } catch (midcom_error $e) { |
|
145 | + } |
|
146 | + catch (midcom_error $e) { |
|
146 | 147 | unset($data['entries'][$i]); |
147 | 148 | $e->log(); |
148 | 149 | continue; |
@@ -103,7 +103,7 @@ |
||
103 | 103 | foreach ($parameters as $key => $value) { |
104 | 104 | $this->_patterns[] = "/__({$key})__/"; |
105 | 105 | |
106 | - if ( is_array($value) |
|
106 | + if (is_array($value) |
|
107 | 107 | || is_object($value)) { |
108 | 108 | $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/"; |
109 | 109 | } |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | $tmpfile = null; |
342 | 342 | $imagesize = getimagesize($this->_filename); |
343 | 343 | |
344 | - if ( $imagesize[2] == IMAGETYPE_JPEG |
|
344 | + if ($imagesize[2] == IMAGETYPE_JPEG |
|
345 | 345 | && $this->_jpegtran_available()) { |
346 | 346 | /* jpegtran */ |
347 | 347 | $operations = [ |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | $imagesize = getimagesize($this->_filename); |
410 | 410 | |
411 | 411 | // Try lossless jpegtran rotation if possible |
412 | - if ( $imagesize[2] == IMAGETYPE_JPEG |
|
412 | + if ($imagesize[2] == IMAGETYPE_JPEG |
|
413 | 413 | && ($rotate % 90 == 0) |
414 | 414 | && $this->_jpegtran_available()) { |
415 | 415 | $tmpfile = $this->_get_tempfile(); |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | */ |
540 | 540 | public function fill($x = null, $y = null, $color = null, string $gravity = 'center') |
541 | 541 | { |
542 | - if ( empty($x) |
|
542 | + if (empty($x) |
|
543 | 543 | || empty($y) |
544 | 544 | || empty($color)) { |
545 | 545 | //This is a bit silly, but here for backwards compatibility... |
@@ -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; |
@@ -79,7 +79,8 @@ |
||
79 | 79 | if (!array_key_exists($id, $this->_user_cache)) { |
80 | 80 | try { |
81 | 81 | $this->_user_cache[$id] = new midcom_core_user($param); |
82 | - } catch (midcom_error $e) { |
|
82 | + } |
|
83 | + catch (midcom_error $e) { |
|
83 | 84 | // Keep it silent while missing user object can mess here |
84 | 85 | $this->_user_cache[$id] = null; |
85 | 86 | } |
@@ -149,7 +149,7 @@ |
||
149 | 149 | $child_indent = $indent + 20; |
150 | 150 | echo "{$prefix}<tbody class=\"children\">\n"; |
151 | 151 | foreach ($child_types as $type => $children) { |
152 | - if ( count($children) < 10 |
|
152 | + if (count($children) < 10 |
|
153 | 153 | || isset($_GET['show_children'][$object->guid][$type])) { |
154 | 154 | foreach ($children as $child) { |
155 | 155 | $this->show_type($child, $child_indent, "{$prefix} ", false); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | &(published:h); |
29 | 29 | <?php |
30 | 30 | if ($data['linked']) { |
31 | - echo $data['l10n']->get('to') ." <a href=\"{$data['node'][MIDCOM_NAV_ABSOLUTEURL]}\">{$data['node'][MIDCOM_NAV_NAME]}</a>\n"; |
|
31 | + echo $data['l10n']->get('to') . " <a href=\"{$data['node'][MIDCOM_NAV_ABSOLUTEURL]}\">{$data['node'][MIDCOM_NAV_NAME]}</a>\n"; |
|
32 | 32 | } |
33 | 33 | ?> |
34 | 34 | </p> |