flack / openpsa

lib/midcom/core/querybuilder.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 
         $this->_add_visibility_checks();
 
-        if (   empty($this->_limit)
+        if (empty($this->_limit)
             && empty($this->_offset)) {
             // No point to do windowing
             $newresult = $this->_execute_and_check_privileges();
@@ -150,7 +150,7 @@ 
         }
         $this->_query->set_limit($window_size);
 
-        while (    ($resultset = $this->_execute_and_check_privileges())
+        while (($resultset = $this->_execute_and_check_privileges())
                 || $this->denied > $denied) {
             $size = count($resultset);
             $total_size = $size + ($this->denied - $denied);

Braces +2 added lines, -1 removed lines

@@ -57,7 +57,8 @@
             $classname = $this->_real_class;
             try {
                 $result[] = new $classname($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 if ($e->getCode() == MIDCOM_ERRFORBIDDEN) {
                     $this->denied++;
                 }

lib/net/nemein/rss/manage.php

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
     {
         try {
             $viewer->register_plugin_namespace('__feeds', ['rss' => ['class' => __CLASS__]]);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
     }

lib/net/nehmer/blog/navigation.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 
         // Hide the articles that have the publish time in the future and if
         // the user is not administrator
-        if (   $this->_config->get('enable_scheduled_publishing')
+        if ($this->_config->get('enable_scheduled_publishing')
             && !midcom::get()->auth->admin) {
             // Show the article only if the publishing time has passed or the viewer
             // is the author
@@ -83,14 +83,14 @@ 
 
     private function _add_pseudo_leaves(array &$leaves)
     {
-        if (   $this->_config->get('archive_enable')
+        if ($this->_config->get('archive_enable')
             && $this->_config->get('archive_in_navigation')) {
             $leaves["{$this->_topic->id}_ARCHIVE"] = [
                 MIDCOM_NAV_URL => "archive/",
                 MIDCOM_NAV_NAME => $this->_l10n->get('archive'),
             ];
         }
-        if (   $this->_config->get('rss_enable')
+        if ($this->_config->get('rss_enable')
             && $this->_config->get('feeds_in_navigation')) {
             $leaves[self::LEAFID_FEEDS] = [
                 MIDCOM_NAV_URL => "feeds/",
@@ -98,7 +98,7 @@ 
             ];
         }
 
-        if (   $this->_config->get('categories_in_navigation')
+        if ($this->_config->get('categories_in_navigation')
             && $this->_config->get('categories') != '') {
             $categories = explode(',', $this->_config->get('categories'));
             foreach ($categories as $category) {
@@ -109,14 +109,14 @@ 
             }
         }
 
-        if (   $this->_config->get('archive_years_in_navigation')
+        if ($this->_config->get('archive_years_in_navigation')
             && $this->_config->get('archive_years_enable')) {
             $qb = midcom_db_article::new_query_builder();
             $qb->add_constraint('topic', '=', $this->_topic->id);
 
             // Hide the articles that have the publish time in the future and if
             // the user is not administrator
-            if (   $this->_config->get('enable_scheduled_publishing')
+            if ($this->_config->get('enable_scheduled_publishing')
                 && !midcom::get()->auth->admin) {
                 // Show the article only if the publishing time has passed or the viewer
                 // is the author

lib/net/nehmer/static/viewer.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             }
         }
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $buttons[] = $workflow->get_button('config/', [
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),

lib/midgard/admin/asgard/stylehelper.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
                 'midcom' => [
                     'style-init' => '',
                     'style-finish' => '',
-                 ]
+                    ]
             ],
             'nodes' => [],
         ];

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct(array &$data)
     {
-        $this->_data =& $data;
+        $this->_data = & $data;
         midcom::get()->head->enable_jquery_ui(['accordion']);
     }
 
@@ -33,11 +33,11 @@ 
             return;
         }
 
-        if (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
-            && (   $this->_data['handler_id'] !== 'object_create'
+        if (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
+            && ($this->_data['handler_id'] !== 'object_create'
                 || $this->_data['current_type'] == 'midgard_element')) {
             $help_element = $this->_get_help_style_elementnames($this->_data['object']);
-        } elseif (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
+        } elseif (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
                   && $this->_data['handler_id'] !== 'object_create') {
             $help_element = $this->_get_help_element();
         }
@@ -49,7 +49,7 @@ 
 
     private function _get_help_element()
     {
-        if (   empty($this->_data['object']->name)
+        if (empty($this->_data['object']->name)
             || empty($this->_data['object']->style)) {
             // We cannot help with empty elements
             return;

lib/midcom/core/dbaproxy.php

Braces +2 added lines, -1 removed lines

@@ -62,7 +62,8 @@
         try {
             $this->__object = call_user_func([$this->__midcom_class_name__, 'get_cached'], $this->__identifier);
             return true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         return false;

lib/midcom/helper/reflector/tree.php

Spacing +5 added lines, -5 removed lines

@@ -158,7 +158,7 @@ 
     private static function _check_permissions($deleted)
     {
         // PONDER: Check for some generic user privilege instead  ??
-        if (   $deleted
+        if ($deleted
             && !midcom_connection::is_admin()
             && !midcom::get()->auth->is_component_sudo()) {
             debug_add('Non-admins are not allowed to list deleted objects', MIDCOM_LOG_ERROR);
@@ -248,7 +248,7 @@ 
                     'target' => $ref->get_link_target($field)
                 ];
                 $linked_class = $ref->get_link_name($field);
-                if (   empty($linked_class)
+                if (empty($linked_class)
                     && $info['type'] === MGD_TYPE_GUID) {
                     // Guid link without class specification, valid for all classes
                     if (empty($info['target'])) {
@@ -298,7 +298,7 @@ 
             $field_type = $field_data['type'];
             $field = $field_data['name'];
 
-            if (   !$field_target
+            if (!$field_target
                 || !isset($for_object->$field_target)) {
                 // Why return false ???
                 return false;
@@ -414,7 +414,7 @@ 
             $parent_property = midgard_object_class::get_property_parent($schema_type);
             $up_property = midgard_object_class::get_property_up($schema_type);
 
-            if (   !$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
+            if (!$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
                 && !$this->_resolve_child_classes_links_back($up_property, $schema_type, $this->mgdschema_class)) {
                 continue;
             }
@@ -439,7 +439,7 @@ 
 
         $ref = new midgard_reflection_property($prospect_type);
         $link_class = $ref->get_link_name($property);
-        if (   empty($link_class)
+        if (empty($link_class)
             && $ref->get_midgard_type($property) === MGD_TYPE_GUID) {
             return true;
         }

Braces +2 added lines, -1 removed lines

@@ -553,7 +553,8 @@
         $tree = [];
         try {
             $children = self::get_child_objects($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $tree;
         }
 

lib/midcom/helper/toolbar/view.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
             ]);
         }
 
-        if (   midcom::get()->config->get('midcom_services_rcs_enable')
+        if (midcom::get()->config->get('midcom_services_rcs_enable')
             && $object->can_do('midgard:update')
             && $object->_use_rcs) {
             $buttons[] = [
@@ -84,7 +84,7 @@ 
             }
 
             $icon = 'stock-icons/16x16/page-' . $icontype . '.png';
-            if (   !midcom::get()->config->get('show_hidden_objects')
+            if (!midcom::get()->config->get('show_hidden_objects')
                 && !$object->metadata->is_visible()) {
                 // Take scheduling into account
                 $icon = 'stock-icons/16x16/page-' . $icontype . '-notpublished.png';

lib/fi/protie/navigation/main.php

Spacing +7 added lines, -7 removed lines

@@ -338,8 +338,8 @@ 
         $classes = [];
 
         if ($child[MIDCOM_NAV_TYPE] === 'node') {
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
-                && (   !$this->_nap->get_current_leaf()
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
+                && (!$this->_nap->get_current_leaf()
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf()))) {
                 $classes[] = $this->css_active;
             }
@@ -386,7 +386,7 @@ 
         }
 
         // Add information about the object's status
-        if (   $this->object_status_to_class
+        if ($this->object_status_to_class
             && isset($item[MIDCOM_NAV_OBJECT])
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT])) {
             $classes[] = $css_status_class;
@@ -405,12 +405,12 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}\"{$link_class}>{$item[MIDCOM_NAV_NAME]}</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
             && !$this->show_only_current
-            && (   $this->list_levels === 0
+            && ($this->list_levels === 0
                 || $this->_level < $this->list_levels)) {
-            if (   $this->follow_all
-                || (   $this->follow_selected
+            if ($this->follow_all
+                || ($this->follow_selected
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true))) {
                 $this->_level++;
                 $this->_list_child_elements($item[MIDCOM_NAV_ID]);