flack / openpsa

src/midcom/datamanager/helper/autocomplete.php

Spacing +4 added lines, -6 removed lines

@@ -85,7 +85,7 @@ 
     {
         ksort($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);
@@ -146,7 +146,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':
@@ -253,9 +253,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());

lib/midcom/helper/reflector/main.php

Braces +2 added lines, -1 removed lines

@@ -203,7 +203,8 @@
         if ($object instanceof mgdobject) {
             try {
                 $obj = midcom::get()->dbfactory->convert_midgard_to_midcom($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return null;
             }
         } else {

Spacing +3 added lines, -3 removed lines

@@ -312,7 +312,7 @@ 
 
         $label_prop = $this->get_label_property();
 
-        if (    $label_prop != 'guid'
+        if ($label_prop != 'guid'
              && $this->_mgd_reflector->property_exists($label_prop)) {
             $search_properties[$label_prop] = true;
         }
@@ -365,7 +365,7 @@ 
                 continue;
             }
 
-            if (   !$ref->is_link($property)
+            if (!$ref->is_link($property)
                 && $ref->get_midgard_type($property) != MGD_TYPE_GUID) {
                 continue;
             }
@@ -399,7 +399,7 @@ 
     protected static function class_rewrite(string $schema_type) : string
     {
         $extends = midcom_baseclasses_components_configuration::get('midcom.helper.reflector', 'config')->get_array('class_extends');
-        if (   isset($extends[$schema_type])
+        if (isset($extends[$schema_type])
             && class_exists($extends[$schema_type])) {
             return $extends[$schema_type];
         }

lib/net/nemein/rss/fetch.php

Spacing +6 added lines, -6 removed lines

@@ -87,7 +87,7 @@ 
             $etag = trim($parser->data['headers']['etag']);
 
             $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag');
-            if (   !empty($feed_etag)
+            if (!empty($feed_etag)
                 && $feed_etag == $etag) {
                 // Feed hasn't changed, skip updating
                 debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN);
@@ -158,7 +158,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid)) {
             // Something wrong with this entry, skip it
@@ -223,7 +223,7 @@ 
                 $meta_values['published'] = $article_date;
             }
 
-            if (   $this->apply_values($article, $values, $meta_values)
+            if ($this->apply_values($article, $values, $meta_values)
                 && !$article->update()) {
                 return null;
             }
@@ -252,14 +252,14 @@ 
     private function find_author(net_nemein_rss_parser_item $item) : midcom_db_person
     {
         // Try to figure out item author
-        if (   $this->_feed->forceauthor
+        if ($this->_feed->forceauthor
             && $this->_feed->defaultauthor) {
             // Feed has a "default author" set, use it
             return new midcom_db_person($this->_feed->defaultauthor);
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id) {
             if ($this->_feed->defaultauthor) {
                 // Feed has a "default author" set, use it
@@ -429,7 +429,7 @@ 
             }
         }
 
-        if (   !empty($author_info['username'])
+        if (!empty($author_info['username'])
             && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) {
             return $person->get_storage();
         }

lib/midgard/admin/asgard/handler/object/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -98,13 +98,13 @@ 
         }
 
         $mimetype = $request->request->get('midgard_admin_asgard_mimetype');
-        if (   !empty($mimetype)
+        if (!empty($mimetype)
             && $local_file->mimetype != $mimetype) {
             $local_file->mimetype = $mimetype;
             $needs_update = true;
         }
 
-        if (   $needs_update
+        if ($needs_update
             && !$local_file->update()) {
             return null;
         }
@@ -234,7 +234,7 @@ 
         $this->bind_view_to_object($this->_file);
 
         $filename = $this->_process_form($request);
-        if (   $filename
+        if ($filename
             && $filename != $data['filename']) {
             return $this->relocate_to_file($filename);
         }

lib/org/openpsa/slideshow/image.php

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
 
         try {
             $folder = midcom_db_topic::get_cached($this->topic);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         $folder->delete_attachment(self::FOLDER_THUMBNAIL);
@@ -58,7 +59,8 @@ 
     {
         try {
             return new midcom_db_attachment($this->$type);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return null;
         }

lib/org/openpsa/relatedto/plugin.php

Braces +2 added lines, -1 removed lines

@@ -104,7 +104,8 @@
     {
         $ret = ['org_openpsa_relatedto' => []];
         foreach ($array as $rel) {
-            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto'
+            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) {
+//Matches also 'org_openpsa_relatedto'
                 //Wrong type of object found in array, cruelly abort the whole procedure
                 return null;
             }

lib/midcom/helper/reflector/copy.php

Spacing +2 added lines, -2 removed lines

@@ -188,7 +188,7 @@ 
         }
 
         // Override requested root object properties
-        if (   !empty($this->target->guid)
+        if (!empty($this->target->guid)
             && $target->guid === $this->target->guid) {
             foreach ($this->root_object_values as $name => $value) {
                 $target->$name = $value;
@@ -241,7 +241,7 @@ 
     {
         if ($this->$type) {
             $method = 'copy_' . $type;
-            if (   !$this->$method($source, $target)
+            if (!$this->$method($source, $target)
                 && $this->halt_on_errors) {
                 $this->errors[] = $this->_l10n->get('failed to copy ' . $type);
                 return false;

src/midcom/dba/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,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 the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -77,7 +77,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 " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -91,7 +91,7 @@ 
         $attachment->parentguid = $this->guid;
 
         if (!$attachment->create()) {
-            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: "  . midcom_connection::get_error_string(),
+            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return null;
         }

lib/midcom/core/collector.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
                 if ($counter <= $this->_offset) {
                     continue;
                 }
-                if (   $this->_limit
+                if ($this->_limit
                     && $counter > ($this->_offset + $this->_limit)) {
                     break;
                 }