flack / openpsa

lib/org/openpsa/sales/handler/list.php

Braces +2 added lines, -1 removed lines

@@ -113,7 +113,8 @@
         try {
             $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($guid);
             $qb->add_constraint('customer', '=', $this->_request_data['customer']->id);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($guid);
             $qb->add_constraint('customerContact', '=', $this->_request_data['customer']->id);
         }

lib/org/openpsa/contacts/midcom/interfaces.php

Braces +2 added lines, -1 removed lines

@@ -159,7 +159,8 @@
 
         try {
             $object = new $classname($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error($type . " {$guid} not found, error " . $e->getMessage());
             return false;
         }

Spacing +4 added lines, -4 removed lines

@@ -79,11 +79,11 @@ 
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_contacts_group_dba
+        if ($object instanceof org_openpsa_contacts_group_dba
             || $object instanceof midcom_db_group) {
             return "group/{$object->guid}/";
         }
-        if (   $object instanceof org_openpsa_contacts_person_dba
+        if ($object instanceof org_openpsa_contacts_person_dba
             || $object instanceof midcom_db_person) {
             return "person/{$object->guid}/";
         }
@@ -112,8 +112,8 @@ 
             // We have a feed URL, but we should check if it is GeoRSS as well
             $items = net_nemein_rss_fetch::raw_fetch($data['rss_url'])->get_items();
 
-            if (   !empty($items)
-                && (   $items[0]->get_latitude()
+            if (!empty($items)
+                && ($items[0]->get_latitude()
                     || $items[0]->get_longitude())) {
                 // This is a GeoRSS feed
                 $data['georss_url'] = $data['rss_url'];

lib/org/openpsa/contacts/handler/person/view.php

Braces +2 added lines, -1 removed lines

@@ -216,7 +216,8 @@
         foreach ($this->_request_data[$identifier] as $member) {
             try {
                 $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
         $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices');
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
 
-        if (   $invoices_url
+        if ($invoices_url
             && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)
             && $this->_contact->can_do('midgard:update')) {
             $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', [
@@ -126,8 +126,8 @@ 
             ]);
         }
 
-        if (   $user_url
-            && (   midcom_connection::get_user() == $this->_contact->id
+        if ($user_url
+            && (midcom_connection::get_user() == $this->_contact->id
                 || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class))) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/",

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

Braces +2 added lines, -1 removed lines

@@ -382,7 +382,8 @@
             try {
                 $obj1 = $class::get_cached($arr1['guid']);
                 $obj2 = $class::get_cached($arr2['guid']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +5 added lines, -5 removed lines

@@ -128,7 +128,7 @@ 
             // if user's lastname is part of the email address, check to see if the difference is only in the domain part
             $email1 = preg_replace('/@.+/', '', $person1['email']);
             $email2 = preg_replace('/@.+/', '', $person2['email']);
-            if (   strpos($email1, $person1['lastname']) !== false
+            if (strpos($email1, $person1['lastname']) !== false
                 && $email1 == $email2) {
                 $ret['email_match'] = true;
                 $ret['p'] += 0.5;
@@ -174,7 +174,7 @@ 
 
     private function match($property, array $data1, array $data2)
     {
-        if (   !empty($data1[$property])
+        if (!empty($data1[$property])
             && $data1[$property] == $data2[$property]) {
             return true;
         }
@@ -325,7 +325,7 @@ 
         $persons = $this->get_person_candidates();
 
         $params = [];
-        $params['objects'] =& $persons;
+        $params['objects'] = & $persons;
         $params['mode'] = 'person';
 
         array_walk($persons, [$this, 'check_all_arraywalk'], $params);
@@ -387,7 +387,7 @@ 
                 continue;
             }
 
-            if (   $obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
+            if ($obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
                 || $obj2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj1->guid)) {
                 // Not-duplicate parameter found, returning zero probability
                 continue;
@@ -415,7 +415,7 @@ 
 
         $groups = $this->get_group_candidates();
         $params = [];
-        $params['objects'] =& $groups;
+        $params['objects'] = & $groups;
         $params['mode'] = 'group';
         array_walk($groups, [$this, 'check_all_arraywalk'], $params);
 

lib/org/openpsa/reports/handler/invoices/report.php

Braces +2 added lines, -1 removed lines

@@ -114,7 +114,8 @@
                         && $deliverable->end > $this->_request_data['start'])) {
                     $invoices = array_merge($invoices, $this->_get_invoices_for_subscription($deliverable, $at_entry));
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
         $invoices = array_merge($invoices, $this->_get_deliverable_invoices());

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 
     private function _get_invoices_for_subscription($deliverable, $at_entry)
     {
-        if (   $deliverable->invoiceByActualUnits
+        if ($deliverable->invoiceByActualUnits
             && $at_entry->arguments['cycle'] > 1) {
             $invoice_sum = $deliverable->invoiced / ($at_entry->arguments['cycle'] - 1);
             if ($invoice_sum == 0) {
@@ -64,8 +64,8 @@ 
         $time = $at_entry->start;
         $scheduler = new org_openpsa_invoices_scheduler($deliverable);
 
-        while (   $time < $this->_request_data['end']
-               && (   $time < $deliverable->end
+        while ($time < $this->_request_data['end']
+               && ($time < $deliverable->end
                    || $deliverable->continuous)) {
             $invoices[] = $this->get_invoice_for_deliverable($deliverable, $invoice_sum, $time, $calculation_base);
 
@@ -107,8 +107,8 @@ 
         foreach ($qb->execute() as $at_entry) {
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($at_entry->arguments['deliverable']);
-                if (   $deliverable->continuous
-                    || (   $deliverable->start < $this->_request_data['end']
+                if ($deliverable->continuous
+                    || ($deliverable->start < $this->_request_data['end']
                         && $deliverable->end > $this->_request_data['start'])) {
                     $invoices = array_merge($invoices, $this->_get_invoices_for_subscription($deliverable, $at_entry));
                 }

lib/org/openpsa/reports/handler/sales/report.php

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
             $owner = org_openpsa_contacts_person_dba::get_cached($salesproject->owner);
             $row['index_owner'] = $owner->name;
             $row['owner'] = org_openpsa_widgets_contact::get($owner->guid)->show_inline();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         $row['amount'] = $object->pricePerUnit * $object->units;

lib/org/openpsa/helpers/list.php

Braces +2 added lines, -1 removed lines

@@ -69,7 +69,8 @@
         if (empty(self::$_seen[$company_id])) {
             try {
                 $company = new org_openpsa_contacts_group_dba($company_id);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return;
             }
             self::$_seen[$company->id] = true;

lib/org/openpsa/widgets/contact.php

Braces +4 added lines, -2 removed lines

@@ -114,7 +114,8 @@ 
 
         try {
             $person = org_openpsa_contacts_person_dba::get_cached($src);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $widget = new self();
             $cache[$src] = $widget;
             return $widget;
@@ -323,7 +324,8 @@ 
         foreach ($memberships as $data) {
             try {
                 $group = org_openpsa_contacts_group_dba::get_cached($data['gid']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +8 added lines, -8 removed lines

@@ -136,7 +136,7 @@ 
      */
     private function read_object($person)
     {
-        if (   !is_object($person)
+        if (!is_object($person)
             || !$person instanceof midcom_db_person) {
             // Given $person is not one
             return false;
@@ -160,12 +160,12 @@ 
             }
         }
 
-        if (   $this->_config->get('jabber_enable_presence')
+        if ($this->_config->get('jabber_enable_presence')
             && $person->get_parameter('org.openpsa.jabber', 'jid')) {
             $this->contact_details['jid'] = $person->get_parameter('org.openpsa.jabber', 'jid');
         }
 
-        if (   $this->_config->get('skype_enable_presence')
+        if ($this->_config->get('skype_enable_presence')
             && $person->get_parameter('org.openpsa.skype', 'name')) {
             $this->contact_details['skype'] = $person->get_parameter('org.openpsa.skype', 'name');
         }
@@ -204,7 +204,7 @@ 
         if (!empty($attachments[$type])) {
             return '<img class="photo" src="' . midcom_db_attachment::get_url($attachments[$type]) . '">';
         }
-        if (   $this->_config->get('gravatar_enable')
+        if ($this->_config->get('gravatar_enable')
             && !empty($this->contact_details['email'])) {
             $size = ($type == 'view') ? 500 : 32;
             $gravatar_url = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->contact_details['email']))) . "?s=" . $size . '&d=identicon';
@@ -314,7 +314,7 @@ 
 
     private function _show_groups()
     {
-        if (   !$this->show_groups
+        if (!$this->show_groups
             || empty($this->contact_details['id'])) {
             return;
         }
@@ -379,7 +379,7 @@ 
                     $default_shown = true;
                     $cards_to_show[] = $cardname;
                 }
-            } elseif (    $customer->$property
+            } elseif ($customer->$property
                       || ($customer->street && !$inherited_cards_only && !$default_shown)) {
                 $inherited_cards_only = false;
                 $multiple_addresses = true;
@@ -400,8 +400,8 @@ 
 
         foreach ($cards_to_show as $cardname) {
             echo '<div class="vcard">';
-            if (   $multiple_addresses
-                || (   $cardname != 'visiting'
+            if ($multiple_addresses
+                || ($cardname != 'visiting'
                     && !$inherited_cards_only)) {
                 echo '<div style="text-align:center"><em>' . midcom::get()->i18n->get_string($cardname . ' address', 'org.openpsa.contacts') . "</em></div>\n";
             }

lib/org/openpsa/products/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     public function _on_reindex($topic, $config, &$indexer)
     {
-        if (   !$config->get('index_products')
+        if (!$config->get('index_products')
             && !$config->get('index_groups')) {
             debug_add("No indexing to groups and products, skipping", MIDCOM_LOG_WARN);
             return true;

Braces +4 added lines, -2 removed lines

@@ -83,7 +83,8 @@ 
             try {
                 $dms['group']->set_storage($group);
                 org_openpsa_products_viewer::index($dms['group'], $indexer, $topic, $config);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log(MIDCOM_LOG_WARN);
             }
         }
@@ -96,7 +97,8 @@ 
                 try {
                     $dms['product']->set_storage($product);
                     org_openpsa_products_viewer::index($dms['product'], $indexer, $topic, $config);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log(MIDCOM_LOG_WARN);
                 }
             }