flack / openpsa

lib/midcom/core/collector.php

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
         $counter = 0;
 
         foreach ($result as $object_guid => $empty_copy) {
-            if (    $this->_user_id
+            if ($this->_user_id
                 && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $object_guid, $classname, $this->_user_id)) {
                 debug_add("Failed to load result, read privilege on {$object_guid} not granted for the current user.", MIDCOM_LOG_INFO);
                 continue;
@@ -145,7 +145,7 @@ 
                 if ($counter <= $this->_offset) {
                     continue;
                 }
-                if (   $this->_limit
+                if ($this->_limit
                     && $counter > ($this->_offset + $this->_limit)) {
                     break;
                 }
@@ -223,7 +223,7 @@ 
 
     public function get_subkey($key, $property)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
@@ -233,7 +233,7 @@ 
 
     public function get($key)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;

lib/midcom/application.php

Spacing +5 added lines, -5 removed lines

@@ -300,7 +300,7 @@ 
         }
 
         // Sanity check expires
-        if (   !is_int($expires)
+        if (!is_int($expires)
             || $expires < -1) {
             throw new midcom_error("\$expires has to be a positive integer or zero or -1, is now {$expires}.");
         }
@@ -313,7 +313,7 @@ 
         $etag = md5("{$last_modified}{$attachment->name}{$attachment->mimetype}{$attachment->guid}");
 
         // Check etag and return 304 if necessary
-        if (   $expires <> 0
+        if ($expires <> 0
             && $this->cache->content->_check_not_modified($last_modified, $etag)) {
             if (!_midcom_headers_sent()) {
                 $this->cache->content->cache_control_headers();
@@ -491,8 +491,8 @@ 
     function get_host_name()
     {
         if (!$this->_cached_host_name) {
-            if (   array_key_exists("SSL_PROTOCOL", $_SERVER)
-                || (   array_key_exists('HTTPS', $_SERVER)
+            if (array_key_exists("SSL_PROTOCOL", $_SERVER)
+                || (array_key_exists('HTTPS', $_SERVER)
                     && $_SERVER['HTTPS'] == 'on')
                 || $_SERVER["SERVER_PORT"] == 443) {
                 $protocol = "https";
@@ -502,7 +502,7 @@ 
 
             $port = "";
             if (strpos($_SERVER['SERVER_NAME'], ':') === false) {
-                if (   ($protocol == "http" && $_SERVER["SERVER_PORT"] != 80)
+                if (($protocol == "http" && $_SERVER["SERVER_PORT"] != 80)
                     || ($protocol == "https" && $_SERVER["SERVER_PORT"] != 443)) {
                     $port = ":" . $_SERVER["SERVER_PORT"];
                 }

lib/midcom/core/urlmethods.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
     private function _process_cache($value)
     {
         if ($value == 'invalidate') {
-            if (   !is_array(midcom::get()->config->get('indexer_reindex_allowed_ips'))
+            if (!is_array(midcom::get()->config->get('indexer_reindex_allowed_ips'))
                 || !in_array($_SERVER['REMOTE_ADDR'], midcom::get()->config->get('indexer_reindex_allowed_ips'))) {
                 midcom::get()->auth->require_valid_user('basic');
                 midcom::get()->auth->require_admin_user();
@@ -173,7 +173,7 @@ 
     private function _get_remaining_url($value)
     {
         $redirect_to = '';
-        if (   !empty($value)
+        if (!empty($value)
             || !empty($this->_context->parser->argv)) {
             $redirect_to = "{$value}/" . implode($this->_context->parser->argv, '/');
             $redirect_to = preg_replace('%^(.*?):/([^/])%', '\\1://\\2', $redirect_to);

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