Passed
Push — master ( dc3f28...9cb9a1 )
by Andreas
16:51
created
lib/midcom/services/auth/acl.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -568,10 +568,10 @@
 block discarded – undo
568 568
         }
569 569
 
570 570
         //owner privileges override everything but person privileges, so we have to cross-check those here
571
-        if (   $privilegename != 'midgard:owner'
571
+        if ($privilegename != 'midgard:owner'
572 572
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
573 573
             $owner_privileges = $this->get_owner_default_privileges();
574
-            if (    array_key_exists($privilegename, $owner_privileges)
574
+            if (array_key_exists($privilegename, $owner_privileges)
575 575
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
576 576
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
577 577
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -253,15 +253,15 @@
 block discarded – undo
253 253
     private static array $_default_magic_class_privileges = [];
254 254
 
255 255
     /**
256
-    * Internal cache of the content privileges of users on content objects, this is
257
-    * an associative array using a combination of the user identifier and the object's
258
-    * guid as index. The privileges for the anonymous user use the magic
259
-    * EVERYONE as user identifier.
260
-    *
261
-    * This must not be merged with the class-wide privileges_cache, because otherwise
262
-    * class_default_privileges for child objects might be overridden by parent default
263
-    * privileges
264
-    */
256
+     * Internal cache of the content privileges of users on content objects, this is
257
+     * an associative array using a combination of the user identifier and the object's
258
+     * guid as index. The privileges for the anonymous user use the magic
259
+     * EVERYONE as user identifier.
260
+     *
261
+     * This must not be merged with the class-wide privileges_cache, because otherwise
262
+     * class_default_privileges for child objects might be overridden by parent default
263
+     * privileges
264
+     */
265 265
     private static array $_content_privileges_cache = [];
266 266
 
267 267
     /**
Please login to merge, or discard this patch.
lib/midcom/services/rcs/backend/rcs.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,9 +50,11 @@
 block discarded – undo
50 50
         $filepath = $this->generate_filename();
51 51
         try {
52 52
             $this->exec('co -q -f -r' . escapeshellarg(trim($revision)) . " {$filepath} 2>/dev/null");
53
-        } catch (midcom_error $e) {
53
+        }
54
+        catch (midcom_error $e) {
54 55
             $e->log();
55
-        } finally {
56
+        }
57
+        finally {
56 58
             if (!file_exists($filepath)) {
57 59
                 return [];
58 60
             }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
                 $revisions[$history['revision']] = $history;
92 92
 
93 93
                 $i += 3;
94
-                while (   $i < $total
94
+                while ($i < $total
95 95
                         && !str_starts_with($lines[$i], '----')
96 96
                         && !str_starts_with($lines[$i], '=====')) {
97 97
                     $i++;
Please login to merge, or discard this patch.
lib/midcom/helper/misc.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,8 @@
 block discarded – undo
55 55
     {
56 56
         try {
57 57
             return eval("return [{$data}\n];");
58
-        } catch (ParseError $e) {
58
+        }
59
+        catch (ParseError $e) {
59 60
             throw new midcom_error('Failed to parse config data: ' . $e->getMessage() . ' in ' . $path . ' line ' . $e->getLine());
60 61
         }
61 62
     }
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/type/captchaType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,11 +43,11 @@
 block discarded – undo
43 43
     public function buildForm(FormBuilderInterface $builder, array $options)
44 44
     {
45 45
         $session_key = md5($builder->getForm()->getName() . '_session_key');
46
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($session_key) {
46
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($session_key) {
47 47
             $value = $event->getForm()->getData();
48 48
             $session = new midcom_services_session('midcom_datamanager_captcha');
49 49
 
50
-            if (   !$session->exists($session_key)
50
+            if (!$session->exists($session_key)
51 51
                 || $value != $session->get($session_key)) {
52 52
                 $event->getForm()->addError(new FormError($this->l10n->get('captcha validation failed')));
53 53
             }
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/formExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
         $view->vars['readonly'] = $options['readonly'];
66 66
 
67 67
         if ($options['write_privilege'] !== null) {
68
-            if (   array_key_exists('group', $options['write_privilege'])
68
+            if (array_key_exists('group', $options['write_privilege'])
69 69
                 && !$this->auth->is_group_member($options['write_privilege']['group'])) {
70 70
                 $view->vars['readonly'] = true;
71 71
             }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/handler/search.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
         // Handle automatic wildcards
84 84
         $auto_wildcards = $this->_config->get('auto_wildcards');
85
-        if (   $auto_wildcards
85
+        if ($auto_wildcards
86 86
             && !str_contains($this->_query_string_processed, '%')) {
87 87
             switch ($auto_wildcards) {
88 88
                 case 'both':
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/support/bounce_detector.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 }
46 46
 $recipient = $_ENV["RECIPIENT"];
47 47
 $token_length = strlen($recipient) - strlen($prefix) - strlen($suffix);
48
-if (   $token_length <= 0
48
+if ($token_length <= 0
49 49
     || !str_starts_with($recipient, $prefix)
50 50
     || !str_ends_with($recipient, $suffix)) {
51 51
     error_log("Recipient address does not match address template: $recipient");
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         fclose($fh);
62 62
         exit(0);
63 63
     }
64
-} elseif (   str_starts_with($BOUNCE_LOGGER, "http://")
64
+} elseif (str_starts_with($BOUNCE_LOGGER, "http://")
65 65
           || str_starts_with($BOUNCE_LOGGER, "https://")) {
66 66
     $client = new org_openpsa_httplib();
67 67
     $client->post($BOUNCE_LOGGER, ["token" => $token]);
Please login to merge, or discard this patch.
src/midcom/routing/parser.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $url = $this->context->get_key(MIDCOM_CONTEXT_URI);
47 47
 
48 48
         $prefix_length = strlen(midcom_connection::get_url('prefix'));
49
-        if (   $prefix_length > 1
49
+        if ($prefix_length > 1
50 50
             && str_starts_with($url, midcom_connection::get_url('prefix'))) {
51 51
             $url = substr($url, $prefix_length);
52 52
         }
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
      */
72 72
     public function find_urlmethod() : ?string
73 73
     {
74
-        if (   empty($this->argv)
74
+        if (empty($this->argv)
75 75
             || !str_starts_with($this->argv[0], 'midcom-')) {
76 76
             return null;
77 77
         }
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/transformer/imageTransformer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
         }
48 48
 
49 49
         $result = [];
50
-        if (   !empty($array['file'])
50
+        if (!empty($array['file'])
51 51
             || !empty($array['identifier']) && str_starts_with($array['identifier'], 'tmpfile-')) {
52 52
             $result['file'] = parent::reverseTransform($array);
53 53
         } elseif (!empty($array['objects'])) {
Please login to merge, or discard this patch.