flack / openpsa

lib/midcom/services/indexer/document.php

Braces +2 added lines, -1 removed lines

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

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/calendar/event/member.php

Braces +2 added lines, -1 removed lines

@@ -143,7 +143,8 @@
                 debug_add('person #' . $person->id . 'has no email address, aborting');
                 return null;
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return null;
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      */
     public static function create($from_obj, $from_component, $to_obj, $to_component, $status = null, array $extra = []) : ?org_openpsa_relatedto_dba
     {
-        if (   !is_object($from_obj)
+        if (!is_object($from_obj)
             || !is_object($to_obj)) {
             return null;
         }

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/org/openpsa/invoices/billing/data.php

Braces +6 added lines, -3 removed lines

@@ -96,7 +96,8 @@ 
             // if the property useContactAddress is set
             $billing_data[0]->set_address();
             return $billing_data[0];
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return null;
         }
@@ -141,10 +142,12 @@ 
     {
         try {
             return new org_openpsa_contacts_person_dba($this->linkGuid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             try {
                 return new org_openpsa_contacts_group_dba($this->linkGuid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR);
                 return false;
             }

lib/org/openpsa/directmarketing/sender.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $this->from = $from;
         $this->subject = $subject;
 
-        if (   $this->_message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT
+        if ($this->_message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT
             && $this->_message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_HTML) {
             throw new midcom_error('unsupported message type');
         }
@@ -223,7 +223,7 @@ 
         $token .= midcom_helper_misc::random_string($this->token_size - 1, 'abcdefghijklmnopqrstuvwxyz0123456789');
 
         //If token is not free or (very, very unlikely) matches our dummy token, recurse.
-        if (   $token === 'dummy'
+        if ($token === 'dummy'
             || !org_openpsa_directmarketing_campaign_messagereceipt_dba::token_is_free($token)) {
             return $this->_create_token();
         }
@@ -247,7 +247,7 @@ 
             return null;
         }
         $type = $this->_backend->get_type();
-        if (   $person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
+        if ($person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
             || $person->get_parameter('org.openpsa.directmarketing', "send_{$type}_denied")) {
             debug_add("Sending {$type} messages to person {$person->rname} is denied, unsubscribing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;