flack / openpsa

lib/midcom/helper/nav/backend.php

Spacing +6 added lines, -6 removed lines

@@ -256,7 +256,7 @@ 
 
         $lastgoodnode = null;
 
-        while (   $parent_id
+        while ($parent_id
                && !isset(self::$_nodes[$parent_id])) {
             try {
                 self::$_nodes[$parent_id] = $this->_loadNodeData($parent_id);
@@ -273,14 +273,14 @@ 
 
             $parent_id = $this->_get_parent_id($topic_id);
 
-            if (   $up
+            if ($up
                 && $up_id = array_pop($up_ids)
                 && $up_id != $parent_id) {
                 $parent_id = $up_id;
             }
         }
 
-        if (   !is_null($lastgoodnode)
+        if (!is_null($lastgoodnode)
             && (empty($this->_lastgoodnode) || $this->_lastgoodnode < 0)) {
             $this->_lastgoodnode = $lastgoodnode;
         }
@@ -316,7 +316,7 @@ 
     {
         $node = new midcom_helper_nav_node($this, $topic_id, $up);
 
-        if (    !$node->is_object_visible()
+        if (!$node->is_object_visible()
              || !$node->is_readable_by($this->_user_id)) {
             throw new midcom_error_forbidden('Node cannot be read or is invisible');
         }
@@ -361,7 +361,7 @@ 
         });
         foreach ($leaves as $id => $leaf) {
             $this->_leaves[$id] = $leaf;
-            $this->_loaded_leaves[$node->id][$id] =& $this->_leaves[$id];
+            $this->_loaded_leaves[$node->id][$id] = & $this->_leaves[$id];
         }
     }
 
@@ -447,7 +447,7 @@ 
             }
             $subnode_id = $this->_nodeid($id, $up);
 
-            if (   !$show_noentry
+            if (!$show_noentry
                 && self::$_nodes[$subnode_id]->noentry) {
                 // Hide "noentry" items
                 continue;

lib/midcom/helper/nav/node.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     public function is_readable_by($user_id)
     {
-        return (   !$user_id
+        return (!$user_id
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, 'midcom_db_topic', $user_id));
     }
 

lib/midcom/admin/folder/handler/edit.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
                 $this->_controller = midcom_helper_datamanager2_controller::create('create');
                 $this->_controller->schemadb = $schemadb;
                 $this->_controller->schemaname = 'default';
-                $this->_controller->callback_object =& $this;
+                $this->_controller->callback_object = & $this;
 
                 // Suggest to create the same type of a folder as the parent is
                 $component_suggestion = $this->_topic->component;
@@ -101,7 +101,7 @@ 
 
         if (!$this->_new_topic->create()) {
             debug_print_r('We operated on this object:', $this->_new_topic);
-            throw new midcom_error('Failed to create a new topic, cannot continue. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new topic, cannot continue. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_new_topic;

lib/midcom/core/service/implementation/urlparsertopic.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
                 return false;
             }
             // No topics matching path, check for attachments
-            $att_qb =  midcom_db_attachment::new_query_builder();
+            $att_qb = midcom_db_attachment::new_query_builder();
             $att_qb->add_constraint('name', '=', $this->argv[0]);
             $att_qb->add_constraint('parentguid', '=', $this->get_current_object()->guid);
             if ($att_qb->count() == 0) {

lib/midgard/admin/asgard/handler/object/manage.php

Spacing +14 added lines, -14 removed lines

@@ -167,7 +167,7 @@ 
 
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_object, 'object');
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for object {$this->_object->guid}.");
@@ -184,11 +184,11 @@ 
                 return $this->_prepare_relocate($this->_object);
 
             case 'edit':
-                $qf =& $this->_controller->formmanager->form;
-                if (   $qf->isSubmitted()
+                $qf = & $this->_controller->formmanager->form;
+                if ($qf->isSubmitted()
                     && !$qf->validate()) {
                     foreach ($qf->_errors as $field => $error) {
-                        $element =& $qf->getElement($field);
+                        $element = & $qf->getElement($field);
                         $message = sprintf($this->_l10n->get('validation error in field %s: %s'), $element->getLabel(), $error);
                         midcom::get()->uimessages->add(
                             $this->_l10n->get('midgard.admin.asgard'),
@@ -231,7 +231,7 @@ 
 
         if (!$this->_new_object->create()) {
             debug_print_r('We operated on this object:', $this->_new_object);
-            throw new midcom_error('Failed to create a new object. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new object. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_new_object;
@@ -260,7 +260,7 @@ 
         midcom::get()->auth->require_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin');
 
         $data['defaults'] = array();
-        if (   $handler_id == '____mfa-asgard-object_create_toplevel'
+        if ($handler_id == '____mfa-asgard-object_create_toplevel'
             || $handler_id == '____mfa-asgard-object_create_chooser') {
             midcom::get()->auth->require_user_do('midgard:create', null, $this->_new_type);
 
@@ -278,9 +278,9 @@ 
         }
 
         $this->_controller = midcom_helper_datamanager2_controller::create('create');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->schema = 'object';
-        $this->_controller->callback_object =& $this;
+        $this->_controller->callback_object = & $this;
         $this->_controller->defaults = $this->_get_defaults();
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
@@ -321,11 +321,11 @@ 
             $parent_property = null;
             $new_type_reflector = midcom_helper_reflector::get($this->_new_type);
             $link_properties = $new_type_reflector->get_link_properties();
-            $type_to_link_to =  midcom_helper_reflector::class_rewrite(get_class($this->_object));
+            $type_to_link_to = midcom_helper_reflector::class_rewrite(get_class($this->_object));
             foreach ($link_properties as $child_property => $link) {
                 $linked_type = midcom_helper_reflector::class_rewrite($link['class']);
                 if (midcom_helper_reflector::is_same_class($linked_type, $type_to_link_to)
-                    || (   $link['type'] == MGD_TYPE_GUID
+                    || ($link['type'] == MGD_TYPE_GUID
                         && is_null($link['class']))) {
                     $parent_property = $link['target'];
                     break;
@@ -338,7 +338,7 @@ 
         }
 
         // Allow setting defaults from query string, useful for things like "create event for today" and chooser
-        if (   isset($_GET['defaults'])
+        if (isset($_GET['defaults'])
             && is_array($_GET['defaults'])) {
             $get_defaults = array_intersect_key($_GET['defaults'], $this->_schemadb['object']->fields);
             $defaults = array_merge($defaults, array_map('trim', $get_defaults));
@@ -356,7 +356,7 @@ 
     {
         if ($handler_id == '____mfa-asgard-object_create_chooser') {
             midcom_show_style('midgard_admin_asgard_popup_header');
-            if (   $this->_new_object
+            if ($this->_new_object
                 || isset($data['cancelled'])) {
                 $data['jsdata'] = $this->_object_to_jsdata($this->_new_object);
                 midcom_show_style('midgard_admin_asgard_object_create_after');
@@ -407,7 +407,7 @@ 
             $url = $type;
 
             $class_extends = $this->_config->get('class_extends');
-            if (   is_array($class_extends)
+            if (is_array($class_extends)
                 && array_key_exists($type, $class_extends)) {
                 $url = $class_extends[$type];
             }
@@ -506,7 +506,7 @@ 
 
         // Load the nullstorage controller
         $this->_controller = midcom_helper_datamanager2_controller::create('nullstorage');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
 
         if (!$this->_controller->initialize()) {
             throw new midcom_error('Failed to initialize the controller');

lib/midgard/admin/asgard/schemadb.php

Spacing +8 added lines, -8 removed lines

@@ -162,7 +162,7 @@ 
 
     private function _filter_schema_fields($key)
     {
-        if (   $key == 'metadata'
+        if ($key == 'metadata'
             || in_array($key, $this->_config->get('object_skip_fields'))) {
             return false;
         }
@@ -172,7 +172,7 @@ 
 
     private function _add_string_field($key, $type)
     {
-        if (   $key == 'component'
+        if ($key == 'component'
             && $type == 'midcom_db_topic') {
             $this->_add_component_dropdown($key);
             return;
@@ -221,7 +221,7 @@ 
 
     private function _add_int_field($key)
     {
-        if (   $key == 'start'
+        if ($key == 'start'
             || $key == 'end'
             || $key == 'added'
             || $key == 'date') {
@@ -265,8 +265,8 @@ 
                 $height = 30;
 
                 // Check the user preference and configuration
-                if (   midgard_admin_asgard_plugin::get_preference('tinymce_enabled')
-                    || (   midgard_admin_asgard_plugin::get_preference('tinymce_enabled') !== '0'
+                if (midgard_admin_asgard_plugin::get_preference('tinymce_enabled')
+                    || (midgard_admin_asgard_plugin::get_preference('tinymce_enabled') !== '0'
                         && $this->_config->get('tinymce_enabled'))) {
                     $widget = 'tinymce';
                 }
@@ -279,8 +279,8 @@ 
                 $height = 30;
 
                 // Check the user preference and configuration
-                if (   midgard_admin_asgard_plugin::get_preference('codemirror_enabled')
-                    || (   midgard_admin_asgard_plugin::get_preference('codemirror_enabled') !== '0'
+                if (midgard_admin_asgard_plugin::get_preference('codemirror_enabled')
+                    || (midgard_admin_asgard_plugin::get_preference('codemirror_enabled') !== '0'
                         && $this->_config->get('codemirror_enabled'))) {
                     $widget = 'codemirror';
                 }
@@ -542,7 +542,7 @@ 
         if ($score1 > $score2) {
             return 1;
         }
-        if (   $score1 < 3
+        if ($score1 < 3
             || $score1 > 6) {
             return strnatcmp($first, $second);
         }

lib/net/nehmer/blog/handler/archive.php

Spacing +8 added lines, -8 removed lines

@@ -119,7 +119,7 @@ 
      */
     private function _compute_welcome_posting_count($start, $end)
     {
-        $data =& $this->_request_data;
+        $data = & $this->_request_data;
         $qb = midcom_db_article::new_query_builder();
 
         $qb->add_constraint('metadata.published', '>=', $start->format('Y-m-d H:i:s'));
@@ -143,8 +143,8 @@ 
         $year_data = array();
         $first_post = $this->_compute_welcome_first_post();
         $this->_request_data['first_post'] = $first_post;
-        $this->_request_data['total_count'] =& $total_count;
-        $this->_request_data['year_data'] =& $year_data;
+        $this->_request_data['total_count'] = & $total_count;
+        $this->_request_data['year_data'] = & $year_data;
         if (!$first_post) {
             return;
         }
@@ -278,7 +278,7 @@ 
         switch ($handler_id) {
             case 'archive-year-category':
                 $data['category'] = trim(strip_tags($args[1]));
-                if (   isset($data['schemadb']['default']->fields['categories'])
+                if (isset($data['schemadb']['default']->fields['categories'])
                     && array_key_exists('allow_multiple', $data['schemadb']['default']->fields['categories']['type_config'])
                     && !$data['schemadb']['default']->fields['categories']['type_config']['allow_multiple']) {
                     $qb->add_constraint('extra1', '=', (string) $data['category']);
@@ -373,15 +373,15 @@ 
             throw new midcom_error_notfound("The year '{$year}' is not a valid year identifier.");
         }
 
-        if (   $month < 1
+        if ($month < 1
             || $month > 12) {
             throw new midcom_error_notfound("The year {$month} is not a valid year identifier.");
         }
 
         $now = new DateTime();
-        $this->_start = new DateTime("{$year}-" . sprintf('%02d', $month) .  "-01 00:00:00");
+        $this->_start = new DateTime("{$year}-" . sprintf('%02d', $month) . "-01 00:00:00");
         if ($this->_start > $now) {
-            throw new midcom_error_notfound("The month '{$year}-" . sprintf('%02d', $month) .  "' is in the future, no archive available.");
+            throw new midcom_error_notfound("The month '{$year}-" . sprintf('%02d', $month) . "' is in the future, no archive available.");
         }
 
         if ($month == 12) {
@@ -392,7 +392,7 @@ 
             $endmonth = $month + 1;
         }
 
-        $this->_end = new DateTime("{$endyear}-" . sprintf('%02d', $endmonth) .  "-01 00:00:00");
+        $this->_end = new DateTime("{$endyear}-" . sprintf('%02d', $endmonth) . "-01 00:00:00");
     }
 
     /**

lib/net/nehmer/static/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
 
         $config = $this->get_config_for_topic($topic);
-        if (   $object->name == 'index'
+        if ($object->name == 'index'
             && !$config->get('autoindex')) {
             return '';
         }

lib/net/nehmer/blog/handler/view.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
             ));
         }
 
-        if (   $this->_article->topic === $this->_topic->id
+        if ($this->_article->topic === $this->_topic->id
             && $this->_article->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', array('object' => $this->_article));
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -97,7 +97,7 @@ 
 
         if ($this->_config->get('enable_ajax_editing')) {
             $this->_request_data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-            $this->_request_data['controller']->schemadb =& $this->_request_data['schemadb'];
+            $this->_request_data['controller']->schemadb = & $this->_request_data['schemadb'];
             $this->_request_data['controller']->set_storage($this->_article);
             $this->_request_data['controller']->process_ajax();
         }
@@ -105,7 +105,7 @@ 
         if ($this->_config->get('comments_enable')) {
             if ($comments_node = $this->_seek_comments()) {
                 $this->_request_data['comments_url'] = $comments_node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}";
-                if (   $this->_topic->can_do('midgard:update')
+                if ($this->_topic->can_do('midgard:update')
                     && $this->_topic->can_do('net.nehmer.comments:moderation')) {
                     net_nehmer_comments_viewer::add_head_elements();
                 }