flack / openpsa

lib/net/nemein/rss/fetch.php

Spacing +7 added lines, -8 removed lines

@@ -104,7 +104,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
@@ -198,7 +198,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid))
         {
@@ -216,8 +216,7 @@ 
         $article->_activitystream_verb = 'http://community-equity.org/schema/1.0/clone';
         $article->_rcs_message = sprintf(midcom::get()->i18n->get_string('%s was imported from %s', 'net.nemein.rss'), $title, $this->_feed->title);
 
-        $values = array
-        (
+        $values = array(
             'title' => $title,
             $this->_guid_property => $guid, // FIXME: This breaks with URLs longer than 255 chars
             'content' => $item->get_content(),
@@ -277,7 +276,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;
@@ -312,7 +311,7 @@ 
     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
@@ -320,7 +319,7 @@ 
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id)
         {
             if ($this->_feed->defaultauthor)
@@ -441,7 +440,7 @@ 
         $purge_guids = array();
         foreach ($local_items as $item)
         {
-            if (   midcom::get()->componentloader->is_installed('net.nemein.favourites')
+            if (midcom::get()->componentloader->is_installed('net.nemein.favourites')
                 && midcom::get()->componentloader->load_graceful('net.nemein.favourites'))
             {
                 // If it has been favorited keep it

Braces +8 added lines, -16 removed lines

@@ -150,8 +150,7 @@ 
             {
                 $item->set_local_guid($guid);
                 debug_add("Imported item " . $item->get_id() . ' as ' . $guid, MIDCOM_LOG_INFO);
-            }
-            else
+            } else
             {
                 debug_add("Failed to import item " . $item->get_id() . ': ' . midcom_connection::get_error_string(), MIDCOM_LOG_ERROR);
             }
@@ -282,8 +281,7 @@ 
             {
                 return false;
             }
-        }
-        else
+        } else
         {
             $this->apply_values($article, $values, $meta_values);
             if (!$article->create())
@@ -327,8 +325,7 @@ 
             {
                 // Feed has a "default author" set, use it
                 $author = new midcom_db_person($this->_feed->defaultauthor);
-            }
-            else
+            } else
             {
                 // Fall back to "Midgard Admin" just in case
                 $author = new midcom_db_person($fallback_person_id);
@@ -373,8 +370,7 @@ 
             {
                 $symlink_topic = new midcom_db_topic($symlink);
                 $article->topic = $symlink_topic->id;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -484,8 +480,7 @@ 
                 $name = html_entity_decode($name, ENT_QUOTES, midcom::get()->i18n->get_current_charset());
                 // Atom feed, the value can be either full name or username
                 $author_info['user_or_full'] = $name;
-            }
-            else
+            } else
             {
                 $name = html_entity_decode($email, ENT_QUOTES, midcom::get()->i18n->get_current_charset());
             }
@@ -493,15 +488,13 @@ 
             if (!preg_match('/(<|\()/', $name))
             {
                 $author_info['user_or_full'] = $name;
-            }
-            else
+            } else
             {
                 if (strstr($name, '<'))
                 {
                     // The classic "Full Name <email>" format
                     $regex = '/(?<fullname>.+) <?(?<email>[a-zA-Z0-9_.-]+?@[a-zA-Z0-9_.-]+)>?[ ,]?/';
-                }
-                else
+                } else
                 {
                     // The classic "email (Full Name)" format
                     $regex = '/^(?<email>[a-zA-Z0-9_.-]+?@[a-zA-Z0-9_.-]+) \((?<fullname>.+)\)$/';
@@ -520,8 +513,7 @@ 
             {
                 // This value has a space in it, assuming full name
                 $author_info['full_name'] = $author_info['user_or_full'];
-            }
-            else
+            } else
             {
                 $author_info['username'] = $author_info['user_or_full'];
             }