flack / openpsa

lib/midcom/helper/toolbar.php

Spacing +8 added lines, -8 removed lines

@@ -340,7 +340,7 @@ 
 
         $item = array_replace($defaults, $item);
 
-        if (   !empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
+        if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
             && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) {
             // We have valid access key, add it to help text
             $prefix = 'Alt-';
@@ -365,7 +365,7 @@ 
     private function set_url(array &$item, string $url)
     {
         $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url;
-        if (   (   empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
+        if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
                 // Some items may want to keep their links unmutilated
                 || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink")
             && !str_starts_with($url, '/')
@@ -390,7 +390,7 @@ 
 
         if ($index == 0) {
             array_shift($this->items);
-        } elseif ($index == count($this->items) -1) {
+        } elseif ($index == count($this->items) - 1) {
             array_pop($this->items);
         } else {
             $this->items = array_merge(array_slice($this->items, 0, $index),
@@ -513,7 +513,7 @@ 
      */
     public function render() : string
     {
-        $visible_items = array_filter($this->items, function ($item) {
+        $visible_items = array_filter($this->items, function($item) {
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
         });
         $this->rendered = true;
@@ -576,7 +576,7 @@ 
             // Try finding uppercase version of the accesskey first
             $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
             $position = strpos($label, $accesskey);
-            if (   $position === false
+            if ($position === false
                 && midcom::get()->i18n->get_current_language() == 'en') {
                 // Try lowercase, too
                 $accesskey = strtolower($accesskey);
@@ -636,7 +636,7 @@ 
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
         }
 
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
             && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) {
             $attributes['class'] = 'accesskey';
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -699,7 +699,7 @@ 
     public function get_index_from_url(string $url) : ?int
     {
         foreach ($this->items as $i => $item) {
-            if (   $item[MIDCOM_TOOLBAR_URL] == $url
+            if ($item[MIDCOM_TOOLBAR_URL] == $url
                 || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) {
                 return $i;
             }
@@ -717,7 +717,7 @@ 
      *
      * @param mixed $index The integer index or URL to check
      */
-    protected function _check_index($index, bool $raise_error = true) :?int
+    protected function _check_index($index, bool $raise_error = true) : ?int
     {
         if (is_string($index)) {
             $url = $index;

lib/org/openpsa/directmarketing/importer/csv.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
         foreach (array_filter($csv_line) as $field => $value) {
             // Process the row accordingly
             $field_matching = $this->_settings['fields'][$field];
-            if (   $field_matching
+            if ($field_matching
                 && str_contains($field_matching, ':')) {
                 [$schemadb, $schema_field] = explode(':', $field_matching);
 
-                if (   !array_key_exists($schemadb, $this->_schemadbs)
+                if (!array_key_exists($schemadb, $this->_schemadbs)
                     || !$this->_schemadbs[$schemadb]->get('default')->has_field($schema_field)) {
                     // Invalid matching, skip
                     continue;

src/midcom/datamanager/helper/autocomplete.php

Spacing +4 added lines, -6 removed lines

@@ -83,7 +83,7 @@ 
     private function apply_constraints(midcom_core_query $query, array $constraints)
     {
         foreach ($constraints as $key => $data) {
-            if (   !array_key_exists('value', $data)
+            if (!array_key_exists('value', $data)
                 || empty($data['field'])
                 || empty($data['op'])) {
                 debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN);
@@ -144,7 +144,7 @@ 
     {
         $query = $this->request["term"];
         $wildcard_query = $query;
-        if (   isset($this->request['auto_wildcards'])
+        if (isset($this->request['auto_wildcards'])
             && !str_contains($query, '%')) {
             switch ($this->request['auto_wildcards']) {
                 case 'start':
@@ -252,9 +252,7 @@ 
                 return $label;
             }
         }
-        return midcom_helper_reflector::get($object)->get_object_label($object) ?:
-            self::build_label($object, array_column($result_headers, 'name')) ?:
-            get_class($object) . ' #' . $object->id;
+        return midcom_helper_reflector::get($object)->get_object_label($object) ?: self::build_label($object, array_column($result_headers, 'name')) ?: get_class($object) . ' #' . $object->id;
     }
 
     private static function build_label($object, array $fields) : string
@@ -289,7 +287,7 @@ 
             }
             return self::sanitize_label($value);
         }
-        if (   $field == 'username'
+        if ($field == 'username'
             && $object instanceof midcom_db_person) {
             $account = new midcom_core_account($object);
             return self::sanitize_label($account->get_username());

src/midcom/dba/privileges.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function set_privilege($privilege, $assignee = null, int $value = MIDCOM_PRIVILEGE_ALLOW, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to set a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -94,7 +94,7 @@ 
      */
     public function unset_privilege($privilege, $assignee = null, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);

src/midcom/dba/parameters.php

Indentation +2 added lines, -2 removed lines

@@ -204,7 +204,7 @@ 
         if (   !$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on " . static::class . " {$this->guid} not granted for the current user.",
-                  MIDCOM_LOG_ERROR);
+                    MIDCOM_LOG_ERROR);
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
         }
@@ -248,7 +248,7 @@ 
         if (   !$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on " . static::class . " {$this->guid} not granted for the current user.",
-                  MIDCOM_LOG_ERROR);
+                    MIDCOM_LOG_ERROR);
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
         }

Spacing +2 added lines, -2 removed lines

@@ -201,7 +201,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on " . static::class . " {$this->guid} not granted for the current user.",
                   MIDCOM_LOG_ERROR);
@@ -245,7 +245,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on " . static::class . " {$this->guid} not granted for the current user.",
                   MIDCOM_LOG_ERROR);

src/midcom/dba/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -71,7 +71,7 @@ 
             return null;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -85,7 +85,7 @@ 
         $attachment->parentguid = $this->guid;
 
         if (!$attachment->create()) {
-            debug_add("Could not create the attachment '{$name}' for " . static::class . " {$this->guid}: "  . midcom_connection::get_error_string(),
+            debug_add("Could not create the attachment '{$name}' for " . static::class . " {$this->guid}: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return null;
         }

lib/midcom/services/i18n/l10n.php

Spacing +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
     private function error(string $message, string $filename, int $line) : midcom_error
     {
         $line++; // Array is 0-indexed
-        return new midcom_error('L10n DB SYNTAX ERROR: ' .  $message . ' at ' . $filename . ' ' . $line);
+        return new midcom_error('L10n DB SYNTAX ERROR: ' . $message . ' at ' . $filename . ' ' . $line);
     }
 
     /**

lib/midcom/services/rcs/main.php

Braces +2 added lines, -1 removed lines

@@ -56,7 +56,8 @@
         try {
             $backend->update(midcom::get()->auth->user->id ?? 'NOBODY', $message);
             return true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add('RCS: Could not save file!');
             $e->log();
             return false;

lib/midcom/services/uimessages.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
      */
     public function show(bool $show_simple = false)
     {
-        if (   $show_simple
+        if ($show_simple
             || !midcom::get()->auth->can_user_do('midcom:ajax', null, static::class)) {
             $this->show_simple();
             return;