Changeset 4495 for trunk/wp-includes/rss.php

Timestamp:

11/19/2006 07:56:05 AM (19 years ago)

Author:

ryan

Message:

Remove trailing spaces and convert spaces to tabs. Props Nazgul. fixes #986

File:

• trunk/wp-includes/rss.php (modified) (21 diffs)

trunk/wp-includes/rss.php

@@ -12 +12 @@
 define('MAGPIE_USER_AGENT', 'WordPress/' . $wp_version);
 
-class MagpieRSS { 
+class MagpieRSS {
     var $parser;
     var $current_item   = array();  // item currently being parsed
@@ -26 +26 @@
     var $inchannel          = false;
     var $initem             = false;
-    var $incontent          = false; // if in Atom <content mode="xml"> field 
+    var $incontent          = false; // if in Atom <content mode="xml"> field
     var $intextinput        = false;
     var $inimage            = false;
@@ -55 +55 @@
         #
         xml_set_object( $this->parser, $this );
-        xml_set_element_handler($this->parser, 
+        xml_set_element_handler($this->parser,
                 'feed_start_element', 'feed_end_element' );
 
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
+        xml_set_character_data_handler( $this->parser, 'feed_cdata' );
 
         $status = xml_parse( $this->parser, $source );
@@ -86 +86 @@
         $ns = false;
         if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2); 
+            list($ns, $el) = split( ':', $element, 2);
         }
         if ( $ns and $ns != 'rdf' ) {
@@ -112 +112 @@
         }
 
-        if ( $el == 'channel' ) 
+        if ( $el == 'channel' )
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
@@ -126 +126 @@
         // if we're in the default namespace of an RSS feed,
         //  record textinput or image fields
-        elseif ( 
-            $this->feed_type == RSS and 
-            $this->current_namespace == '' and 
-            $el == 'textinput' ) 
+        elseif (
+            $this->feed_type == RSS and
+            $this->current_namespace == '' and
+            $el == 'textinput' )
         {
             $this->intextinput = true;
@@ -135 +135 @@
 
         elseif (
-            $this->feed_type == RSS and 
-            $this->current_namespace == '' and 
-            $el == 'image' ) 
+            $this->feed_type == RSS and
+            $this->current_namespace == '' and
+            $el == 'image' )
         {
             $this->inimage = true;
@@ -156 +156 @@
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent ) 
+        elseif ($this->feed_type == ATOM and $this->incontent )
         {
             // if tags are inlined, then flatten
-            $attrs_str = join(' ', 
-                    array_map('map_attrs', 
-                    array_keys($attrs), 
+            $attrs_str = join(' ',
+                    array_map('map_attrs',
+                    array_keys($attrs),
                     array_values($attrs) ) );
 
@@ -173 +173 @@
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->feed_type == ATOM and $el == 'link' ) 
-        {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
+        elseif ($this->feed_type == ATOM and $el == 'link' )
+        {
+            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
@@ -195 +195 @@
     function feed_cdata ($p, $text) {
 
-        if ($this->feed_type == ATOM and $this->incontent) 
+        if ($this->feed_type == ATOM and $this->incontent)
         {
             $this->append_content( $text );
@@ -208 +208 @@
         $el = strtolower($el);
 
-        if ( $el == 'item' or $el == 'entry' ) 
+        if ( $el == 'item' or $el == 'entry' )
         {
             $this->items[] = $this->current_item;
@@ -214 +214 @@
             $this->initem = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
@@ -226 +226 @@
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
@@ -233 +233 @@
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el ) 
+            if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
@@ -271 +271 @@
             return;
         }
-        if ( $this->current_namespace ) 
+        if ( $this->current_namespace )
         {
             if ( $this->initem ) {
@@ -396 +396 @@
             return false;
         }
-    } 
+    }
     // else cache is ON
     else {
@@ -473 +473 @@
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
-                    $http_error = substr($resp->error, 0, -2); 
+                    $http_error = substr($resp->error, 0, -2);
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
@@ -614 +614 @@
 }
 
-function is_info ($sc) { 
-    return $sc >= 100 && $sc < 200; 
-}
-
-function is_success ($sc) { 
-    return $sc >= 200 && $sc < 300; 
-}
-
-function is_redirect ($sc) { 
-    return $sc >= 300 && $sc < 400; 
-}
-
-function is_error ($sc) { 
-    return $sc >= 400 && $sc < 600; 
-}
-
-function is_client_error ($sc) { 
-    return $sc >= 400 && $sc < 500; 
-}
-
-function is_server_error ($sc) { 
-    return $sc >= 500 && $sc < 600; 
+function is_info ($sc) {
+    return $sc >= 100 && $sc < 200;
+}
+
+function is_success ($sc) {
+    return $sc >= 200 && $sc < 300;
+}
+
+function is_redirect ($sc) {
+    return $sc >= 300 && $sc < 400;
+}
+
+function is_error ($sc) {
+    return $sc >= 400 && $sc < 600;
+}
+
+function is_client_error ($sc) {
+    return $sc >= 400 && $sc < 500;
+}
+
+function is_server_error ($sc) {
+    return $sc >= 500 && $sc < 600;
 }
 
@@ -686 +686 @@
 
         if ( ! get_option( $cache_option ) ) {
-            $this->debug( 
+            $this->debug(
                 "Cache doesn't contain: $url (cache option: $cache_option)"
             );
@@ -758 +758 @@
     function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
         }
@@ -782 +782 @@
 
     if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) = 
+        list( $year, $month, $day, $hours, $minutes, $seconds) =
             array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);