flack / openpsa

lib/org/openpsa/sales/validator.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
         if ($result === true) {
             $result = [];
         }
-        if (   empty($fields['end'])
+        if (empty($fields['end'])
             && empty($fields['continuous'])) {
             $result['end'] = midcom::get()->i18n->get_string('select either end date or continuous', 'org.openpsa.sales');
         }
@@ -33,7 +33,7 @@ 
     public function validate_units(array $fields)
     {
         $result = [];
-        if (   empty($fields['invoiceByActualUnits'])
+        if (empty($fields['invoiceByActualUnits'])
             && empty($fields['plannedUnits'])) {
             $result['plannedUnits'] = midcom::get()->i18n->get_string('select either planned units or invoice by actual units', 'org.openpsa.sales');
             return $result;

lib/org/openpsa/invoices/handler/projects.php

Braces +6 added lines, -3 removed lines

@@ -51,7 +51,8 @@ 
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->get_agreement());
                 $item->deliverable = $deliverable->id;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
             $item->invoice = $invoice->id;
@@ -133,7 +134,8 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($customer_id);
                 $data['customer_label'] = $customer->official;
                 $data['disabled'] = '';
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $data['customer_label'] = $this->_l10n->get('no customer');
                 $data['disabled'] = ' disabled="disabled"';
             }
@@ -156,7 +158,8 @@ 
                     } else {
                         $data['invoiceable_units'] = $task->plannedHours;
                     }
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     if ($this->_config->get('default_hourly_price')) {
                         $data['default_price'] = $this->_config->get('default_hourly_price');

lib/org/openpsa/invoices/invoice.php

Spacing +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
                 $invoice_item->pricePerUnit = $deliverable->pricePerUnit;
                 $invoice_item->deliverable = $deliverable->id;
                 //calculate price
-                if (   $deliverable->invoiceByActualUnits
+                if ($deliverable->invoiceByActualUnits
                     || $deliverable->plannedUnits == 0) {
                     $invoice_item->units = $hours;
                 } else {

Braces +6 added lines, -3 removed lines

@@ -128,7 +128,8 @@ 
             try {
                 $task = new org_openpsa_projects_task_dba($id);
                 $task->update_cache();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
 
@@ -293,14 +294,16 @@ 
         if (!empty($this->customer)) {
             try {
                 return org_openpsa_contacts_group_dba::get_cached($this->customer);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
         if (!empty($this->customerContact)) {
             try {
                 return org_openpsa_contacts_person_dba::get_cached($this->customerContact);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/sales/calculator/default.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
     private function get_units($units = false)
     {
-        if (   $this->_deliverable->invoiceByActualUnits
+        if ($this->_deliverable->invoiceByActualUnits
             || $this->_deliverable->plannedUnits == 0) {
             // In most cases we calculate the price based on the actual units entered
             return $units ?: $this->_deliverable->units;

lib/org/openpsa/directmarketing/sender/backend/email.php

Indentation +11 added lines, -11 removed lines

@@ -163,17 +163,17 @@
     }
 
     /**
-    * Inserts a link detector to the given HTML source. All outgoing
-    * HTTP links in the source HTML are replaced with the given
-    * link detector address so that the token "URL" is replaced with
-    * encoded form of the original link. It is expected that the link detector
-    * address points to a script that records the passed link and
-    * forwards the client to the real link target.
-    *
-    * @param string $html the HTML source
-    * @param string $address the link detector address
-    * @return string HTML source with the link detector
-    */
+     * Inserts a link detector to the given HTML source. All outgoing
+     * HTTP links in the source HTML are replaced with the given
+     * link detector address so that the token "URL" is replaced with
+     * encoded form of the original link. It is expected that the link detector
+     * address points to a script that records the passed link and
+     * forwards the client to the real link target.
+     *
+     * @param string $html the HTML source
+     * @param string $address the link detector address
+     * @return string HTML source with the link detector
+     */
     private function _insert_link_detector($html, $address)
     {
         $address = addslashes($address);

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
         //Check for bounce detector usage
         if (!empty($config['bounce_detector_address'])) {
             //Force bouncer as backend if default specified
-            if (   empty($config['mail_send_backend'])
+            if (empty($config['mail_send_backend'])
                 || $config['mail_send_backend'] == 'try_default') {
                 $config['mail_send_backend'] = 'bouncer';
             }
@@ -91,7 +91,7 @@ 
 
         //Set some List-xxx headers to avoid auto-replies and in general to be a good netizen
         $mail->headers['List-Id'] = "<{$this->_message->guid}@{$_SERVER['SERVER_NAME']}>";
-        $mail->headers['List-Unsubscribe'] =  '<' . $member->get_unsubscribe_url() . '>';
+        $mail->headers['List-Unsubscribe'] = '<' . $member->get_unsubscribe_url() . '>';
 
         debug_add('mail->from: ' . $mail->from . ', mail->to: ' . $mail->to . ', mail->subject: ' . $mail->subject);
         switch ($this->_message->orgOpenpsaObtype) {
@@ -179,7 +179,7 @@ 
         $address = addslashes($address);
         return preg_replace_callback(
             '/href="(http:\/\/.*?)"/i',
-            function ($match) use ($address) {
+            function($match) use ($address) {
                 return 'href="' . str_replace("URL", rawurlencode($match[1]), $address) . '"';
             },
             $html);

lib/midcom/admin/help/style/midcom_admin_help_mgdschemas.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         foreach ($properties as $propname => $val) {
             $proplink = "";
             $description = preg_replace('/ *\n */', "\n", $val['value']);
-            if (   $val['link']
+            if ($val['link']
                 && $linked_component = midcom::get()->dbclassloader->get_component_for_class($val['link_name'])) {
                 $proplink = "<a href='{$prefix}__ais/help/{$linked_component}/mgdschemas/#{$val['link_name']}' title='{$linked_component}/{$val['link_name']}::{$val['link_target']}'>{$val['link_name']}:{$val['link_target']}</a>";
                 $classname = str_replace('_', '\\_', $val['link_name']);

lib/midcom/connection.php

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
 
         try {
             $user = new midgard_user($login_tokens);
-        } catch (mgd_exception $e) {
+        }
+        catch (mgd_exception $e) {
             return false;
         }
         if (!$trusted && !self::verify_password($password, $user->password)) {

Spacing +1 added lines, -1 removed lines

@@ -272,7 +272,7 @@
             if ($part === '') {
                 continue;
             }
-            if (    midcom::get()->config->get('theme')
+            if (midcom::get()->config->get('theme')
                  && !$args_started
                  && midcom_helper_misc::check_page_exists($part)) {
                 $page_style .= '/' . $part;

lib/midcom/helper/_dbfactory.php

Braces +8 added lines, -4 removed lines

@@ -44,7 +44,8 @@ 
     {
         try {
             $tmp = midgard_object_class::get_object_by_guid($guid);
-        } catch (mgd_exception $e) {
+        }
+        catch (mgd_exception $e) {
             debug_add('Loading object by GUID ' . $guid . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_INFO);
 
             throw new midcom_error_midgard($e, $guid);
@@ -237,7 +238,8 @@ 
                 $parent_data = [
                     $parent->__midcom_class_name__ => $parent_guid
                 ];
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $parent_data = [
                     '' => null
                 ];
@@ -251,7 +253,8 @@ 
 
         try {
             return $this->get_cached($classname, $parent_guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return null;
         }
     }
@@ -310,7 +313,8 @@ 
                 if ($the_object === null) {
                     try {
                         $the_object = $this->get_object_by_guid($object_guid);
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         return ['' => null];
                     }
                 }

Spacing +8 added lines, -8 removed lines

@@ -49,8 +49,8 @@ 
 
             throw new midcom_error_midgard($e, $guid);
         }
-        $person_class =  midcom::get()->config->get('person_class');
-        if (   get_class($tmp) == 'midgard_person'
+        $person_class = midcom::get()->config->get('person_class');
+        if (get_class($tmp) == 'midgard_person'
             && $person_class != 'midgard_person') {
             $tmp = new $person_class($guid);
         }
@@ -81,7 +81,7 @@ 
         }
         $object = new $classname($src);
         $cache[$classname][$object->guid] = $object;
-        $cache[$classname][$object->id] =& $cache[$classname][$object->guid];
+        $cache[$classname][$object->id] = & $cache[$classname][$object->guid];
         return $cache[$classname][$object->guid];
     }
 
@@ -184,14 +184,14 @@ 
             return true;
         }
 
-        if (   isset($object->__object)
+        if (isset($object->__object)
             && is_object($object->__object)
             && $object->__object instanceof $class) {
             // Decorator whose MgdSchema object matches
             return true;
         }
 
-        if (   isset($object->__mgdschema_class_name__)
+        if (isset($object->__mgdschema_class_name__)
             && $object->__mgdschema_class_name__ == $class) {
             // Decorator without object instantiated, check class match
             return true;
@@ -214,7 +214,7 @@ 
         $parent_data = $this->_get_parent_guid_cached($object->guid, $object);
 
         $parent_guid = current($parent_data);
-        if (   empty($parent_guid)
+        if (empty($parent_guid)
             || $parent_guid === $object->guid) {
             return null;
         }
@@ -417,11 +417,11 @@ 
                 ];
             }
 
-            if (   $parent_property
+            if ($parent_property
                 && $reflector->get_link_target($parent_property)) {
                 $target_class = $reflector->get_link_name($parent_property);
                 if ($target_class == 'midgard_person') {
-                    $person_class =  midcom::get()->config->get('person_class');
+                    $person_class = midcom::get()->config->get('person_class');
                     if ($person_class != 'midgard_person') {
                         $target_class = $person_class;
                     }

lib/midcom/core/group.php

Braces +2 added lines, -1 removed lines

@@ -94,7 +94,8 @@
             }
             try {
                 $this->_storage = new midgard_group($id);
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 debug_add('Tried to load a midcom_core_group, but got error ' . $e->getMessage(), MIDCOM_LOG_ERROR);
                 debug_print_r('Passed argument was:', $id);
                 throw new midcom_error($e->getMessage());