flack / openpsa

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

@@ -132,7 +132,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;
@@ -156,12 +156,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');
         }
@@ -236,7 +236,7 @@ 
 
         // Show picture
         // TODO: Implement photo also in local way
-        if (   $this->_config->get('gravatar_enable')
+        if ($this->_config->get('gravatar_enable')
             && !empty($this->contact_details['email'])) {
             $size = $this->_config->get('gravatar_size');
             $gravatar_url = "http://www.gravatar.com/avatar.php?gravatar_id=" . md5($this->contact_details['email']) . "&size=" . $size;
@@ -310,7 +310,7 @@ 
 
     private function _show_groups()
     {
-        if (   !$this->show_groups
+        if (!$this->show_groups
             || empty($this->contact_details['id'])) {
             return;
         }
@@ -376,7 +376,7 @@ 
                     $cards_to_show[] = $cardname;
                 }
             } else {
-                if (    $customer->$property
+                if ($customer->$property
                     || ($customer->street && !$inherited_cards_only && !$default_shown)) {
                     $inherited_cards_only = false;
                     $multiple_addresses = true;
@@ -398,8 +398,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/expenses/handler/hours/admin.php

Braces +2 added lines, -1 removed lines

@@ -163,7 +163,8 @@
         try {
             $task = org_openpsa_projects_task_dba::get_cached($hour_report->task);
             $options['success_url'] = 'hours/task/' . $task->guid . '/';
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         return $this->get_workflow('delete', $options)->run();

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/products/handler/product/create.php

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
         } elseif ((int) $args[0] > 0) {
             try {
                 $this->parent = new org_openpsa_products_product_group_dba((int) $args[0]);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

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