@@ -384,7 +384,8 @@ discard block |
||
384 | 384 | $value = $link->value; |
385 | 385 | |
386 | 386 | $tags[$key] = $value; |
387 | - } catch (midcom_error $e) { |
|
387 | + } |
|
388 | + catch (midcom_error $e) { |
|
388 | 389 | $e->log(); |
389 | 390 | } |
390 | 391 | } |
@@ -443,7 +444,8 @@ discard block |
||
443 | 444 | try { |
444 | 445 | $tag = net_nemein_tag_tag_dba::get_cached($link->tag); |
445 | 446 | $link_object_map[$link->fromGuid][$tag->tag] = $link; |
446 | - } catch (midcom_error $e) { |
|
447 | + } |
|
448 | + catch (midcom_error $e) { |
|
447 | 449 | $e->log(); |
448 | 450 | } |
449 | 451 | } |
@@ -472,7 +474,8 @@ discard block |
||
472 | 474 | $tmpobject = midcom::get()->dbfactory->convert_midgard_to_midcom($tmpobject); |
473 | 475 | } |
474 | 476 | $return[] = $tmpobject; |
475 | - } catch (midcom_error $e) { |
|
477 | + } |
|
478 | + catch (midcom_error $e) { |
|
476 | 479 | $e->log(); |
477 | 480 | } |
478 | 481 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | */ |
185 | 185 | public function copy_tags($from, $to) |
186 | 186 | { |
187 | - if ( !is_object($from) |
|
187 | + if (!is_object($from) |
|
188 | 188 | || !is_object($to)) { |
189 | 189 | return false; |
190 | 190 | } |
@@ -488,7 +488,7 @@ discard block |
||
488 | 488 | $strlen = strlen($tags_string); |
489 | 489 | for ($i = 0; $i < $strlen; $i++) { |
490 | 490 | $char = $tags_string[$i]; |
491 | - if ( ( $char == ' ' |
|
491 | + if (($char == ' ' |
|
492 | 492 | && !$quote_open) |
493 | 493 | || $i == $strlen) { |
494 | 494 | $tags[] = $current_tag; |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | $quote_open = false; |
500 | 500 | continue; |
501 | 501 | } |
502 | - if ( $char === '"' |
|
502 | + if ($char === '"' |
|
503 | 503 | || $char === "'") { |
504 | 504 | $quote_open = $char; |
505 | 505 | continue; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | public function _on_creating() |
44 | 44 | { |
45 | - return ( $this->validate_tag($this->tag) |
|
45 | + return ($this->validate_tag($this->tag) |
|
46 | 46 | && $this->_check_duplicates() == 0); |
47 | 47 | } |
48 | 48 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | midcom::get()->uimessages->add(midcom::get()->i18n->get_string('net.nemein.tag', 'net.nemein.tag'), sprintf(midcom::get()->i18n->get_string('tag "%s" is not valid. tags may not be numeric', 'net.nemein.tag'), $tag), 'info'); |
67 | 67 | return false; |
68 | 68 | } |
69 | - if ( strstr($tag, '"') |
|
69 | + if (strstr($tag, '"') |
|
70 | 70 | || strstr($tag, "'")) { |
71 | 71 | midcom::get()->uimessages->add(midcom::get()->i18n->get_string('net.nemein.tag', 'net.nemein.tag'), sprintf(midcom::get()->i18n->get_string('tag "%s" is not valid. tags may not contain quotes', 'net.nemein.tag'), $tag), 'info'); |
72 | 72 | return false; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | public function _on_updating() |
79 | 79 | { |
80 | - return ( $this->validate_tag($this->tag) |
|
80 | + return ($this->validate_tag($this->tag) |
|
81 | 81 | && $this->_check_duplicates() == 0); |
82 | 82 | } |
83 | 83 |
@@ -4,7 +4,7 @@ |
||
4 | 4 | <h1>Merge tags</h1> |
5 | 5 | |
6 | 6 | <?php |
7 | -if ( isset($_POST['from']) |
|
7 | +if (isset($_POST['from']) |
|
8 | 8 | && isset($_POST['to'])) { |
9 | 9 | if (net_nemein_tag_handler::merge_tags($_POST['from'], $_POST['to'])) { |
10 | 10 | echo "<p>Successfully merged tag \"{$_POST['from']}\" to \"{$_POST['to']}\"</p>\n"; |
@@ -152,7 +152,8 @@ |
||
152 | 152 | try { |
153 | 153 | $topic = new midcom_db_topic($id); |
154 | 154 | $id = $topic->id; |
155 | - } catch (midcom_error $e) { |
|
155 | + } |
|
156 | + catch (midcom_error $e) { |
|
156 | 157 | $e->log(); |
157 | 158 | break; |
158 | 159 | } |
@@ -19,8 +19,8 @@ |
||
19 | 19 | public function _on_initialize() |
20 | 20 | { |
21 | 21 | // Match / |
22 | - if ( $this->_config->get('redirection_type') === null |
|
23 | - || ( $this->_topic->can_do('net.nemein.redirector:noredirect') |
|
22 | + if ($this->_config->get('redirection_type') === null |
|
23 | + || ($this->_topic->can_do('net.nemein.redirector:noredirect') |
|
24 | 24 | && !$this->_config->get('admin_redirection'))) { |
25 | 25 | $this->_request_switch['redirect'] = [ |
26 | 26 | 'handler' => [net_nemein_redirector_handler_tinyurl::class, 'list'], |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object) |
43 | 43 | { |
44 | - if ( $object instanceof midcom_db_article |
|
44 | + if ($object instanceof midcom_db_article |
|
45 | 45 | && $topic->id == $object->topic) { |
46 | 46 | if ($object->name == 'index') { |
47 | 47 | return ''; |
@@ -30,7 +30,8 @@ |
||
30 | 30 | foreach ($result as $wikipage) { |
31 | 31 | try { |
32 | 32 | $datamanager->set_storage($wikipage); |
33 | - } catch (midcom_error $e) { |
|
33 | + } |
|
34 | + catch (midcom_error $e) { |
|
34 | 35 | $e->log(MIDCOM_LOG_WARN); |
35 | 36 | continue; |
36 | 37 | } |
@@ -66,7 +66,8 @@ |
||
66 | 66 | try { |
67 | 67 | $author = new midcom_db_person($wikipage->metadata->revisor); |
68 | 68 | $item->author = $author->name; |
69 | - } catch (midcom_error $e) { |
|
69 | + } |
|
70 | + catch (midcom_error $e) { |
|
70 | 71 | $e->log(); |
71 | 72 | } |
72 | 73 |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | return; |
51 | 51 | } |
52 | 52 | |
53 | - if ( $history['date'] < $from |
|
53 | + if ($history['date'] < $from |
|
54 | 54 | || $history['date'] > $to) { |
55 | 55 | // We can ignore revisions outside the timeframe |
56 | 56 | continue; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $this->_seek_updated($from); |
94 | 94 | |
95 | 95 | $i = 0; |
96 | - while ( $this->_updated_pages < $this->_max_pages |
|
96 | + while ($this->_updated_pages < $this->_max_pages |
|
97 | 97 | && $i < 20) { |
98 | 98 | // Expand seek by another two weeks |
99 | 99 | $to = $from; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | public function _on_creating() |
31 | 31 | { |
32 | - if ( $this->title == '' |
|
32 | + if ($this->title == '' |
|
33 | 33 | || !$this->topic) { |
34 | 34 | // We must have wikiword and topic at this stage |
35 | 35 | return false; |
@@ -193,7 +193,8 @@ |
||
193 | 193 | |
194 | 194 | try { |
195 | 195 | $diff_fields = $rcs_handler->get_diff($prev_version, $this_version); |
196 | - } catch (midcom_error $e) { |
|
196 | + } |
|
197 | + catch (midcom_error $e) { |
|
197 | 198 | $e->log(); |
198 | 199 | return ''; |
199 | 200 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | public function get_link($key = 0, $rel = 'alternate') |
62 | 62 | { |
63 | 63 | $link = parent::get_link($key, $rel); |
64 | - if ( $rel !== 'alternate' |
|
64 | + if ($rel !== 'alternate' |
|
65 | 65 | || $key !== 0) { |
66 | 66 | return $link; |
67 | 67 | } |