flack / openpsa

lib/compat/environment.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 {
     public function __construct()
     {
-        if (   php_sapi_name() != 'cli'
+        if (php_sapi_name() != 'cli'
             || !empty($_SERVER['REMOTE_ADDR'])) {
             $this->_httpd_setup();
         }
@@ -63,12 +63,12 @@ 
          *
          * 2008-09-26: Now also rewrites urls ending in .html to end with trailing slash.
          */
-        $redirect_test_uri = (string)$_SERVER['REQUEST_URI'];
-        if (   !isset($_SERVER['MIDCOM_COMPAT_REDIR'])
-            || (bool)$_SERVER['MIDCOM_COMPAT_REDIR'] !== false) {
+        $redirect_test_uri = (string) $_SERVER['REQUEST_URI'];
+        if (!isset($_SERVER['MIDCOM_COMPAT_REDIR'])
+            || (bool) $_SERVER['MIDCOM_COMPAT_REDIR'] !== false) {
             $redirect_test_uri = preg_replace('/\.html$/', '', $redirect_test_uri);
         }
-        if (   !preg_match('%\?|/$|midcom-.+-|/.*\.[^/]+$%', $redirect_test_uri)
+        if (!preg_match('%\?|/$|midcom-.+-|/.*\.[^/]+$%', $redirect_test_uri)
             && (empty($_POST))) {
             $this->header('HTTP/1.0 301 Moved Permanently');
             $this->header("Location: {$redirect_test_uri}/");

lib/errors.php

Spacing +2 added lines, -2 removed lines

@@ -249,7 +249,7 @@ 
     private function send($httpcode, $message)
     {
         $error_actions = midcom::get()->config->get('error_actions');
-        if (   !isset($error_actions[$httpcode])
+        if (!isset($error_actions[$httpcode])
             || !isset($error_actions[$httpcode]['action'])) {
             // No action specified for this error code, skip
             return;
@@ -279,7 +279,7 @@ 
             return;
         }
 
-        if (   !is_writable($config['filename'])
+        if (!is_writable($config['filename'])
             && !is_writable(dirname($config['filename']))) {
             debug_add("Error logging file {$config['filename']} is not writable", MIDCOM_LOG_WARN);
             return;

lib/org/openpsa/relatedto/plugin.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      */
     public static function create($from_obj, $from_component, $to_obj, $to_component, $status = false, $extra = false)
     {
-        if (   !is_object($from_obj)
+        if (!is_object($from_obj)
             || !is_object($to_obj)) {
             return false;
         }
@@ -258,7 +258,7 @@ 
             debug_print_r("processing button '{$mode}' with data:", $data);
             if ($data === false) {
                 //In case somebody didn't unset() a button from the defaults, just marked it as false
-                debug_add('data marked as false, skipping (the correct way is to unset() the key)',  MIDCOM_LOG_WARN);
+                debug_add('data marked as false, skipping (the correct way is to unset() the key)', MIDCOM_LOG_WARN);
                 continue;
             }
 

Braces +2 added lines, -1 removed lines

@@ -106,7 +106,8 @@
     {
         $ret = ['org_openpsa_relatedto' => []];
         foreach ($array as $rel) {
-            if (!midcom::get()->dbfactory->is_a($rel, 'org_openpsa_relatedto_dba')) { //Matches also 'org_openpsa_relatedto'
+            if (!midcom::get()->dbfactory->is_a($rel, 'org_openpsa_relatedto_dba')) {
+//Matches also 'org_openpsa_relatedto'
                 //Wrong type of object found in array, cruelly abort the whole procedure
                 return false;
             }

lib/org/openpsa/relatedto/exec/delete_dangling_links.php

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
     try {
         midcom::get()->dbfactory->get_object_by_guid($result->fromGuid);
         midcom::get()->dbfactory->get_object_by_guid($result->toGuid);
-    } catch (midcom_error $e) {
+    }
+    catch (midcom_error $e) {
         echo $i . "/" . $total . ": Deleting relatedto #" . $result->id . "\n";
         flush();
         $result->delete();

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/reports/viewer.php

Braces +2 added lines, -1 removed lines

@@ -174,7 +174,8 @@
             try {
                 midcom_db_topic::get_cached($node_guid);
                 $this->_available_generators[$component] = $loc;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("topic for component '{$component}' not found or accessible");
             }
         }

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

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,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) {
@@ -65,8 +65,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);
 
@@ -109,8 +109,8 @@ 
         foreach ($at_entries 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));
                 }

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