Test Failed
Branch master (8d1702)
by Andreas
11:03
created
lib/midcom/db/member.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@  discard block
 block discarded – undo
23 23
         try {
24 24
             $person = new midcom_db_person($this->uid);
25 25
             $grp = new midcom_db_group($this->gid);
26
-        } catch (midcom_error $e) {
26
+        }
27
+        catch (midcom_error $e) {
27 28
             $e->log();
28 29
             return 'Invalid membership record';
29 30
         }
@@ -40,7 +41,8 @@  discard block
 block discarded – undo
40 41
         }
41 42
         try {
42 43
             $person = new midcom_db_person($this->uid);
43
-        } catch (midcom_error $e) {
44
+        }
45
+        catch (midcom_error $e) {
44 46
             return;
45 47
         }
46 48
         midcom::get()->cache->invalidate($person->guid);
Please login to merge, or discard this patch.
lib/midcom/db/person.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
     {
79 79
         parent::__set($property, $value);
80 80
 
81
-        if (   $property == 'firstname'
81
+        if ($property == 'firstname'
82 82
             || $property == 'lastname'
83 83
             || $property == 'homepage'
84 84
             || $property == 'email') {
Please login to merge, or discard this patch.
lib/midcom/helper/toolbar.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -364,10 +364,10 @@  discard block
 block discarded – undo
364 364
             }
365 365
         }
366 366
 
367
-        if (   !empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
367
+        if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
368 368
             && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) {
369 369
             // We have valid access key, add it to help text
370
-            if (   isset($_SERVER['HTTP_USER_AGENT'])
370
+            if (isset($_SERVER['HTTP_USER_AGENT'])
371 371
                 && strstr($_SERVER['HTTP_USER_AGENT'], 'Macintosh')) {
372 372
                 // Mac users
373 373
                 $hotkey = 'Ctrl-' . strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
     private function set_url(array &$item, $url)
391 391
     {
392 392
         $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url;
393
-        if (   (   empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
393
+        if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
394 394
                 // Some items may want to keep their links unmutilated
395 395
                 || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink")
396 396
             && substr($url, 0, 1) != '/'
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
         if ($index == 0) {
417 417
             array_shift($this->items);
418
-        } elseif ($index == count($this->items) -1) {
418
+        } elseif ($index == count($this->items) - 1) {
419 419
             array_pop($this->items);
420 420
         } else {
421 421
             $this->items = array_merge(array_slice($this->items, 0, $index - 1),
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
      */
546 546
     public function render()
547 547
     {
548
-        $visible_items = array_filter($this->items, function ($item) {
548
+        $visible_items = array_filter($this->items, function($item) {
549 549
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
550 550
         });
551 551
 
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
         foreach ($visible_items as $i => $item) {
571 571
             $output .= '<li class="';
572 572
             if ($i == 0) {
573
-                $output .= $first_class .  ' ';
573
+                $output .= $first_class . ' ';
574 574
             } elseif ($i == $last) {
575 575
                 $output .= 'last_item ';
576 576
             }
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
             // Try finding uppercase version of the accesskey first
611 611
             $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
612 612
             $position = strpos($label, $accesskey);
613
-            if (   $position === false
613
+            if ($position === false
614 614
                 && midcom::get()->i18n->get_current_language() == 'en') {
615 615
                 // Try lowercase, too
616 616
                 $accesskey = strtolower($accesskey);
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
672 672
         }
673 673
 
674
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
674
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
675 675
             && !is_null($item[MIDCOM_TOOLBAR_ACCESSKEY])) {
676 676
             $attributes['class'] = 'accesskey';
677 677
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
     public function get_index_from_url($url)
738 738
     {
739 739
         foreach ($this->items as $i => $item) {
740
-            if (   $item[MIDCOM_TOOLBAR_URL] == $url
740
+            if ($item[MIDCOM_TOOLBAR_URL] == $url
741 741
                 || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) {
742 742
                 return $i;
743 743
             }
Please login to merge, or discard this patch.
lib/midcom/helper/imagefilter.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
             debug_add("The File {$filename} is not writeable.", MIDCOM_LOG_ERROR);
194 194
             return false;
195 195
         }
196
-        if (   !empty($this->_filename)
196
+        if (!empty($this->_filename)
197 197
             && $this->_filename !== $filename) {
198 198
             $this->_tmpfiles[] = $this->_filename;
199 199
         }
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
         $tmpfile = null;
419 419
         $imagesize = getimagesize($this->_filename);
420 420
 
421
-        if (   $imagesize[2] == IMAGETYPE_JPEG
421
+        if ($imagesize[2] == IMAGETYPE_JPEG
422 422
             && $this->_jpegtran_available()) {
423 423
             /* jpegtran */
424 424
             $operations = array(
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
         while ($rotate > 360) {
478 478
             $rotate -= 360;
479 479
         }
480
-        if (   $rotate == 0
480
+        if ($rotate == 0
481 481
             || $rotate == 360) {
482 482
             debug_add("Rotate is {$rotate}, we're happy as-is.");
483 483
             return;
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
         $imagesize = getimagesize($this->_filename);
488 488
 
489 489
         // Try lossless jpegtran rotation if possible
490
-        if (   $imagesize[2] == IMAGETYPE_JPEG
490
+        if ($imagesize[2] == IMAGETYPE_JPEG
491 491
             && ($rotate % 90 == 0)
492 492
             && $this->_jpegtran_available()) {
493 493
             $tmpfile = $this->_get_tempfile();
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
      */
617 617
     public function fill($x = null, $y = null, $color = null, $gravity = 'center')
618 618
     {
619
-        if (   empty($x)
619
+        if (empty($x)
620 620
             || empty($y)
621 621
             || empty($color)) {
622 622
             //This is a bit silly, but here for backwards compatibility...
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -380,7 +380,8 @@  discard block
 block discarded – undo
380 380
         try {
381 381
             $cmd = midcom::get()->config->get('utility_imagemagick_base') . "identify " . escapeshellarg($filename);
382 382
             $this->_run_command($cmd);
383
-        } catch (midcom_error $e) {
383
+        }
384
+        catch (midcom_error $e) {
384 385
             return false;
385 386
         }
386 387
         return true;
@@ -406,7 +407,8 @@  discard block
 block discarded – undo
406 407
                 debug_add("EXIF information missing or without orientation tag. Skipping.", MIDCOM_LOG_INFO);
407 408
                 return;
408 409
             }
409
-        } catch (Exception $e) {
410
+        }
411
+        catch (Exception $e) {
410 412
             debug_add("Could not read EXIF data: " . $e->getMessage() . ", skipping.", MIDCOM_LOG_WARN);
411 413
             return;
412 414
         }
Please login to merge, or discard this patch.
lib/midcom/helper/xsspreventer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     {
38 38
         return preg_replace_callback(
39 39
             "%(<\s*)+(/\s*)+{$element}%i",
40
-            function ($matches) {
40
+            function($matches) {
41 41
                 return htmlentities($matches[0]);
42 42
             },
43 43
             $input
Please login to merge, or discard this patch.
lib/midcom/helper/nav/main.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
         if ($uplink == $root_id) {
223 223
             return true;
224 224
         }
225
-        if (   $uplink == false
225
+        if ($uplink == false
226 226
             || $uplink == -1) {
227 227
             return false;
228 228
         }
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
                     $entry = "<span class=\"{$current_class}\">{$entry}</span>";
447 447
                 }
448 448
             } else {
449
-                if (   !empty($data['napobject'][MIDCOM_NAV_GUID])
449
+                if (!empty($data['napobject'][MIDCOM_NAV_GUID])
450 450
                     && in_array($data['napobject'][MIDCOM_NAV_GUID], $skip_guids)) {
451 451
                     continue;
452 452
                 }
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
                     $id = "custom-{$key}";
570 570
 
571 571
                     $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}";
572
-                    if (   substr($entry[MIDCOM_NAV_URL], 0, 1) == '/'
572
+                    if (substr($entry[MIDCOM_NAV_URL], 0, 1) == '/'
573 573
                         || preg_match('|^https?://|', $entry[MIDCOM_NAV_URL])) {
574 574
                         $url = $entry[MIDCOM_NAV_URL];
575 575
                     }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,8 @@
 block discarded – undo
296 296
         // the tree. This is, for example, used by the on-delete cache invalidation.
297 297
         try {
298 298
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
299
-        } catch (midcom_error $e) {
299
+        }
300
+        catch (midcom_error $e) {
300 301
             debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN);
301 302
         }
302 303
         if (!empty($object)) {
Please login to merge, or discard this patch.
lib/midcom/helper/formatter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
             $variable = $parts[0] . '->' . $parts[1];
85 85
         }
86 86
 
87
-        if (    isset($variable_parts[1])
87
+        if (isset($variable_parts[1])
88 88
              && array_key_exists($variable_parts[1], self::$_filters)) {
89 89
             switch ($variable_parts[1]) {
90 90
                 case 's':
Please login to merge, or discard this patch.
lib/midcom/helper/datamanager2/controller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
             }
121 121
         }
122 122
 
123
-        $this->schemadb =& $schemadb;
123
+        $this->schemadb = & $schemadb;
124 124
     }
125 125
 
126 126
     /**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 
144 144
         if ($storage instanceof midcom_helper_datamanager2_datamanager) {
145 145
             $this->datamanager = $storage;
146
-        } elseif (   $storage instanceof midcom_helper_datamanager2_storage
146
+        } elseif ($storage instanceof midcom_helper_datamanager2_storage
147 147
                  || midcom::get()->dbclassloader->is_midcom_db_object($storage)) {
148 148
             $this->datamanager = new midcom_helper_datamanager2_datamanager($this->schemadb);
149 149
             if ($schema === null) {
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     function display_form()
204 204
     {
205 205
         // Prevent temporary objects from failing
206
-        if (   $this->lock_object
206
+        if ($this->lock_object
207 207
             && !empty($this->datamanager->storage->object->guid)) {
208 208
             // Get the metadata object
209 209
             $metadata = $this->datamanager->storage->object->metadata;
Please login to merge, or discard this patch.
lib/midcom/helper/datamanager2/controller/simple.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
         $metadata = $this->datamanager->storage->object->metadata;
82 82
 
83
-        if (    $metadata
83
+        if ($metadata
84 84
              && array_key_exists('midcom_helper_datamanager2_unlock', $_REQUEST)
85 85
              && isset($_REQUEST['midcom_helper_datamanager2_object'])) {
86 86
             // Remove the lock, if permission is granted
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 
103 103
         if ($metadata) {
104 104
             // Remove the lock
105
-            if (   $this->lock_timeout
106
-                && (   $result === 'save'
105
+            if ($this->lock_timeout
106
+                && ($result === 'save'
107 107
                     || $result === 'cancel')) {
108 108
                 $metadata->unlock();
109 109
             }
110 110
             // or set it, if needed
111
-            elseif (   $this->lock_object
111
+            elseif ($this->lock_object
112 112
                     && !$metadata->is_locked()
113 113
                     && $this->lock_timeout) {
114 114
                 $metadata->lock();
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
         }
117 117
 
118 118
         // Handle successful save explicitly.
119
-        if (   $result == 'save'
119
+        if ($result == 'save'
120 120
             || $result == 'next') {
121 121
             // Ok, we can save now. At this point we already have a content object.
122 122
             $result = $this->_save_form($result);
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
             return 'edit';
154 154
         }
155 155
 
156
-        if (   $result == 'save'
156
+        if ($result == 'save'
157 157
             && !$this->datamanager->save()) {
158 158
             if (count($this->datamanager->validation_errors) == 0) {
159 159
                 // It seems to be a critical error.
Please login to merge, or discard this patch.