flack / openpsa

lib/midcom/services/i18n/main.php

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
         $rawdata = base64_decode($_COOKIE['midcom_services_i18n']);
         $array = unserialize($rawdata);
 
-        if (   !array_key_exists('language', $array)
+        if (!array_key_exists('language', $array)
             || !array_key_exists('charset', $array)) {
             debug_add("Rejecting cookie, it seems invalid.");
             return;
@@ -167,7 +167,7 @@ 
                 $lang = substr($lang, 0, 2);
                 $q = $this->_get_q($params);
 
-                if (   !isset($http_langs[$lang])
+                if (!isset($http_langs[$lang])
                     || $http_langs[$lang] < $q) {
                     $http_langs[$lang] = $q;
                 }
@@ -496,7 +496,7 @@ 
     function iconv($source_charset, $destination_charset, $string)
     {
         $result = @iconv($source_charset, $destination_charset, $string);
-        if (   $result === false
+        if ($result === false
             && strlen($string) > 0) {
             debug_add("Iconv returned failed to convert a string, returning an empty string.", MIDCOM_LOG_WARN);
             debug_print_r("Tried to convert this string from {$source_charset} to {$destination_charset}:", $string);

lib/midcom/services/cache/module/nap.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
             // Get parent from DB and compare to catch moves
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
-                if (    $parent_entry_from_object
+                if ($parent_entry_from_object
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $cached_node_id) {
                     $this->_cache->delete($this->_prefix . '-' . $parent_entry_from_object[MIDCOM_NAV_ID] . '-leaves');
                 }
@@ -92,7 +92,7 @@ 
             $parent_id = $napobject[MIDCOM_NAV_NODEID];
             $parent_entry = $this->get_node($parent_id);
 
-            if (   $parent_entry
+            if ($parent_entry
                 && array_key_exists(MIDCOM_NAV_SUBNODES, $parent_entry)) {
                 unset($parent_entry[MIDCOM_NAV_SUBNODES]);
                 $this->put_node($parent_id, $parent_entry);
@@ -102,7 +102,7 @@ 
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
 
-                if (    !empty($parent_entry_from_object[MIDCOM_NAV_ID])
+                if (!empty($parent_entry_from_object[MIDCOM_NAV_ID])
                      && !empty($parent_entry[MIDCOM_NAV_ID])
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $parent_entry[MIDCOM_NAV_ID]) {
                     unset($parent_entry_from_object[MIDCOM_NAV_SUBNODES]);
@@ -128,7 +128,7 @@ 
             $nav = new midcom_helper_nav;
             if (is_a($object, 'midcom_db_topic')) {
                 $napobject = $nav->get_node($object->id);
-            } elseif (   ($node = $nav->find_closest_topic($object))
+            } elseif (($node = $nav->find_closest_topic($object))
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }
@@ -153,7 +153,7 @@ 
         }
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$key}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }
@@ -177,7 +177,7 @@ 
 
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$key}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }
@@ -262,7 +262,7 @@ 
 
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$guid}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         return $napobject;

lib/midcom/services/cache/module/content.php

Spacing +11 added lines, -11 removed lines

@@ -278,8 +278,8 @@ 
         $this->_uncached = midcom::get()->config->get('cache_module_content_uncached');
         $this->_headers_strategy = strtolower(midcom::get()->config->get('cache_module_content_headers_strategy'));
         $this->_headers_strategy_authenticated = strtolower(midcom::get()->config->get('cache_module_content_headers_strategy_authenticated'));
-        $this->_default_lifetime = (int)midcom::get()->config->get('cache_module_content_default_lifetime');
-        $this->_default_lifetime_authenticated = (int)midcom::get()->config->get('cache_module_content_default_lifetime_authenticated');
+        $this->_default_lifetime = (int) midcom::get()->config->get('cache_module_content_default_lifetime');
+        $this->_default_lifetime_authenticated = (int) midcom::get()->config->get('cache_module_content_default_lifetime_authenticated');
         $this->_force_headers = midcom::get()->config->get('cache_module_content_headers_force');
 
         switch ($this->_headers_strategy) {
@@ -451,7 +451,7 @@ 
         _midcom_header('Cache-Control: post-check=0, pre-check=0', false);
 
         //Suppress "Pragma: no-cache" header, because otherwise file downloads don't work in IE < 9 with https.
-        if (   !isset($_SERVER['HTTPS'])
+        if (!isset($_SERVER['HTTPS'])
             || !isset($_SERVER['HTTP_USER_AGENT'])
             || !preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) {
             _midcom_header('Pragma: no-cache');
@@ -507,7 +507,7 @@ 
      */
     public function expires($timestamp)
     {
-        if (   is_null($this->_expires)
+        if (is_null($this->_expires)
             || $this->_expires > $timestamp) {
             $this->_expires = $timestamp;
         }
@@ -783,7 +783,7 @@ 
      */
     public function write_meta_cache($content_id, $etag)
     {
-        if (   $this->_uncached
+        if ($this->_uncached
             || $this->_no_cache) {
             return;
         }
@@ -832,7 +832,7 @@ 
                 $to_save[$guid] = $guidmap;
             }
 
-            if (   $content_id !== $request_id
+            if ($content_id !== $request_id
                 && !in_array($request_id, $guidmap)) {
                 $guidmap[] = $request_id;
                 $to_save[$guid] = $guidmap;
@@ -844,7 +844,7 @@ 
 
     public function check_dl_hit($context, $dl_config)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_live_mode) {
             return false;
         }
@@ -865,7 +865,7 @@ 
 
     public function store_dl_content($context, $dl_config, $dl_cache_data)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_live_mode
             || $this->_uncached) {
             return;
@@ -949,7 +949,7 @@ 
                     $time = $meta['lastmodified'];
                 }
             }
-            if (   $time == 0
+            if ($time == 0
                 || !is_numeric($time)) {
                 $time = time();
             }
@@ -960,7 +960,7 @@ 
 
         $this->cache_control_headers();
 
-        if (   is_array($this->_force_headers)
+        if (is_array($this->_force_headers)
             && !empty($this->_force_headers)) {
             foreach ($this->_force_headers as $header => $value) {
                 $header_string = "{$header}: {$value}";
@@ -1005,7 +1005,7 @@ 
         $expires = false;
         $strategy = $this->_headers_strategy;
         $default_lifetime = $this->_default_lifetime;
-        if (   midcom::get()->auth->is_valid_user()
+        if (midcom::get()->auth->is_valid_user()
             || midcom_connection::get_user()) {
             $strategy = $this->_headers_strategy_authenticated;
             $default_lifetime = $this->_default_lifetime_authenticated;

lib/midgard/admin/asgard/handler/component/configuration.php

Spacing +4 added lines, -4 removed lines

@@ -114,11 +114,11 @@ 
                 $schemadb[$schema]->fields[$key]['title'] = $schemadb[$schema]->l10n_schema->get($schemadb[$schema]->fields[$key]['title']);
             }
 
-            if (   !isset($this->_request_data['config']->_local[$key])
+            if (!isset($this->_request_data['config']->_local[$key])
                 || $this->_request_data['config']->_local[$key] == $this->_request_data['config']->_global[$key]) {
                 // No local configuration setting, note to user that this is the global value
                 $schemadb[$schema]->fields[$key]['title'] = $schemadb[$schema]->l10n_schema->get($schemadb[$schema]->fields[$key]['title']);
-                $schemadb[$schema]->fields[$key]['title'] .= " <span class=\"global\">(" . $this->_l10n->get('global value') .")</span>";
+                $schemadb[$schema]->fields[$key]['title'] .= " <span class=\"global\">(" . $this->_l10n->get('global value') . ")</span>";
             }
         }
 
@@ -306,7 +306,7 @@ 
         }
 
         foreach ($config as $key => $value) {
-            if (   is_array($value)
+            if (is_array($value)
                 || is_object($value)) {
                 /**
                  * See http://trac.midgard-project.org/ticket/1442
@@ -327,7 +327,7 @@ 
                 $newval = $post[$key];
             }
 
-            if (   is_a($this->_controller->datamanager->types[$key], 'midcom_helper_datamanager2_type_select')
+            if (is_a($this->_controller->datamanager->types[$key], 'midcom_helper_datamanager2_type_select')
                 || is_a($this->_controller->datamanager->types[$key], 'midcom_helper_datamanager2_type_boolean')) {
                 // We want the actual values regardless of widget
                 $newval = $this->_controller->datamanager->types[$key]->convert_to_storage();

Indentation +1 added lines, -1 removed lines

@@ -306,7 +306,7 @@
                  * See http://trac.midgard-project.org/ticket/1442
                 $topic->set_parameter($this->_request_data['name'], var_export($value, true));
                  */
-                 continue;
+                    continue;
             }
             $topic->set_parameter($this->_request_data['name'], $key, $value);
         }

Braces +2 added lines, -1 removed lines

@@ -405,7 +405,8 @@
 
         try {
             $this->_check_config($config);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             midcom::get()->uimessages->add(
                 $this->_l10n_midcom->get('component configuration'),
                 sprintf($this->_l10n->get('configuration save failed: %s'), $e->getMessage()),

lib/midcom/helper/_componentloader.php

Spacing +1 added lines, -1 removed lines

@@ -378,7 +378,7 @@
         // repositories are "merged" manually
         $directories = array();
         $manifests = array();
-        exec('find ' . MIDCOM_ROOT . ' '  . dirname(MIDCOM_ROOT) . '/src -follow -type d -name "config"', $directories);
+        exec('find ' . MIDCOM_ROOT . ' ' . dirname(MIDCOM_ROOT) . '/src -follow -type d -name "config"', $directories);
         foreach ($directories as $directory) {
             $candidates[] = "{$directory}/manifest.inc";
         }

lib/net/nehmer/comments/comment.php

Spacing +7 added lines, -7 removed lines

@@ -181,7 +181,7 @@ 
         }
 
         // Set the status
-        if (   $this->can_do('net.nehmer.comments:moderation')
+        if ($this->can_do('net.nehmer.comments:moderation')
             && !$this->_sudo_requested) {
             $this->status = net_nehmer_comments_comment::ABUSE;
         } else {
@@ -205,7 +205,7 @@ 
             return false;
         }
         // Set the status
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -229,7 +229,7 @@ 
         }
 
         // Set the status
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -248,7 +248,7 @@ 
      */
     public function report_not_abuse()
     {
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -351,8 +351,8 @@ 
     {
         $config = midcom_baseclasses_components_configuration::get('net.nehmer.comments', 'config');
 
-        if (   $config->get('ratings_enable')
-            && (    $config->get('ratings_cache_to_object')
+        if ($config->get('ratings_enable')
+            && ($config->get('ratings_cache_to_object')
                  || $config->get('comment_count_cache_to_object'))) {
             // Handle ratings
             $comments = net_nehmer_comments_comment::list_by_objectguid($this->objectguid);
@@ -413,7 +413,7 @@ 
             return false;
         }
 
-        if (   empty($this->title)
+        if (empty($this->title)
             && empty($this->content)) {
             // No need to send notifications about empty rating entries
             return false;

Braces +2 added lines, -1 removed lines

@@ -408,7 +408,8 @@
         //Get the parent object
         try {
             $parent = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }

lib/net/nehmer/comments/handler/moderate.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
     {
         $this->load_comment($args[0], false);
         $moderators = $this->_config->get('moderators');
-        if (   $this->_comment->report_abuse()
+        if ($this->_comment->report_abuse()
             && $moderators) {
             // Prepare notification message
             $message = array();
@@ -46,7 +46,7 @@ 
             $message['content'] = '';
             $logs = $this->_comment->get_logs();
             if (count($logs) > 0) {
-                $message['content'] .= $this->_l10n->get('moderation history').":\n\n";
+                $message['content'] .= $this->_l10n->get('moderation history') . ":\n\n";
                 foreach ($logs as $time => $log) {
                     $reported = $this->_l10n->get_formatter()->datetime(strtotime("{$time}Z"));
                     $message['content'] .= $this->_l10n->get(sprintf('%s: %s by %s (from %s)', "$reported:\n", $this->_l10n->get($log['action']), $log['reporter'], $log['ip'])) . "\n\n";
@@ -119,7 +119,7 @@ 
         $this->_comment = new net_nehmer_comments_comment($identifier);
 
         if (!$this->_comment->can_do('midgard:update')) {
-            $this->_comment->_sudo_requested = midcom::get()->auth->request_sudo('net.nehmer.comments');;
+            $this->_comment->_sudo_requested = midcom::get()->auth->request_sudo('net.nehmer.comments'); ;
         }
         if ($require_moderation_privilege) {
             $this->_comment->require_do('net.nehmer.comments:moderation');

lib/net/nemein/tag/handler.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         $tagstring = self::resolve_tagname($tagname);
         $tag = net_nemein_tag_tag_dba::get_by_tag($tagstring);
         if (!$tag) {
-            $tag =  new net_nemein_tag_tag_dba();
+            $tag = new net_nemein_tag_tag_dba();
             $tag->tag = $tagstring;
             $tag->url = $url;
             if (!$tag->create()) {
@@ -77,7 +77,7 @@ 
                 return;
             }
         }
-        $link =  new net_nemein_tag_link_dba();
+        $link = new net_nemein_tag_link_dba();
         $link->tag = $tag->id;
         $link->context = self::resolve_context($tagname);
         $link->value = self::resolve_value($tagname);
@@ -189,7 +189,7 @@ 
      */
     public function copy_tags($from, $to, $component = null)
     {
-        if (   !is_object($from)
+        if (!is_object($from)
             || !is_object($to)) {
             return false;
         }
@@ -493,7 +493,7 @@ 
         $quote_open = false;
         for ($i = 0; $i < (strlen($tags_string) + 1); $i++) {
             $char = substr($tags_string, $i, 1);
-            if (   (   $char == ' '
+            if (($char == ' '
                     && !$quote_open)
                 || $i == strlen($tags_string)) {
                 $tags[] = $current_tag;
@@ -504,7 +504,7 @@ 
                 $quote_open = false;
                 continue;
             }
-            if (   $char === '"'
+            if ($char === '"'
                 || $char === "'") {
                 $quote_open = $char;
                 continue;

Braces +6 added lines, -3 removed lines

@@ -384,7 +384,8 @@ 
                 $value = $link->value;
 
                 $tags[$key] = $value;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -443,7 +444,8 @@ 
             try {
                 $tag = net_nemein_tag_tag_dba::get_cached($link->tag);
                 $link_object_map[$link->fromGuid][$tag->tag] = $link;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -472,7 +474,8 @@ 
                     $tmpobject = midcom::get()->dbfactory->convert_midgard_to_midcom($tmpobject);
                 }
                 $return[] = $tmpobject;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/net/nemein/tag/link.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
             }
         }
 
-        if (   is_null($position['longitude'])
+        if (is_null($position['longitude'])
             || is_null($position['latitude'])) {
             // Not enough information for positioning, we need both lon and lat
             return false;