flack / openpsa

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

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,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) {
             $this->end = 0;
         } elseif ($this->end < $this->start) {
@@ -169,7 +169,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;
@@ -216,7 +216,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;
@@ -270,7 +270,7 @@ 
 
     public function invoice() : bool
     {
-        if (   $this->state >= self::STATE_INVOICED
+        if ($this->state >= self::STATE_INVOICED
             || $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) {
             return false;
         }

lib/midgard/admin/asgard/style/ASGARD_ROOT.php

Braces +4 added lines, -2 removed lines

@@ -122,7 +122,8 @@ 
                             try {
                                 $creator = new midcom_db_person($view_metadata->get('creator'));
                                 $creator_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$creator->guid}/\">$creator->name</a>";
-                            } catch (midcom_error $e) {
+                            }
+                            catch (midcom_error $e) {
                                 $creator_string = $l10n->get('unknown person');
                             }
                             $created = (int) $view_metadata->get('created');
@@ -135,7 +136,8 @@ 
                                 try {
                                     $editor = new midcom_db_person($view_metadata->get('revisor'));
                                     $editor_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$editor->guid}/\">$editor->name</a>";
-                                } catch (midcom_error $e) {
+                                }
+                                catch (midcom_error $e) {
                                     $editor_string = $l10n->get('unknown person');
                                 }
 

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
                             $edited = (int) $view_metadata->get('revised');
                             $revision = $view_metadata->get('revision');
-                            if (   $revision > 1
+                            if ($revision > 1
                                 && $edited != $created) {
                                 try {
                                     $editor = new midcom_db_person($view_metadata->get('revisor'));

lib/midcom/services/auth/main.php

Braces +2 added lines, -1 removed lines

@@ -575,7 +575,8 @@
                     $param = $param->__object;
                 }
                 $this->_group_cache[$id] = new midcom_core_group($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Group with identifier {$id} could not be loaded: " . $e->getMessage(), MIDCOM_LOG_WARN);
                 $this->_group_cache[$id] = null;
             }

Spacing +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
             return true;
         }
         if ($user === null) {
-            $user =& $this->user;
+            $user = & $this->user;
         }
 
         if ($user == 'EVERYONE') {

lib/midcom/services/auth/backend.php

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
                     $param = $param->__object;
                 }
                 $this->_user_cache[$id] = new midcom_core_user($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Keep it silent while missing user object can mess here
                 $this->_user_cache[$id] = null;
             }

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
             return null;
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $data['clientip'] != $request->getClientIp()) {
             debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}.");
@@ -114,7 +114,7 @@ 
             return null;
         }
 
-        if (   !$this->check_timestamp($data['timestamp'], $user)
+        if (!$this->check_timestamp($data['timestamp'], $user)
             || !$this->authenticate($user->username, '', true)) {
             $this->logout($user);
             return null;

lib/midgard/admin/asgard/navigation.php

Spacing +13 added lines, -13 removed lines

@@ -43,7 +43,7 @@ 
         parent::__construct();
 
         $this->_object = $object;
-        $this->_request_data =& $request_data;
+        $this->_request_data = & $request_data;
 
         $this->root_types = midcom_helper_reflector_tree::get_root_classes();
 
@@ -59,7 +59,7 @@ 
             // we go through the path bottom up and show the first root type we find
             foreach (array_reverse($this->_object_path) as $node) {
                 foreach ($this->root_types as $root_type) {
-                    if (   is_a($node, $root_type)
+                    if (is_a($node, $root_type)
                         || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) {
                         $this->expanded_root_types[] = $root_type;
                         break;
@@ -71,7 +71,7 @@ 
 
     protected function _is_collapsed(string $type, int $total) : bool
     {
-        return (   $total > $this->_config->get('max_navigation_entries')
+        return ($total > $this->_config->get('max_navigation_entries')
                 && empty($_GET['show_all_' . $type]));
     }
 
@@ -87,7 +87,7 @@ 
         foreach ($ref->get_child_classes() as $class) {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked())) {
                 continue;
             }
@@ -133,7 +133,7 @@ 
     {
         $qb = $ref->_root_objects_qb();
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked())) {
             return;
         }
@@ -211,7 +211,7 @@ 
         }
 
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-        if (   $selected
+        if ($selected
             || $autoexpand) {
             $this->_list_child_elements($object, $level + 1);
         }
@@ -231,7 +231,7 @@ 
                 continue;
             }
 
-            if (   method_exists($class, 'navigation')
+            if (method_exists($class, 'navigation')
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}")) {
                 $this->_request_data['expanded'] = true;
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
@@ -265,13 +265,13 @@ 
         if ($this->_is_selected($object)) {
             $css_class .= ' selected';
         }
-        if (   is_object($this->_object)
-            && (   $object->guid == $this->_object->guid
-                || (   is_a($this->_object, midcom_db_parameter::class)
+        if (is_object($this->_object)
+            && ($object->guid == $this->_object->guid
+                || (is_a($this->_object, midcom_db_parameter::class)
                     && $object->guid == $this->_object->parentguid))) {
             $css_class .= ' current';
         }
-        if ( !$object->can_do('midgard:update')) {
+        if (!$object->can_do('midgard:update')) {
             $css_class .= ' readonly';
         }
         return $css_class;
@@ -314,7 +314,7 @@ 
 
         // If the regular expression has been set, check which types should be shown
         if ($regexp !== '//') {
-            $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) {
+            $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) {
                 return preg_match($regexp, $root_type) == $exclude;
             }, ARRAY_FILTER_USE_KEY);
         }
@@ -344,7 +344,7 @@ 
          * click if nothing is expanded
          */
         $types_shown = false;
-        if (    !empty($expanded_types)
+        if (!empty($expanded_types)
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') {
             $this->_draw_select_navigation();
             $types_shown = true;

lib/midgard/admin/asgard/plugin.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
 
         $parent = $object->get_parent();
 
-        if (   is_a($object, midcom_db_parameter::class)
+        if (is_a($object, midcom_db_parameter::class)
             && !empty($parent->guid)) {
             // Add "parameters" list to breadcrumb if we're in a param
             $breadcrumb[] = [
@@ -174,7 +174,7 @@ 
         }
 
         $i = 0;
-        while (   !empty($parent->guid)
+        while (!empty($parent->guid)
                && $i < 10) {
             $i++;
             $parent_reflector = midcom_helper_reflector::get($parent);

lib/midgard/admin/asgard/schemadb.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
     protected function add_string_field(string $key, string $type)
     {
-        if (   $key == 'component'
+        if ($key == 'component'
             && $type == midcom_db_topic::class) {
             $this->_add_component_dropdown($key);
             return;
@@ -134,12 +134,12 @@ 
         parent::add_longtext_field($key);
 
         // Check the user preference and configuration
-        if (   in_array($key, ['content', 'description'])
+        if (in_array($key, ['content', 'description'])
             && midgard_admin_asgard_plugin::get_preference('tinymce_enabled')) {
             $this->schema['fields'][$key]['widget'] = 'tinymce';
         }
 
-        if (   in_array($key, ['value', 'code'])
+        if (in_array($key, ['value', 'code'])
             && midgard_admin_asgard_plugin::get_preference('codemirror_enabled')) {
             $this->schema['fields'][$key]['widget'] = 'codemirror';
         }
@@ -257,7 +257,7 @@ 
         if ($score1 > $score2) {
             return 1;
         }
-        if (   $score1 < 3
+        if ($score1 < 3
             || $score1 > 6) {
             return strnatcmp($first, $second);
         }

lib/midgard/admin/asgard/handler/component/configuration.php

Spacing +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
     {
         $success = true;
         foreach ($this->_request_data['config']->_global as $global_key => $global_value) {
-            if (   isset($config[$global_key])
+            if (isset($config[$global_key])
                 && $config[$global_key] != $global_value) {
                 continue;
                 // Skip the ones we will set next
@@ -290,7 +290,7 @@ 
         }
 
         foreach ($config as $key => $value) {
-            if (   is_array($value)
+            if (is_array($value)
                 || is_object($value)) {
                 /**
                  * See http://trac.midgard-project.org/ticket/1442

lib/midgard/admin/asgard/schemadb/config.php

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
                 $fields[$key] = $this->detect_schema($key, $value);
             }
 
-            if (   !isset($this->config->_local[$key])
+            if (!isset($this->config->_local[$key])
                 || $this->config->_local[$key] == $this->config->_global[$key]) {
                 // No local configuration setting, note to user that this is the global value
                 $fields[$key]['title'] = $schema->get_l10n()->get($fields[$key]['title']);
-                $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') .")</span>";
+                $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') . ")</span>";
             }
         }