flack / openpsa

lib/org/openpsa/calendar/event/resource.php

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
         }
         try {
             $resource = org_openpsa_calendar_resource_dba::get_cached($this->resource);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Cannot fetch resource #{$this->resource} returning false", MIDCOM_LOG_INFO);
             return false;
         }

lib/org/openpsa/invoices/scheduler.php

Spacing +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
         }
 
         // TODO: Warehouse management: create new order
-        if (   $this->_deliverable->end < $next_cycle_start
+        if ($this->_deliverable->end < $next_cycle_start
             && $this->_deliverable->end != 0) {
             debug_add('Do not register next cycle, the contract ends before');
             return $this->_deliverable->end_subscription();
@@ -306,7 +306,7 @@ 
         if ($this->_deliverable->unit != 'd') {
             //If previous cycle was run at the end of the month, the new one should be at the end of the month as well
             $date = new DateTime(gmdate('Y-m-d', $time), new DateTimeZone('GMT'));
-            if (   $date->format('t') == $date->format('j')
+            if ($date->format('t') == $date->format('j')
                 && $new_date->format('t') != $new_date->format('j')) {
                 $new_date->setDate((int) $new_date->format('Y'), (int) $new_date->format('m'), (int) $new_date->format('t'));
             }
@@ -372,11 +372,11 @@ 
                 break;
             case 'q':
                 // Quarterly recurring subscription
-                $identifier = ceil(((int)$date->format('n')) / 4) . 'Q' . $date->format('y');
+                $identifier = ceil(((int) $date->format('n')) / 4) . 'Q' . $date->format('y');
                 break;
             case 'hy':
                 // Half-yearly recurring subscription
-                $identifier = ceil(((int)$date->format('n')) / 6) . '/' . $date->format('Y');
+                $identifier = ceil(((int) $date->format('n')) / 6) . '/' . $date->format('Y');
                 break;
             case 'y':
                 // Yearly recurring subscription

Braces +2 added lines, -1 removed lines

@@ -126,7 +126,8 @@
         $salesproject = org_openpsa_sales_salesproject_dba::get_cached($this->_deliverable->salesproject);
         try {
             $owner = midcom_db_person::get_cached($salesproject->owner);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return;
         }

lib/org/openpsa/invoices/invoice/item.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 
     public function _on_creating()
     {
-        if (   $this->invoice
+        if ($this->invoice
             && $this->position == 0) {
             $invoice = org_openpsa_invoices_invoice_dba::get_cached($this->invoice);
             $this->position = count($invoice->get_invoice_items()) + 1;
@@ -69,7 +69,7 @@ 
             } catch (midcom_error $e) {
             }
         }
-        if (   $url == ''
+        if ($url == ''
             && $sales_url) {
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable);
@@ -91,7 +91,7 @@ 
                 $invoice = new org_openpsa_invoices_invoice_dba($this->invoice);
                 $old_sum = $invoice->sum;
                 self::update_invoice($invoice);
-                if (   $old_sum != $invoice->sum
+                if ($old_sum != $invoice->sum
                     && !empty($this->deliverable)) {
                     $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable);
                     self::update_deliverable($deliverable);
@@ -131,7 +131,7 @@ 
 
         if ($invoiced != $deliverable->invoiced) {
             $deliverable->invoiced = $invoiced;
-            if (   $deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+            if ($deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
                 && $deliverable->state < org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED) {
                 $deliverable->state = org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED;
             }

Braces +6 added lines, -3 removed lines

@@ -66,7 +66,8 @@ 
             try {
                 $task = org_openpsa_projects_task_dba::get_cached($this->task);
                 $url = $projects_url . 'task/' . $task->guid . '/';
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
         if (   $url == ''
@@ -74,7 +75,8 @@ 
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable);
                 $url = $sales_url . 'deliverable/' . $deliverable->guid . '/';
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
         if ($url != '') {
@@ -96,7 +98,8 @@ 
                     $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable);
                     self::update_deliverable($deliverable);
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/directmarketing/importer.php

Spacing +4 added lines, -4 removed lines

@@ -128,7 +128,7 @@ 
                 }
             }
 
-            if (   !$person
+            if (!$person
                 && !empty($subscriber['person']['handphone'])) {
                 // Perform a simple cell phone test. More complicated duplicate checking is best left to the o.o.contacts duplicate checker
                 $qb = org_openpsa_contacts_person_dba::new_query_builder();
@@ -174,7 +174,7 @@ 
             // User is or has been subscriber earlier, update status
             $member = $members[0];
 
-            if (   $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
+            if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
                 || $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL) {
                 $this->_import_status['already_subscribed']++;
                 return;
@@ -214,7 +214,7 @@ 
 
             $qb = org_openpsa_contacts_group_dba::new_query_builder();
 
-            if (   array_key_exists('company_id', $this->_schemadbs['organization']['default']->fields)
+            if (array_key_exists('company_id', $this->_schemadbs['organization']['default']->fields)
                 && !empty($subscriber['organization']['company_id'])) {
                 // Imported data has a company id, we use that instead of name
                 $qb->add_constraint($this->_schemadbs['organization']['default']->fields['company_id']['storage']['location'], '=', $subscriber['organization']['company_id']);
@@ -222,7 +222,7 @@ 
                 // Seek by official name
                 $qb->add_constraint('official', '=', $subscriber['organization']['official']);
 
-                if (   array_key_exists('city', $this->_schemadbs['organization']['default']->fields)
+                if (array_key_exists('city', $this->_schemadbs['organization']['default']->fields)
                     && !empty($subscriber['organization']['city'])) {
                     // Imported data has a city, we use also that for matching
                     $qb->add_constraint($this->_schemadbs['organization']['default']->fields['city']['storage']['location'], '=', $subscriber['organization']['city']);

Braces +2 added lines, -1 removed lines

@@ -300,7 +300,8 @@
                     $organization = $this->_import_subscribers_organization($subscriber);
                     $this->_import_subscribers_organization_member($subscriber, $person, $organization);
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 // Clean up possibly created data
                 $this->_clean_new_objects();

lib/org/openpsa/directmarketing/handler/campaign/rules.php

Braces +2 added lines, -1 removed lines

@@ -107,7 +107,8 @@
         if (!empty($_POST['midcom_helper_datamanager2_save'])) {
             try {
                 $rules = $this->_load_rules();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error');
                 return;
             }

lib/org/openpsa/expenses/handler/index.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
             }
 
             $date_identifier = date('Y-m-d', $row['date']);
-            $row_identifier = $task->id . '-' .  $row['person'];
+            $row_identifier = $task->id . '-' . $row['person'];
 
             if (!isset($reports[$row_identifier])) {
                 try {

Braces +4 added lines, -2 removed lines

@@ -114,7 +114,8 @@ 
         foreach ($hours as $guid => $row) {
             try {
                 $task = org_openpsa_projects_task_dba::get_cached($row['task']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Task couldn't be loaded, probably because of ACL
                 continue;
             }
@@ -127,7 +128,8 @@ 
                     $person_object = org_openpsa_contacts_person_dba::get_cached($row['person']);
                     $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']);
                     $person_name = $person_object->name;
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $person_label = $this->_l10n->get('no person');
                     $person_name = '';
                 }

lib/org/openpsa/mail/backend/bouncer.php

Braces +2 added lines, -1 removed lines

@@ -23,7 +23,8 @@
         foreach ($this->_try_backends as $backend) {
             try {
                 $this->_backend = org_openpsa_mail_backend::get($backend, $params);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage());
             }
         }

lib/org/openpsa/mail/backend.php

Braces +4 added lines, -2 removed lines

@@ -42,7 +42,8 @@ 
                     $object = self::_load_backend($backend, $params);
                     debug_add('Using backend ' . $backend);
                     return $object;
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage());
                 }
             }
@@ -67,7 +68,8 @@ 
             $ret = $this->mail($message);
             $this->error = false;
             return $ret;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             $this->error = $e->getMessage();
             return false;
         }

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
             return false;
         }
 
-        if (   is_string($this->error)
+        if (is_string($this->error)
             && !empty($this->error)) {
             return $this->error;
         }

lib/org/openpsa/mail/main.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
         $this->html_body = preg_replace("/\n\r|\r\n|\r/", "\n", $this->html_body);
 
         //Try to translate HTML-only body to plaintext as well
-        if (   strlen($this->body) == 0
+        if (strlen($this->body) == 0
             && strlen($this->html_body) > 0
             && !$this->allow_only_html) {
             $this->body = $this->html2text($this->html_body);