flack / openpsa

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;

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
             $this->_user_id = midcom::get()->auth->acl->get_user_id();
         }
 
-        if (   $this->hide_invisible
+        if ($this->hide_invisible
             && !$this->_visibility_checks_added) {
             if (!midcom::get()->config->get('show_hidden_objects')) {
                 $this->add_constraint('metadata.hidden', '=', false);
@@ -200,7 +200,7 @@ 
         // Deal with empty arrays, which would produce invalid queries
         // This is done here to avoid repetitive code in callers, and because
         // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true
-        if (   is_array($value)
+        if (is_array($value)
             && empty($value)) {
             if ($operator == 'NOT IN') {
                 return true;

lib/midcom/core/dbaobject.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
             }
             $this->set_object($id);
         } else {
-            if (   is_int($id)
+            if (is_int($id)
                 && $id < 1) {
                 throw new midcom_error($id . ' is not a valid database ID');
             }
@@ -108,7 +108,7 @@ 
             }
 
             //Some useful information for performance tuning
-            if (   midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
+            if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
                 && $this->__object->guid) {
                 static $guids = [];
                 static $total = 0;

Braces +2 added lines, -1 removed lines

@@ -102,7 +102,8 @@
             try {
                 $mgdschemaclass = $this->__mgdschema_class_name__;
                 $this->set_object(new $mgdschemaclass($id));
-            } catch (mgd_exception $e) {
+            }
+            catch (mgd_exception $e) {
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN);
                 throw new midcom_error_midgard($e, $id);
             }

lib/midcom/services/indexer/document.php

Spacing +1 added lines, -1 removed lines

@@ -405,7 +405,7 @@
     {
         // Complete fields
         $this->indexed = time();
-        if (   $this->author == ''
+        if ($this->author == ''
             && isset($this->creator->name)) {
             $this->author = $this->creator->name;
         }

Braces +2 added lines, -1 removed lines

@@ -579,7 +579,8 @@
     {
         try {
             return midcom_db_person::get_cached($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return null;
         }
     }

lib/org/openpsa/contacts/duplicates/merge.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
                             $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']);
 
                             if ($dup !== true) {
-                                if (   !is_object($dup)
+                                if (!is_object($dup)
                                     || !array_key_exists($dup->id, $todelete)) {
                                     $todelete[$result->id] = $result;
                                 }
@@ -97,7 +97,7 @@ 
                         }
                     }
                 }
-                if (   $needs_update
+                if ($needs_update
                     && !$result->update()) {
                     throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string());
                 }
@@ -145,7 +145,7 @@ 
         }
 
         foreach ($results as $result) {
-            if (   $result->$field === $object->$field
+            if ($result->$field === $object->$field
                 && $result->id !== $object->id) {
                 return $result;
             }
@@ -163,7 +163,7 @@ 
         $changed = false;
         foreach ($person2 as $property => $value) {
             // Copy only simple properties not marked to be skipped missing from person1
-            if (   !empty($person2->$property)
+            if (!empty($person2->$property)
                 && empty($person1->$property)
                 && !isset($skip_properties[$property])
                 && is_scalar($value)) {