flack / openpsa

lib/org/openpsa/sales/salesproject/deliverable.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
     {
         $this->calculate_price(false);
 
-        if (   $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+        if ($this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
             && $this->continuous == true) {
             $this->end = 0;
         } elseif ($this->end < $this->start) {
@@ -140,7 +140,7 @@ 
         $calculator->run($this);
         $cost = $calculator->get_cost();
         $price = $calculator->get_price();
-        if (   $price != $this->price
+        if ($price != $this->price
             || $cost != $this->cost) {
             $this->price = $price;
             $this->cost = $cost;
@@ -187,7 +187,7 @@ 
         $units = $agreement_hours['invoiceable'];
         $uninvoiceableUnits = $agreement_hours['reported'] - ($agreement_hours['invoiceable'] + $agreement_hours['invoiced']);
 
-        if (   $units != $this->units
+        if ($units != $this->units
             || $uninvoiceableUnits != $this->uninvoiceableUnits) {
             debug_add("agreement values have changed, setting units to " . $units . ", uninvoiceable: " . $uninvoiceableUnits);
             $this->units = $units;
@@ -242,7 +242,7 @@ 
 
     public function invoice()
     {
-        if (   $this->state >= self::STATE_INVOICED
+        if ($this->state >= self::STATE_INVOICED
             || $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) {
             return false;
         }

lib/org/openpsa/sales/salesproject.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
             }
         }
         $profit = $value - $cost;
-        if (   $this->value != $value
+        if ($this->value != $value
             || $this->profit != $profit) {
             $this->value = $value;
             $this->profit = $value - $cost;
@@ -220,12 +220,12 @@ 
 
     public function _on_updating()
     {
-        if (   $this->state != self::STATE_ACTIVE
+        if ($this->state != self::STATE_ACTIVE
             && !$this->end) {
             //Not active anymore and end not set, set it to now
             $this->end = time();
         }
-        if (   $this->end
+        if ($this->end
             && $this->state == self::STATE_ACTIVE) {
             //Returned to active state, clear the end marker.
             $this->end = 0;

Braces +4 added lines, -2 removed lines

@@ -120,14 +120,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/midcom/db/member.php

Braces +4 added lines, -2 removed lines

@@ -23,7 +23,8 @@ 
         try {
             $person = new midcom_db_person($this->uid);
             $grp = new midcom_db_group($this->gid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return 'Invalid membership record';
         }
@@ -40,7 +41,8 @@ 
         }
         try {
             $person = new midcom_db_person($this->uid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return;
         }
         midcom::get()->cache->invalidate($person->guid);

lib/midcom/db/person.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     {
         parent::__set($property, $value);
 
-        if (   $property == 'firstname'
+        if ($property == 'firstname'
             || $property == 'lastname'
             || $property == 'homepage'
             || $property == 'email') {

lib/midcom/helper/xsspreventer.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     {
         return preg_replace_callback(
             "%(<\s*)+(/\s*)+{$element}%i",
-            function ($matches) {
+            function($matches) {
                 return htmlentities($matches[0]);
             },
             $input

lib/midcom/helper/nav/main.php

Spacing +3 added lines, -3 removed lines

@@ -222,7 +222,7 @@ 
         if ($uplink == $root_id) {
             return true;
         }
-        if (   $uplink == false
+        if ($uplink == false
             || $uplink == -1) {
             return false;
         }
@@ -446,7 +446,7 @@ 
                     $entry = "<span class=\"{$current_class}\">{$entry}</span>";
                 }
             } else {
-                if (   !empty($data['napobject'][MIDCOM_NAV_GUID])
+                if (!empty($data['napobject'][MIDCOM_NAV_GUID])
                     && in_array($data['napobject'][MIDCOM_NAV_GUID], $skip_guids)) {
                     continue;
                 }
@@ -569,7 +569,7 @@ 
                     $id = "custom-{$key}";
 
                     $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}";
-                    if (   substr($entry[MIDCOM_NAV_URL], 0, 1) == '/'
+                    if (substr($entry[MIDCOM_NAV_URL], 0, 1) == '/'
                         || preg_match('|^https?://|', $entry[MIDCOM_NAV_URL])) {
                         $url = $entry[MIDCOM_NAV_URL];
                     }

Braces +2 added lines, -1 removed lines

@@ -296,7 +296,8 @@
         // the tree. This is, for example, used by the on-delete cache invalidation.
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }
         if (!empty($object)) {

lib/midcom/helper/formatter.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
             $variable = $parts[0] . '->' . $parts[1];
         }
 
-        if (    isset($variable_parts[1])
+        if (isset($variable_parts[1])
              && array_key_exists($variable_parts[1], self::$_filters)) {
             switch ($variable_parts[1]) {
                 case 's':

lib/midcom/helper/toolbar/node.php

Braces +2 added lines, -1 removed lines

@@ -88,7 +88,8 @@
                         $style = midcom_db_style::get_cached($style_id);
                         $styleeditor_url = midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$style->guid}/";
                         $enabled = true;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                     }
                 }

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
         }
         $buttons = [];
         $workflow = new midcom\workflow\datamanager;
-        if (   $this->topic->can_do('midgard:update')
+        if ($this->topic->can_do('midgard:update')
             && $this->topic->can_do('midcom.admin.folder:topic_management')) {
             $buttons[] = $workflow->get_button("__ais/folder/edit/", [
                 MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('edit folder', 'midcom.admin.folder'),
@@ -49,7 +49,7 @@ 
             ]);
         }
 
-        if (   $urltopic->can_do('midgard:update')
+        if ($urltopic->can_do('midgard:update')
             && $urltopic->can_do('midcom.admin.folder:topic_management')) {
             // Allow to move other than root folder
             if ($urltopic->guid !== midcom::get()->config->get('midcom_root_topic_guid')) {
@@ -61,7 +61,7 @@ 
             }
         }
 
-        if (   $this->topic->can_do('midgard:update')
+        if ($this->topic->can_do('midgard:update')
             && $this->topic->can_do('midcom.admin.folder:topic_management')) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => "__ais/folder/order/",
@@ -78,7 +78,7 @@ 
             ];
         }
         $buttons = array_merge($buttons, $this->get_approval_controls($this->topic, false));
-        if (   $this->topic->can_do('midcom.admin.folder:template_management')
+        if ($this->topic->can_do('midcom.admin.folder:template_management')
             && midcom::get()->auth->can_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin')) {
             $enabled = false;
             $styleeditor_url = '';
@@ -103,7 +103,7 @@ 
             ];
         }
 
-        if (   $this->topic->can_do('midgard:create')
+        if ($this->topic->can_do('midgard:create')
             && $this->topic->can_do('midcom.admin.folder:topic_management')) {
             $buttons[] = $workflow->get_button("__ais/folder/create/", [
                 MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('create subfolder', 'midcom.admin.folder'),
@@ -111,7 +111,7 @@ 
                 MIDCOM_TOOLBAR_ACCESSKEY => 'f',
             ]);
         }
-        if (   $urltopic->guid !== midcom::get()->config->get('midcom_root_topic_guid')
+        if ($urltopic->guid !== midcom::get()->config->get('midcom_root_topic_guid')
             && $urltopic->can_do('midgard:delete')
             && $urltopic->can_do('midcom.admin.folder:topic_management')) {
             $workflow = new midcom\workflow\delete(['object' => $urltopic, 'recursive' => true]);

lib/midcom/style/midcom_helper_datamanager2_unlock.php

Braces +2 added lines, -1 removed lines

@@ -4,7 +4,8 @@
 try {
     $person = new midcom_db_person($metadata->locker);
     $name = $person->name;
-} catch (midcom_error $e) {
+}
+catch (midcom_error $e) {
     $name = $this->data['handler']->_l10n_midcom->get('unknown user');
     $e->log();
 }