flack / openpsa

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

lib/net/nemein/rss/handler/admin.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     {
         $data['schemadb'] = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_feed'));
         $data['controller'] = midcom_helper_datamanager2_controller::create('simple');
-        $data['controller']->schemadb =& $data['schemadb'];
+        $data['controller']->schemadb = & $data['schemadb'];
         $data['controller']->set_storage($data['feed']);
         if (!$data['controller']->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for feed {$data['feed']->id}.");
@@ -84,7 +84,7 @@ 
         }
 
         // OPML subscription list import support
-        if (   array_key_exists('net_nemein_rss_manage_opml', $_FILES)
+        if (array_key_exists('net_nemein_rss_manage_opml', $_FILES)
             && is_uploaded_file($_FILES['net_nemein_rss_manage_opml']['tmp_name'])) {
             $opml_file = $_FILES['net_nemein_rss_manage_opml']['tmp_name'];
 

lib/net/nemein/rss/manage.php

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
     {
         try {
             $viewer->register_plugin_namespace('__feeds', array('rss' => array('class' => __CLASS__)));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
     }

lib/net/nehmer/blog/handler/admin.php

Spacing +3 added lines, -3 removed lines

@@ -60,8 +60,8 @@ 
      */
     private function _load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb'];
-        if (   $this->_config->get('simple_name_handling')
+        $this->_schemadb = & $this->_request_data['schemadb'];
+        if ($this->_config->get('simple_name_handling')
             && !midcom::get()->auth->admin) {
             foreach (array_keys($this->_schemadb) as $name) {
                 $this->_schemadb[$name]->fields['name']['readonly'] = true;
@@ -76,7 +76,7 @@ 
     {
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_article);
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for article {$this->_article->id}.");

lib/net/nehmer/blog/handler/create.php

Spacing +3 added lines, -3 removed lines

@@ -61,8 +61,8 @@ 
      */
     public function load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb'];
-        if (   $this->_config->get('simple_name_handling')
+        $this->_schemadb = & $this->_request_data['schemadb'];
+        if ($this->_config->get('simple_name_handling')
             && !midcom::get()->auth->can_user_do('midcom:urlname')) {
             foreach (array_keys($this->_schemadb) as $name) {
                 $this->_schemadb[$name]->fields['name']['readonly'] = true;
@@ -86,7 +86,7 @@ 
 
         if (!$this->_article->create()) {
             debug_print_r('We operated on this object:', $this->_article);
-            throw new midcom_error('Failed to create a new article. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new article. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         // Callback possibility