Changeset 28743

Timestamp:

06/11/2014 07:30:26 PM (12 years ago)

Author:

wonderboymusic

Message:

OPML:

• Learn how OPML works, cry.
• Remove unused globals in startElement()
• Stop using variable variables in startElement()

Tested with the OPML importer plugin

See #27881.

File:

• trunk/src/wp-admin/link-parse-opml.php (modified) (2 diffs)

trunk/src/wp-admin/link-parse-opml.php

@@ -14 +14 @@
 // columns we wish to find are: link_url, link_name, link_target, link_description
 // we need to map XML attribute names to our columns
-$opml_map = array('URL'         => 'link_url',
+$opml_map = array(
+        'URL'         => 'link_url',
         'HTMLURL'     => 'link_url',
         'TEXT'        => 'link_name',
@@ -45 +46 @@
  */
 function startElement($parser, $tagName, $attrs) {
-        global $updated_timestamp, $all_links, $map;
         global $names, $urls, $targets, $descriptions, $feeds;
 
-        if ($tagName == 'OUTLINE') {
-                foreach (array_keys($map) as $key) {
-                        if (isset($attrs[$key])) {
-                                $$map[$key] = $attrs[$key];
-                        }
+        if ( 'OUTLINE' === $tagName ) {
+                $name = '';
+                if ( isset( $attrs['TEXT'] ) ) {
+                        $name = $attrs['TEXT'];
                 }
-
-                //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]<br />\n");
-
+                if ( isset( $attrs['TITLE'] ) ) {
+                        $name = $attrs['TITLE'];
+                }
+                $url = '';
+                if ( isset( $attrs['URL'] ) ) {
+                        $url = $attrs['URL'];
+                }
+                if ( isset( $attrs['HTMLURL'] ) ) {
+                        $url = $attrs['HTMLURL'];
+                }
                 // save the data away.
-                $names[] = $link_name;
-                $urls[] = $link_url;
-                $targets[] = $link_target;
-                $feeds[] = $link_rss;
-                $descriptions[] = $link_description;
+                $names[] = $name;
+                $urls[] = $url;
+                $targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] :  '';
+                $feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] :  '';
+                $descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] :  '';
         } // end if outline
 }