flack / openpsa

lib/midcom/admin/folder/management.php

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
             }
 
             // Skip components beginning with midcom or midgard
-            if (   preg_match('/^(midcom|midgard)\./', $manifest->name)
+            if (preg_match('/^(midcom|midgard)\./', $manifest->name)
                 && $manifest->name != 'midcom.helper.search') {
                 continue;
             }
@@ -99,7 +99,7 @@ 
         asort($components);
 
         // Set the parent component to be the first if applicable
-        if (   $parent_component !== ''
+        if ($parent_component !== ''
             && array_key_exists($parent_component, $components)) {
             $temp = array();
             $temp[$parent_component] = $components[$parent_component];
@@ -128,14 +128,14 @@ 
         }
 
         foreach (self::get_component_list() as $component => $details) {
-            if (   $component !== $parent_component
+            if ($component !== $parent_component
                 && !$all) {
-                if (   is_array(midcom::get()->config->get('component_listing_allowed'))
+                if (is_array(midcom::get()->config->get('component_listing_allowed'))
                     && !in_array($component, midcom::get()->config->get('component_listing_allowed'))) {
                     continue;
                 }
 
-                if (   is_array(midcom::get()->config->get('component_listing_excluded'))
+                if (is_array(midcom::get()->config->get('component_listing_excluded'))
                     && in_array($component, midcom::get()->config->get('component_listing_excluded'))) {
                     continue;
                 }

lib/midcom/config/test.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 class midcom_config_test
 {
     const OK = 0;
-    const WARNING =  1;
+    const WARNING = 1;
     const ERROR = 2;
 
     private $messages = array(

lib/midcom/helper/_styleloader.php

Spacing +13 added lines, -13 removed lines

@@ -310,7 +310,7 @@ 
             $element = $matches[2];
         }
 
-        if (   isset($stylepath)
+        if (isset($stylepath)
             && $styleid = $this->get_style_id_from_path($stylepath)) {
             array_unshift($this->_scope, $styleid);
         }
@@ -354,9 +354,9 @@ 
      */
     public function render($preparsed, $path, array $data = array())
     {
-        if (   empty($data)
+        if (empty($data)
             && midcom_core_context::get()->has_custom_key('request_data')) {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
         }
 
         if (eval('?>' . $preparsed) === false) {
@@ -390,7 +390,7 @@ 
 
         try {
             $root_topic = $context->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
-            if (   $root_topic->style
+            if ($root_topic->style
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
@@ -425,7 +425,7 @@ 
             if (array_key_exists($src, $this->_styles)) {
                 return $this->_styles[$src];
             }
-            if (   $this->_scope[0] != ''
+            if ($this->_scope[0] != ''
                 && $result = $this->_get_element_in_styletree($this->_scope[0], $_element)) {
                 $this->_styles[$src] = $result;
                 return $this->_styles[$src];
@@ -443,7 +443,7 @@ 
         if (array_key_exists($src, $this->_snippets)) {
             return $this->_snippets[$src];
         }
-        if (   midcom::get()->config->get('theme')
+        if (midcom::get()->config->get('theme')
             && $content = midcom_helper_misc::get_element_content($_element)) {
             $this->_snippets[$src] = $content;
             return $content;
@@ -451,7 +451,7 @@ 
 
         $current_context = midcom_core_context::get()->id;
         foreach ($this->_styledirs[$current_context] as $path) {
-            $filename = $path .  "/{$_element}.php";
+            $filename = $path . "/{$_element}.php";
             if (file_exists($filename)) {
                 $this->_snippets[$filename] = file_get_contents($filename);
                 return $this->_snippets[$filename];
@@ -501,11 +501,11 @@ 
             }
         } else {
             $style = $topic->style;
-            if (   !$topic->style
+            if (!$topic->style
                 && !empty($GLOBALS['midcom_style_inherited'])) {
                 $style = $GLOBALS['midcom_style_inherited'];
             }
-            if (   is_string($style)
+            if (is_string($style)
                 && strpos($style, 'theme:') === 0) {
                 $theme_dir = OPENPSA2_THEME_ROOT . midcom::get()->config->get('theme') . '/style';
                 $parts = explode('/', str_replace('theme:/', '', $style));
@@ -533,7 +533,7 @@ 
     {
         // get component's snippetdir (for default styles)
         $loader = midcom::get()->componentloader;
-        if (   !$topic
+        if (!$topic
             || !$topic->guid) {
             return null;
         }
@@ -669,7 +669,7 @@ 
         /* then the contextstyle */
         $this->_styledirs[$current_context][count($this->_styledirs[$current_context])] = $component_style;
 
-        $this->_styledirs[$current_context] =  array_merge($this->_styledirs[$current_context], $this->_styledirs_append[$current_context]);
+        $this->_styledirs[$current_context] = array_merge($this->_styledirs[$current_context], $this->_styledirs_append[$current_context]);
     }
 
     /**
@@ -698,7 +698,7 @@ 
             $this->_styledirs_append[$context] = array();
         }
 
-        if (   $this->_topic
+        if ($this->_topic
             && $_st = $this->_get_component_style($this->_topic)) {
             array_unshift($this->_scope, $_st);
         }
@@ -718,7 +718,7 @@ 
      */
     public function leave_context()
     {
-        if (   $this->_topic
+        if ($this->_topic
             && $this->_get_component_style($this->_topic)) {
             array_shift($this->_scope);
         }

lib/midcom/helper/datamanager2/ajax/autocomplete.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
     {
         $qb = call_user_func(array($this->_request['class'], 'new_query_builder'));
 
-        if (   !empty($this->_request['constraints'])
+        if (!empty($this->_request['constraints'])
             && is_array($this->_request['constraints'])) {
             $this->_apply_constraints($qb, $this->_request['constraints']);
         }
@@ -64,7 +64,7 @@ 
             $qb->end_group();
         }
 
-        if (   !empty($this->_request['orders'])
+        if (!empty($this->_request['orders'])
             && is_array($this->_request['orders'])) {
             ksort($this->_request['orders']);
             foreach ($this->_request['orders'] as $data) {
@@ -83,7 +83,7 @@ 
 
         ksort($constraints);
         foreach ($constraints as $key => $data) {
-            if (   !array_key_exists('value', $data)
+            if (!array_key_exists('value', $data)
                 || empty($data['field'])
                 || empty($data['op'])) {
                 debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN);
@@ -156,7 +156,7 @@ 
     {
         $query = $this->_request["term"];
         $wildcard_query = $query;
-        if (   isset($this->_request['auto_wildcards'])
+        if (isset($this->_request['auto_wildcards'])
             && strpos($query, '%') === false) {
             switch ($this->_request['auto_wildcards']) {
                 case 'start':

lib/midcom/connection.php

Spacing +3 added lines, -3 removed lines

@@ -275,11 +275,11 @@ 
             self::$_data = self::$_defaults;
         }
 
-        if (   null === $subkey
+        if (null === $subkey
             && isset(self::$_data[$key])) {
             return self::$_data[$key];
         }
-        if (   null !== $subkey
+        if (null !== $subkey
             && isset(self::$_data[$key][$subkey])) {
             return self::$_data[$key][$subkey];
         }
@@ -341,7 +341,7 @@ 
             if ($part === '') {
                 continue;
             }
-            if (    midcom::get()->config->get('theme')
+            if (midcom::get()->config->get('theme')
                  && !$args_started
                  && midcom_helper_misc::check_page_exists($part)) {
                 $page_style .= '/' . $part;

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),