flack / openpsa

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/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();
                 }

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
         if ($this->_config->get('comments_topic')) {
             try {
                 $comments_topic = new midcom_db_topic($this->_config->get('comments_topic'));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
 

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

Spacing +6 added lines, -6 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}/");
@@ -115,13 +115,13 @@ 
 
         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();
         }
 
         $arg = $this->_article->name ?: $this->_article->guid;
-        if (   $arg != 'index'
+        if ($arg != 'index'
             && $this->_config->get('hide_navigation')) {
             $this->add_breadcrumb("{$arg}/", $this->_article->title);
         }
@@ -131,13 +131,13 @@ 
         midcom::get()->metadata->set_request_metadata($this->_article->metadata->revised, $this->_article->guid);
         $this->bind_view_to_object($this->_article, $this->_datamanager->schema->name);
 
-        if (   $this->_config->get('indexinnav')
+        if ($this->_config->get('indexinnav')
             || $this->_config->get('autoindex')
             || $this->_article->name != 'index') {
             $this->set_active_leaf($this->_article->id);
         }
 
-        if (   $this->_config->get('folder_in_title')
+        if ($this->_config->get('folder_in_title')
             && $this->_topic->extra != $this->_article->title) {
             midcom::get()->head->set_pagetitle("{$this->_topic->extra}: {$this->_article->title}");
         } else {
@@ -191,7 +191,7 @@ 
      */
     public function _show_view($handler_id, array &$data)
     {
-        if (   $this->_config->get('enable_ajax_editing')
+        if ($this->_config->get('enable_ajax_editing')
             && isset($data['controller'])) {
             // For AJAX handling it is the controller that renders everything
             $this->_request_data['view_article'] = $this->_request_data['controller']->get_content_html();

lib/midcom/helper/datamanager2/qfrule/checkjsdate.php

Spacing +3 added lines, -3 removed lines

@@ -40,13 +40,13 @@ 
          * if the field has the default value or is empty, the user gets a free pass
          * (if the field is required, this is caught by a separate rule)
          */
-        if (   $date == ""
+        if ($date == ""
             || $date == "0000-00-00"
             || $date == "0000-00-00 00:00:00") {
             debug_add("value {$date} is assumed to be intentionally blank");
             return true;
         }
-        if (    preg_match("/^\d{4}-\d{2}-\d{2}/", $date) == 0
+        if (preg_match("/^\d{4}-\d{2}-\d{2}/", $date) == 0
              && preg_match("/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/", $date) == 0) {
             debug_add("value {$date} is incorrectly formatted");
             return false;
@@ -64,7 +64,7 @@ 
 
     private function _sanitize_time($value, $options)
     {
-        if (   empty($value[0][$options . '_hours'])
+        if (empty($value[0][$options . '_hours'])
             && empty($value[0][$options . '_minutes'])
             && empty($value[0][$options . '_seconds'])) {
             return '';