Completed
Branch master (4f76a2)
by Andreas
22:32
created
web/rootfile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
     include dirname(__DIR__) . '/config-default.inc.php';
24 24
 }
25 25
 
26
-if (! defined('MIDCOM_STATIC_URL')) {
26
+if (!defined('MIDCOM_STATIC_URL')) {
27 27
     define('MIDCOM_STATIC_URL', '/midcom-static');
28 28
 }
29 29
 
Please login to merge, or discard this patch.
lib/midcom/core/query.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
     protected function _add_visibility_checks()
130 130
     {
131
-        if (   $this->hide_invisible
131
+        if ($this->hide_invisible
132 132
             && !$this->_visibility_checks_added) {
133 133
             if (!midcom::get()->config->get('show_hidden_objects')) {
134 134
                 $this->add_constraint('metadata.hidden', '=', false);
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
         // Deal with empty arrays, which would produce invalid queries
195 195
         // This is done here to avoid repetitive code in callers, and because
196 196
         // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true
197
-        if (   is_array($value)
197
+        if (is_array($value)
198 198
             && empty($value)) {
199 199
             if ($operator == 'NOT IN') {
200 200
                 return true;
Please login to merge, or discard this patch.
lib/midcom/core/querybuilder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
         $this->_add_visibility_checks();
107 107
 
108
-        if (   empty($this->_limit)
108
+        if (empty($this->_limit)
109 109
             && empty($this->_offset)) {
110 110
             // No point to do windowing
111 111
             $newresult = $this->_execute_and_check_privileges();
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
         }
151 151
         $this->_query->set_limit($window_size);
152 152
 
153
-        while (    ($resultset = $this->_execute_and_check_privileges())
153
+        while (($resultset = $this->_execute_and_check_privileges())
154 154
                 || $this->denied > $denied) {
155 155
             $size = count($resultset);
156 156
             $total_size = $size + ($this->denied - $denied);
Please login to merge, or discard this patch.
lib/net/nehmer/blog/navigation.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
         // Hide the articles that have the publish time in the future and if
43 43
         // the user is not administrator
44
-        if (   $this->_config->get('enable_scheduled_publishing')
44
+        if ($this->_config->get('enable_scheduled_publishing')
45 45
             && !midcom::get()->auth->admin) {
46 46
             // Show the article only if the publishing time has passed or the viewer
47 47
             // is the author
@@ -83,14 +83,14 @@  discard block
 block discarded – undo
83 83
 
84 84
     private function _add_pseudo_leaves(array &$leaves)
85 85
     {
86
-        if (   $this->_config->get('archive_enable')
86
+        if ($this->_config->get('archive_enable')
87 87
             && $this->_config->get('archive_in_navigation')) {
88 88
             $leaves["{$this->_topic->id}_ARCHIVE"] = [
89 89
                 MIDCOM_NAV_URL => "archive/",
90 90
                 MIDCOM_NAV_NAME => $this->_l10n->get('archive'),
91 91
             ];
92 92
         }
93
-        if (   $this->_config->get('rss_enable')
93
+        if ($this->_config->get('rss_enable')
94 94
             && $this->_config->get('feeds_in_navigation')) {
95 95
             $leaves[self::LEAFID_FEEDS] = [
96 96
                 MIDCOM_NAV_URL => "feeds/",
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             ];
99 99
         }
100 100
 
101
-        if (   $this->_config->get('categories_in_navigation')
101
+        if ($this->_config->get('categories_in_navigation')
102 102
             && $this->_config->get('categories') != '') {
103 103
             $categories = explode(',', $this->_config->get('categories'));
104 104
             foreach ($categories as $category) {
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
             }
110 110
         }
111 111
 
112
-        if (   $this->_config->get('archive_years_in_navigation')
112
+        if ($this->_config->get('archive_years_in_navigation')
113 113
             && $this->_config->get('archive_years_enable')) {
114 114
             $qb = midcom_db_article::new_query_builder();
115 115
             $qb->add_constraint('topic', '=', $this->_topic->id);
116 116
 
117 117
             // Hide the articles that have the publish time in the future and if
118 118
             // the user is not administrator
119
-            if (   $this->_config->get('enable_scheduled_publishing')
119
+            if ($this->_config->get('enable_scheduled_publishing')
120 120
                 && !midcom::get()->auth->admin) {
121 121
                 // Show the article only if the publishing time has passed or the viewer
122 122
                 // is the author
Please login to merge, or discard this patch.
lib/net/nehmer/static/viewer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
             }
74 74
         }
75 75
 
76
-        if (   $this->_topic->can_do('midgard:update')
76
+        if ($this->_topic->can_do('midgard:update')
77 77
             && $this->_topic->can_do('midcom:component_config')) {
78 78
             $buttons[] = $workflow->get_button('config/', [
79 79
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
Please login to merge, or discard this patch.
lib/midcom/helper/toolbar/view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
             ]);
55 55
         }
56 56
 
57
-        if (   midcom::get()->config->get('midcom_services_rcs_enable')
57
+        if (midcom::get()->config->get('midcom_services_rcs_enable')
58 58
             && $object->can_do('midgard:update')
59 59
             && $object->_use_rcs) {
60 60
             $buttons[] = [
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
             }
85 85
 
86 86
             $icon = 'stock-icons/16x16/page-' . $icontype . '.png';
87
-            if (   !midcom::get()->config->get('show_hidden_objects')
87
+            if (!midcom::get()->config->get('show_hidden_objects')
88 88
                 && !$object->metadata->is_visible()) {
89 89
                 // Take scheduling into account
90 90
                 $icon = 'stock-icons/16x16/page-' . $icontype . '-notpublished.png';
Please login to merge, or discard this patch.
lib/fi/protie/navigation/main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
         $classes = [];
339 339
 
340 340
         if ($child[MIDCOM_NAV_TYPE] === 'node') {
341
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
342
-                && (   !$this->_nap->get_current_leaf()
341
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
342
+                && (!$this->_nap->get_current_leaf()
343 343
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf()))) {
344 344
                 $classes[] = $this->css_active;
345 345
             }
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
         }
387 387
 
388 388
         // Add information about the object's status
389
-        if (   $this->object_status_to_class
389
+        if ($this->object_status_to_class
390 390
             && isset($item[MIDCOM_NAV_OBJECT])
391 391
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT])) {
392 392
             $classes[] = $css_status_class;
@@ -405,12 +405,12 @@  discard block
 block discarded – undo
405 405
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}\"{$link_class}>{$item[MIDCOM_NAV_NAME]}</a>";
406 406
         // If either of the follow nodes switches is on, follow all the nodes
407 407
 
408
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
408
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
409 409
             && !$this->show_only_current
410
-            && (   $this->list_levels === 0
410
+            && ($this->list_levels === 0
411 411
                 || $this->_level < $this->list_levels)) {
412
-            if (   $this->follow_all
413
-                || (   $this->follow_selected
412
+            if ($this->follow_all
413
+                || ($this->follow_selected
414 414
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true))) {
415 415
                 $this->_level++;
416 416
                 $this->_list_child_elements($item[MIDCOM_NAV_ID]);
Please login to merge, or discard this patch.
lib/org/openpsa/slideshow/image.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
         $rows = $mc->get_rows(['id', 'name', 'guid'], 'id');
151 151
 
152 152
         foreach ($images as $image) {
153
-            if (   !isset($rows[$image->attachment])
153
+            if (!isset($rows[$image->attachment])
154 154
                 || !isset($rows[$image->image])
155 155
                 || !isset($rows[$image->thumbnail])) {
156 156
                 continue;
Please login to merge, or discard this patch.
lib/net/nemein/rss/handler/admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
         }
83 83
 
84 84
         // OPML subscription list import support
85
-        if (   array_key_exists('net_nemein_rss_manage_opml', $_FILES)
85
+        if (array_key_exists('net_nemein_rss_manage_opml', $_FILES)
86 86
             && is_uploaded_file($_FILES['net_nemein_rss_manage_opml']['tmp_name'])) {
87 87
             $opml_file = $_FILES['net_nemein_rss_manage_opml']['tmp_name'];
88 88
 
Please login to merge, or discard this patch.