flack / openpsa

lib/midcom/services/auth/sessionmgr.php

Spacing +3 added lines, -3 removed lines

@@ -192,7 +192,7 @@ 
             $clientip = $_SERVER['REMOTE_ADDR'];
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $session->clientip != $clientip) {
             debug_add("The session {$session->guid} (#{$session->id}) had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$session->clientip}, got {$clientip}.");
@@ -254,7 +254,7 @@ 
     private function _load_person()
     {
         if (!$this->user) {
-            debug_add("Failed to authenticate the given user: ". midcom_connection::get_error_string(),
+            debug_add("Failed to authenticate the given user: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return false;
         }
@@ -440,7 +440,7 @@ 
         $result = array();
         $query_result = array_keys($mc->list_keys());
         foreach ($query_result as $userid) {
-            if (   ($user = $this->auth->get_user($userid))
+            if (($user = $this->auth->get_user($userid))
                 && $user->is_online()) {
                 $result[$user->guid] = $user;
             }

Braces +2 added lines, -1 removed lines

@@ -175,7 +175,8 @@
     {
         try {
             $session = new midcom_core_login_session_db($sessionid);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add('Login session ' . $sessionid . ' failed to load: ' . $e->getMessage(), MIDCOM_LOG_INFO);
             return false;
         }

lib/net/nemein/redirector/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
     public function _on_initialize()
     {
         // Match /
-        if (   is_null($this->_config->get('redirection_type'))
-            || (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+        if (is_null($this->_config->get('redirection_type'))
+            || ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection'))) {
             $this->_request_switch['redirect'] = array(
                 'handler' => array('net_nemein_redirector_handler_tinyurl', 'list'),
@@ -77,7 +77,7 @@ 
 
             // Catch first the configuration option for showing editing interface instead
             // of redirecting administrators
-            if (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+            if ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection')) {
                 midcom::get()->relocate("{$this->_topic->name}/edit/{$args[0]}/");
             }

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
                     try {
                         $topic = new midcom_db_topic($id);
                         $id = $topic->id;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                         break;
                     }

lib/net/nemein/wiki/resolver.php

Spacing +3 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
          that is populated only once, and even then only the
          first time we encounter a namespaced wikilink */
         static $folder_tree = array();
-        if (   count($folder_tree) == 0
+        if (count($folder_tree) == 0
             || $force_resolve_folder_tree) {
             $folder_tree = $this->_resolve_folder_tree($force_as_root);
         }
@@ -160,7 +160,7 @@ 
             $localpath = $path;
             $matches['latest_parent'] = $folder_tree['/'];
             $missing_levels = 0;
-            while (   $localpath
+            while ($localpath
                    && $localpath != '/') {
                 $localpath = dirname($localpath);
                 $missing_levels++;
@@ -187,7 +187,7 @@ 
 
         $root_folder = $folder;
         $max = 100;
-        while (   $folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
+        while ($folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
                && (($parent = $nap->get_node_uplink($folder[MIDCOM_NAV_ID])) != -1)
                && $max > 0) {
             $root_folder = $folder;

lib/net/nemein/wiki/wikipage.php

Braces +2 added lines, -1 removed lines

@@ -196,7 +196,8 @@
 
         try {
             $diff_fields = $rcs_handler->get_diff($prev_version, $this_version, 'unified');
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return '';
         }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function _on_creating()
     {
-        if (   $this->title == ''
+        if ($this->title == ''
             || !$this->topic) {
             // We must have wikiword and topic at this stage
             return false;

lib/net/nemein/wiki/parser.php

Spacing +3 added lines, -3 removed lines

@@ -224,7 +224,7 @@ 
                 return $this->render_link($parts[1], $parts[2]) . $after;
 
             // Macro [something: <data>] (for example [abbr: BOFH - Bastard Operator From Hell] or [photo: <GUID>])
-            case (   preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
+            case (preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
                   && method_exists($this, "_run_macro_{$macro_parts[1]}")):
                 $method = "_run_macro_{$macro_parts[1]}";
                 return $this->$method($macro_parts[2], $match[0], $after);
@@ -257,7 +257,7 @@ 
                 $folder = $wikipage_match['latest_parent'];
             }
 
-            if (   isset($folder[MIDCOM_NAV_OBJECT])
+            if (isset($folder[MIDCOM_NAV_OBJECT])
                 && $folder[MIDCOM_NAV_OBJECT]->can_do('midgard:create')) {
                 $workflow = $this->get_workflow('datamanager2');
                 return "<a href=\"{$folder[MIDCOM_NAV_ABSOLUTEURL]}create/?wikiword={$wikipage_match['remaining_path']}\" " . $workflow->render_attributes() . " class=\"wiki_missing\" title=\"" . $this->_l10n->get('click to create') . "\">{$text}</a>";
@@ -300,7 +300,7 @@ 
                     $links[$parts[1]] = $parts[2];
                     break;
                 // Ignore macros [something: <data>] (for example [abbr: BOFH - Bastard Operator From Hell] or [photo: <GUID>])
-                case (   preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
+                case (preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
                       && method_exists($this, "_run_macro_{$macro_parts[1]}")):
                     continue 2;
 

Braces +2 added lines, -1 removed lines

@@ -63,7 +63,8 @@
 
         try {
             $attachment = new midcom_db_attachment($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return "<span class=\"missing_photo\" title=\"{$guid}\">{$fulltag}</span>{$after}";
         }

lib/net/nemein/wiki/handler/create.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 
         if (!$this->_page->create()) {
             debug_print_r('We operated on this object:', $this->_page);
-            throw new midcom_error('Failed to create a new page. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new page. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_page;

Braces +2 added lines, -1 removed lines

@@ -114,7 +114,8 @@
             } else {
                 try {
                     net_nemein_wiki_viewer::initialize_index_article($topic);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     // Could not create index
                     $topic->delete();
                     throw $e;

lib/net/nemein/wiki/handler/view.php

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
 
     public function __construct()
     {
-        $this->_request_data['page'] =& $this->_page;
+        $this->_request_data['page'] = & $this->_page;
     }
 
     /**
@@ -46,7 +46,7 @@ 
     {
         if (midcom::get()->config->get('enable_ajax_editing')) {
             $this->_controller = midcom_helper_datamanager2_controller::create('ajax');
-            $this->_controller->schemadb =& $this->_request_data['schemadb'];
+            $this->_controller->schemadb = & $this->_request_data['schemadb'];
             $this->_controller->set_storage($this->_page);
             $this->_controller->process_ajax();
             $this->_datamanager = $this->_controller->datamanager;
@@ -272,9 +272,9 @@ 
         $toc .= "\n<ol class=\"midcom_helper_toc_formatter level_{$current_list_level}\">\n";
         foreach ($headings[4] as $key => $heading) {
             $anchor = 'heading-' . md5($heading);
-            $tag_level =& $headings[3][$key];
-            $heading_code =& $headings[0][$key];
-            $heading_tag =& $headings[2][$key];
+            $tag_level = & $headings[3][$key];
+            $heading_code = & $headings[0][$key];
+            $heading_tag = & $headings[2][$key];
             $heading_new_code = "<a id='{$anchor}'></a>{$heading_code}";
             $content = str_replace($heading_code, $heading_new_code, $content);
             if ($current_tag_level === false) {
@@ -300,7 +300,7 @@ 
                     }
                 }
             }
-            $toc .= "<li class='{$heading_tag}'><a href='#{$anchor}'>" . strip_tags($heading) .  "</a>";
+            $toc .= "<li class='{$heading_tag}'><a href='#{$anchor}'>" . strip_tags($heading) . "</a>";
         }
         for ($i = $current_list_level; $i > 0; $i--) {
             $toc .= "</li>\n</ol>\n";
@@ -367,7 +367,7 @@ 
 
         $user = midcom::get()->auth->user->get_storage();
 
-        if (   array_key_exists('target', $_POST)
+        if (array_key_exists('target', $_POST)
             && $_POST['target'] == 'folder') {
             // We're subscribing to the whole wiki
             $object = $this->_topic;

lib/net/nemein/rss/cron/fetchfeeds.php

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
         foreach ($feeds as $feed) {
             try {
                 midcom_db_topic::get_cached($feed->node);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Node #{$feed->node} does not exist, skipping feed #{$feed->id}", MIDCOM_LOG_ERROR);
                 continue;
             }

lib/net/nemein/rss/fetch.php

Spacing +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
             $etag = trim($parser->data['headers']['etag']);
 
             $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag');
-            if (   !empty($feed_etag)
+            if (!empty($feed_etag)
                 && $feed_etag == $etag) {
                 // Feed hasn't changed, skip updating
                 debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN);
@@ -187,7 +187,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid)) {
             // Something wrong with this entry, skip it
@@ -255,7 +255,7 @@ 
                 $meta_values['published'] = $article_date;
             }
 
-            if (   $this->apply_values($article, $values, $meta_values)
+            if ($this->apply_values($article, $values, $meta_values)
                 && !$article->update()) {
                 return false;
             }
@@ -284,14 +284,14 @@ 
     private function find_author(net_nemein_rss_parser_item $item)
     {
         // Try to figure out item author
-        if (   $this->_feed->forceauthor
+        if ($this->_feed->forceauthor
             && $this->_feed->defaultauthor) {
             // Feed has a "default author" set, use it
             return new midcom_db_person($this->_feed->defaultauthor);
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id) {
             if ($this->_feed->defaultauthor) {
                 // Feed has a "default author" set, use it
@@ -477,7 +477,7 @@ 
             }
         }
 
-        if (   !empty($author_info['username'])
+        if (!empty($author_info['username'])
             && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) {
             return $person->get_storage();
         }