flack / openpsa

lib/org/openpsa/calendar/event.php

Spacing +6 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
 
     public function get_parent_guid_uncached()
     {
-        if (   $this->up
+        if ($this->up
             || $this->title != '__org_openpsa_calendar') {
             $root_event = org_openpsa_calendar_interface::find_root_event();
             if ($this->id != $root_event->id) {
@@ -141,7 +141,7 @@ 
         }
 
         //Check up
-        if (   !$this->up
+        if (!$this->up
             && $this->title != '__org_openpsa_calendar') {
             $root_event = org_openpsa_calendar_interface::find_root_event();
             $this->up = $root_event->id;
@@ -173,9 +173,9 @@ 
     private function _check_timerange()
     {
         //Force types
-        $this->start = (int)$this->start;
-        $this->end = (int)$this->end;
-        if (   !$this->start
+        $this->start = (int) $this->start;
+        $this->end = (int) $this->end;
+        if (!$this->start
             || !$this->end) {
             debug_add('Event must have start and end timestamps');
             midcom_connection::set_error(MGD_ERR_RANGE);
@@ -186,7 +186,7 @@ 
          * Force start and end seconds to 1 and 0 respectively
          * (to avoid stupid one second overlaps)
          */
-        $this->start = mktime(  date('G', $this->start),
+        $this->start = mktime(date('G', $this->start),
                                 date('i', $this->start),
                                 1,
                                 date('n', $this->start),

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;

Braces +6 added lines, -3 removed lines

@@ -260,10 +260,12 @@ 
                && !isset(self::$_nodes[$parent_id])) {
             try {
                 self::$_nodes[$parent_id] = $this->_loadNodeData($parent_id);
-            } catch (midcom_error_forbidden $e) {
+            }
+            catch (midcom_error_forbidden $e) {
                 debug_add("The Node {$parent_id} is invisible, could not satisfy the dependency chain to Node #{$node_id}", MIDCOM_LOG_WARN);
                 return $e->getCode();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return $e->getCode();
             }
 
@@ -287,7 +289,8 @@ 
 
         try {
             self::$_nodes[$node_id] = $this->_loadNodeData($topic_id);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $e->getCode();
         }
         return MIDCOM_ERROK;

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;
             }