flack / openpsa

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);
                 }
             }

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

Braces +4 added lines, -2 removed lines

@@ -57,7 +57,8 @@ 
         try {
             midcom::get()->dynamic_load($batch_url);
             $ret = true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $ret = $e->getMessage();
         }
         ob_end_clean();
@@ -83,7 +84,8 @@ 
         midcom::get()->auth->request_sudo($this->_component);
         try {
             $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID");
             return false;
         }

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     public function _on_watched_dba_delete(midcom_core_dbaobject $object)
     {
         $qb = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
-        if (   $object instanceof midcom_db_person
+        if ($object instanceof midcom_db_person
             || $object instanceof org_openpsa_contacts_person_dba) {
             $qb->add_constraint('person', '=', $object->id);
         } elseif ($object instanceof org_openpsa_directmarketing_campaign_dba) {
@@ -42,7 +42,7 @@ 
      */
     public function background_send_message(array $args, midcom_baseclasses_components_cron_handler $handler)
     {
-        if (   !isset($args['url_base'])
+        if (!isset($args['url_base'])
             || !isset($args['batch'])) {
             $handler->print_error('url_base or batch number not set, aborting');
             return false;

lib/org/openpsa/directmarketing/campaign/ruleresolver.php

Braces +2 added lines, -1 removed lines

@@ -269,7 +269,8 @@
             $guid = $mc_parameter->get_subkey($parameter_key, 'parentguid');
             try {
                 $parent = midcom::get()->dbfactory->get_object_by_guid($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +2 added lines, -2 removed lines

@@ -313,7 +313,7 @@ 
      */
     private function add_misc_rule(array $rule, $class, $person_property)
     {
-        $persons = [ 0 => -1];
+        $persons = [0 => -1];
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>') {
@@ -390,7 +390,7 @@ 
         $ret = [];
 
         foreach ($object->get_properties() as $property) {
-            if (   preg_match('/^_/', $property)
+            if (preg_match('/^_/', $property)
                 || in_array($property, $skip_properties)
                 || property_exists($object, $property)) {
                 // Skip private or otherwise invalid properties

lib/org/openpsa/directmarketing/campaign/member.php

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
             return;
         }
         foreach ($parameters as $param_data) {
-            if (   empty($param_data['domain'])
+            if (empty($param_data['domain'])
                 || empty($param_data['name'])
                 || empty($param_data['value'])) {
                 // TODO: Log warning

lib/org/openpsa/directmarketing/handler/export.php

Braces +4 added lines, -2 removed lines

@@ -59,7 +59,8 @@ 
     {
         try {
             $person = new org_openpsa_contacts_person_dba($member->person);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return;
         }
@@ -82,7 +83,8 @@ 
                 $row['organization_member'] = $membership;
                 try {
                     $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN);
                     continue;
                 }

lib/org/openpsa/directmarketing/handler/message/report.php

Braces +2 added lines, -1 removed lines

@@ -142,7 +142,8 @@
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
                     $segment = $person->get_parameter('org.openpsa.directmarketing.segments', $segmentation_param);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                 }
                 if (empty($segment)) {
                     $segment = $this->_l10n->get('no segment');

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
         $qb_receipts->add_constraint('message', '=', $this->_message->id);
         $qb_receipts->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT);
         $receipts = $qb_receipts->execute_unchecked();
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
         $receipt_data['first_send'] = time();
         $receipt_data['last_send'] = 0;
         $receipt_data['sent'] = count($receipts);
@@ -76,7 +76,7 @@ 
 
     private function _get_campaign_data($first_send)
     {
-        $campaign_data =& $this->_request_data['report']['campaign_data'];
+        $campaign_data = & $this->_request_data['report']['campaign_data'];
         $qb_unsub = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
         $qb_unsub->add_constraint('campaign', '=', $this->_message->campaign);
         $qb_unsub->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED);
@@ -100,7 +100,7 @@ 
     private function _get_link_data($segmentation_param)
     {
         $this->_request_data['report']['link_data'] = [];
-        $link_data =& $this->_request_data['report']['link_data'];
+        $link_data = & $this->_request_data['report']['link_data'];
 
         $link_data['counts'] = [];
         $link_data['percentages'] = ['of_links' => [], 'of_recipients' => []];
@@ -126,7 +126,7 @@ 
         foreach ($links as $link) {
             $segment = '';
             $segment_notfound = false;
-            if (   $segmentation_param
+            if ($segmentation_param
                 && !empty($link->person)) {
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
@@ -140,7 +140,7 @@ 
                 if (!isset($link_data['segments'][$segment])) {
                     $link_data['segments'][$segment] = $segment_prototype;
                 }
-                $segment_data =& $link_data['segments'][$segment];
+                $segment_data = & $link_data['segments'][$segment];
             } else {
                 $segment_data = $segment_prototype;
             }
@@ -250,15 +250,15 @@ 
         $this->_initialize_field($array['percentages']['of_links'], $link);
         $this->_initialize_field($array['percentages']['of_recipients'], $link);
 
-        $link_data =& $this->_request_data['report']['link_data'];
-        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total']/$link_data['total'])*100;
-        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/$link_data['total'])*100;
+        $link_data = & $this->_request_data['report']['link_data'];
+        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total'] / $link_data['total']) * 100;
+        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / $link_data['total']) * 100;
 
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
-        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target])-1)/($receipt_data['sent']-$receipt_data['bounced']))*100;
-        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/($receipt_data['sent']-$receipt_data['bounced']))*100;
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
+        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target]) - 1) / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
+        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
 
-        if (   !isset($array['percentages']['of_recipients']['total'])
+        if (!isset($array['percentages']['of_recipients']['total'])
             || $array['percentages']['of_recipients'][$link->target]['total'] > $array['percentages']['of_recipients']['total']) {
             $array['percentages']['of_recipients']['total'] = $array['percentages']['of_recipients'][$link->target]['total'];
         }

lib/org/openpsa/directmarketing/handler/message/compose.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
         }
 
         //Substyle handling
-        if (   !empty($data['message_array']['substyle'])
+        if (!empty($data['message_array']['substyle'])
             && !preg_match('/^builtin:/', $data['message_array']['substyle'])) {
             debug_add("Appending substyle {$data['message_array']['substyle']}");
             midcom::get()->style->append_substyle($data['message_array']['substyle']);
@@ -117,7 +117,7 @@ 
     private function _real_show_compose($handler_id, array &$data)
     {
         $prefix = '';
-        if (   !empty($data['message_array']['substyle'])
+        if (!empty($data['message_array']['substyle'])
             && preg_match('/^builtin:(.*)/', $data['message_array']['substyle'], $matches_style)) {
             $prefix = $matches_style[1] . '-';
         }

lib/org/openpsa/directmarketing/link/log.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         if (!$this->timestamp) {
             $this->timestamp = time();
         }
-        if (   !$this->referrer
+        if (!$this->referrer
             && !empty($_SERVER['HTTP_REFERER'])) {
             $this->referrer = $_SERVER['HTTP_REFERER'];
         }