Completed
Push — master ( 309357...7ad46f )
by Andreas
18:00
created
lib/midcom/cron/purgedeleted.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
     {
31 31
         $classes = [];
32 32
         foreach (midcom_connection::get_schema_types() as $mgdschema) {
33
-            if (   substr($mgdschema, 0, 2) == '__'
33
+            if (substr($mgdschema, 0, 2) == '__'
34 34
                 || !midgard_reflector_object::has_metadata_class($mgdschema)) {
35 35
                 continue;
36 36
             }
Please login to merge, or discard this patch.
lib/midcom/core/dbaproxy.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,8 @@
 block discarded – undo
62 62
         try {
63 63
             $this->__object = call_user_func([$this->__midcom_class_name__, 'get_cached'], $this->__identifier);
64 64
             return true;
65
-        } catch (midcom_error $e) {
65
+        }
66
+        catch (midcom_error $e) {
66 67
             $e->log();
67 68
         }
68 69
         return false;
Please login to merge, or discard this patch.
lib/midcom/helper/reflector/copy.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
         }
309 309
 
310 310
         // Override requested root object properties
311
-        if (   !empty($this->target->guid)
311
+        if (!empty($this->target->guid)
312 312
             && $target->guid === $this->target->guid) {
313 313
             foreach ($this->root_object_values as $name => $value) {
314 314
                 $target->$name = $value;
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
         // Store for later use - if ever needed
354 354
         $this->new_objects[] = $target;
355 355
 
356
-        if (   !$this->_copy_data('parameters', $source, $target)
356
+        if (!$this->_copy_data('parameters', $source, $target)
357 357
             || !$this->_copy_data('metadata', $source, $target)
358 358
             || !$this->_copy_data('attachments', $source, $target)
359 359
             || !$this->_copy_data('privileges', $source, $target)) {
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
     private function _copy_data($type, $source, &$target)
375 375
     {
376 376
         $method = 'copy_' . $type;
377
-        if (   !$this->$method($source, $target)
377
+        if (!$this->$method($source, $target)
378 378
             && $this->halt_on_errors) {
379 379
             $this->errors[] = $this->_l10n->get('failed to copy ' . $type);
380 380
             return false;
@@ -515,8 +515,8 @@  discard block
 block discarded – undo
515 515
     public static function copy_object_tree($source, $parent, $exclude = [], $copy_parameters = true, $copy_metadata = true, $copy_attachments = true)
516 516
     {
517 517
         $copy = new midcom_helper_reflector_copy();
518
-        $copy->source =& $source;
519
-        $copy->target =& $parent;
518
+        $copy->source = & $source;
519
+        $copy->target = & $parent;
520 520
         $copy->copy_parameters = $copy_parameters;
521 521
         $copy->copy_metadata = $copy_metadata;
522 522
         $copy->copy_attachments = $copy_attachments;
Please login to merge, or discard this patch.
lib/midcom/helper/reflector/tree.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
     private static function _check_permissions($deleted)
159 159
     {
160 160
         // PONDER: Check for some generic user privilege instead  ??
161
-        if (   $deleted
161
+        if ($deleted
162 162
             && !midcom_connection::is_admin()
163 163
             && !midcom::get()->auth->is_component_sudo()) {
164 164
             debug_add('Non-admins are not allowed to list deleted objects', MIDCOM_LOG_ERROR);
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
                     'target' => $ref->get_link_target($field)
249 249
                 ];
250 250
                 $linked_class = $ref->get_link_name($field);
251
-                if (   empty($linked_class)
251
+                if (empty($linked_class)
252 252
                     && $info['type'] === MGD_TYPE_GUID) {
253 253
                     // Guid link without class specification, valid for all classes
254 254
                     if (empty($info['target'])) {
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
             $field_type = $field_data['type'];
299 299
             $field = $field_data['name'];
300 300
 
301
-            if (   !$field_target
301
+            if (!$field_target
302 302
                 || !isset($for_object->$field_target)) {
303 303
                 // Why return false ???
304 304
                 return false;
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
             $parent_property = midgard_object_class::get_property_parent($schema_type);
415 415
             $up_property = midgard_object_class::get_property_up($schema_type);
416 416
 
417
-            if (   !$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
417
+            if (!$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
418 418
                 && !$this->_resolve_child_classes_links_back($up_property, $schema_type, $this->mgdschema_class)) {
419 419
                 continue;
420 420
             }
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 
440 440
         $ref = new midgard_reflection_property($prospect_type);
441 441
         $link_class = $ref->get_link_name($property);
442
-        if (   empty($link_class)
442
+        if (empty($link_class)
443 443
             && $ref->get_midgard_type($property) === MGD_TYPE_GUID) {
444 444
             return true;
445 445
         }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -553,7 +553,8 @@
 block discarded – undo
553 553
         $tree = [];
554 554
         try {
555 555
             $children = self::get_child_objects($parent);
556
-        } catch (midcom_error $e) {
556
+        }
557
+        catch (midcom_error $e) {
557 558
             return $tree;
558 559
         }
559 560
 
Please login to merge, or discard this patch.
lib/midcom/helper/misc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
             return $data;
253 253
         }
254 254
 
255
-        $preg='/s:([0-9]+):"(.*?)";/ms';
255
+        $preg = '/s:([0-9]+):"(.*?)";/ms';
256 256
         preg_match_all($preg, $data, $matches);
257 257
         $cache = [];
258 258
 
@@ -348,13 +348,13 @@  discard block
 block discarded – undo
348 348
             $theme_path = implode('/', $path_array);
349 349
             $candidates = [];
350 350
             if ($substyle) {
351
-                $candidates[] =  $theme_root . $theme_path .  "/style/{$substyle}/{$element_name}.php";
351
+                $candidates[] = $theme_root . $theme_path . "/style/{$substyle}/{$element_name}.php";
352 352
             }
353 353
             if ($page) {
354
-                $candidates[] =  $theme_root . $theme_path .  "/style{$page}/{$element_name}.php";
354
+                $candidates[] = $theme_root . $theme_path . "/style{$page}/{$element_name}.php";
355 355
             }
356 356
 
357
-            $candidates[] = $theme_root . $theme_path .  "/style/{$element_name}.php";
357
+            $candidates[] = $theme_root . $theme_path . "/style/{$element_name}.php";
358 358
 
359 359
             foreach (array_filter($candidates, 'file_exists') as $candidate) {
360 360
                 return file_get_contents($candidate);
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/invoices/status.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     {
86 86
         $entries = array_merge($this->get_status_entries(), $this->get_journal_entries());
87 87
 
88
-        usort($entries, function ($a, $b) {
88
+        usort($entries, function($a, $b) {
89 89
             if ($a['timestamp'] == $b['timestamp']) {
90 90
                 if ($a['order'] == $b['order']) {
91 91
                     return 0;
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
                 'order' => 3
123 123
             ];
124 124
         }
125
-        if (   $this->invoice->due
126
-            && (   (   $this->invoice->due < time()
125
+        if ($this->invoice->due
126
+            && (($this->invoice->due < time()
127 127
                     && $this->invoice->paid == 0)
128 128
                 || $this->invoice->due < $this->invoice->paid)) {
129 129
             $entries[] = [
Please login to merge, or discard this patch.
lib/org/openpsa/products/product/group.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
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 ?
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
94 94
             $value_properties[] = $keyproperty;
95 95
         }
96 96
         foreach ($label_fields as $fieldname) {
97
-            if (   $fieldname != 'id'
97
+            if ($fieldname != 'id'
98 98
                 && $fieldname != $keyproperty) {
99 99
                 $value_properties[] = $fieldname;
100 100
                 continue;
101 101
             }
102 102
         }
103 103
 
104
-        $mc = org_openpsa_products_product_group_dba::new_collector('up', (int)$up);
104
+        $mc = org_openpsa_products_product_group_dba::new_collector('up', (int) $up);
105 105
         if ($order_by_score) {
106 106
             $mc->add_order('metadata.score', 'DESC');
107 107
         }
Please login to merge, or discard this patch.