Changeset 6028 for trunk/wp-admin/import/jkw.php

Timestamp:

09/04/2007 02:14:34 AM (19 years ago)

Author:

markjaquith

Message:

Clean up Jerome's Keywords importer

File:

• trunk/wp-admin/import/jkw.php (modified) (8 diffs)

trunk/wp-admin/import/jkw.php

@@ -3 +3 @@
 class JeromesKeyword_Import {
 
-        function header()  {
+        function header() {
                 echo '<div class="wrap">';
                 echo '<h2>'.__('Import Jerome&#8217;s Keywords').'</h2>';
@@ -30 +30 @@
         }
 
-
-        function dispatch () {
-                if ( empty( $_GET['step'] ) ) {
+        function dispatch() {
+                if ( empty($_GET['step']) )
                         $step = 0;
-                } else {
-                        $step = (int) $_GET['step'];
-                }
+                else
+                        $step = abs(intval($_GET['step']));
 
                 // load the header
@@ -74 +72 @@
         }
 
-
-        function check_V1_post_keyword ( $precheck = true ) {
+        function check_V1_post_keyword($precheck = true) {
                 global $wpdb;
 
@@ -82 +79 @@
 
                 // import Jerome's Keywords tags 
-                $qry = "SELECT post_id, meta_id, meta_key, meta_value FROM $wpdb->postmeta WHERE $wpdb->postmeta.meta_key = 'keywords'";
-                $metakeys = $wpdb->get_results($qry);
+                $metakeys = $wpdb->get_results("SELECT post_id, meta_id, meta_key, meta_value FROM $wpdb->postmeta WHERE $wpdb->postmeta.meta_key = 'keywords'");
                 if ( !is_array($metakeys)) {
                         echo '<p>' . __('No Tags Found!') . '</p>';
@@ -90 +86 @@
                         $count = count($metakeys);
                         echo '<p>' . sprintf( __('Done! <strong>%s</strong> posts with tags were read.'), $count ) . '<br /></p>';
-
                         echo '<ul>';
-
-                        foreach ($metakeys as $post_meta) {
-                        if ($post_meta->meta_value != '') {
-                            $post_keys = explode(',', $post_meta->meta_value);
-                            foreach($post_keys as $keyword) {
-                                $keyword = addslashes(trim($keyword));
-                                if ($keyword != ''){
-                                    echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
-                                    if( !$precheck ){
-                                        wp_add_post_tags($post_meta->post_id, $keyword);
-                                    }
-                                }
-                            }
-                        }
-                        if( !$precheck ){
-                            delete_post_meta($post_meta->post_id, 'keywords');
-                        }
+                        foreach ( $metakeys as $post_meta ) {
+                                if ( $post_meta->meta_value != '' ) {
+                                        $post_keys = explode(',', $post_meta->meta_value);
+                                        foreach ( $post_keys as $keyword ) {
+                                                $keyword = addslashes(trim($keyword));
+                                                if ( '' != $keyword ) {
+                                                        echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
+                                                        if ( !$precheck )
+                                                                wp_add_post_tags($post_meta->post_id, $keyword);
+                                                }
+                                        }
+                                }
+                                if ( !$precheck )
+                                        delete_post_meta($post_meta->post_id, 'keywords');
                         }
-
-                    echo '</ul>';
-
+                        echo '</ul>';
                 }
 
@@ -122 +112 @@
         }
 
-
-        function check_V2_post_keyword ( $precheck = true ) {
+        function check_V2_post_keyword($precheck = true) {
                 global $wpdb;
 
@@ -129 +118 @@
                 echo '<p><h3>'.__('Reading Jerome&#8217;s Keywords Tags&#8230;').'</h3></p>';
 
-                // import Jerome's Keywords tags 
-                $tablename = $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1);
-                $qry = "SELECT post_id, tag_name FROM $tablename";
-                $metakeys = $wpdb->get_results($qry);
-                if ( !is_array($metakeys)) {
+                // import Jerome's Keywords tags 
+                $tablename = $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1);
+                $metakeys = $wpdb->get_results("SELECT post_id, tag_name FROM $tablename");
+                if ( !is_array($metakeys) ) {
                         echo '<p>' . __('No Tags Found!') . '</p>';
-                        return false;           
-                }
-                else {
-                    $count = count($metakeys);
-                    echo '<p>' . sprintf( __('Done! <strong>%s</strong> tags were read.'), $count ) . '<br /></p>';
-
-                    echo '<ul>';
-
-                    foreach($metakeys as $post_meta) {
-                        $keyword = addslashes(trim($post_meta->tag_name));
-
-                        if ($keyword != ''){
-                            echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
-                            if( !$precheck ){
-                                wp_add_post_tags($post_meta->post_id, $keyword);
-                            }
-                        }
-                    }
-
-                    echo '</ul>';
-
+                        return false;
+                } else {
+                        $count = count($metakeys);
+                        echo '<p>' . sprintf( __('Done! <strong>%s</strong> tags were read.'), $count ) . '<br /></p>';
+                        echo '<ul>';
+                        foreach ( $metakeys as $post_meta ) {
+                                $keyword = addslashes(trim($post_meta->tag_name));
+                                if ( $keyword != '' ) {
+                                        echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
+                                        if ( !$precheck )
+                                                wp_add_post_tags($post_meta->post_id, $keyword);
+                                }
+                        }
+                echo '</ul>';
                 }
-
                 echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 4:5).'" method="post">';
                 wp_nonce_field('import-jkw');
@@ -165 +145 @@
         }
 
-
-        function cleanup_V2_import ( ) {
+        function cleanup_V2_import() {
                 global $wpdb;
 
-                /* options from V2.0a (jeromes-keywords.php) */
-                $options = array(
-                    'version'        => '2.0',          // keywords options version
-                    'keywords_table' => 'jkeywords',    // table where keywords/tags are stored
-                    'query_varname'  => 'tag',          // HTTP var name used for tag searches
-                    'template'       => 'keywords.php', // template file to use for displaying tag queries
+                /* options from V2.0a (jeromes-keywords.php) */
+                $options = array('version', 'keywords_table', 'query_varname', 'template', 'meta_always_include', 'meta_includecats', 'meta_autoheader', 'search_strict', 'use_feed_cats', 'post_linkformat', 'post_tagseparator', 'post_includecats', 'post_notagstext', 'cloud_linkformat', 'cloud_tagseparator', 'cloud_includecats', 'cloud_sortorder', 'cloud_displaymax', 'cloud_displaymin', 'cloud_scalemax', 'cloud_scalemin');
 
-                    'meta_always_include' => '',        // meta keywords to always include
-                    'meta_includecats' => 'default',    // default' => include cats in meta keywords only for home page
-                                                        // all' => includes cats on every page, none' => never included
+                $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1));
 
-                    'meta_autoheader'    => '1',        // automatically output meta keywords in header
-                    'search_strict'      => '1',        // returns only exact tag matches if true
-                    'use_feed_cats'      => '1',        // insert tags into feeds as categories
-
-                    /* post tag options */
-                    'post_linkformat'    => '',         // post tag format (initialized to $link_localsearch)
-                    'post_tagseparator'  => ', ',       // tag separator character(s)
-                    'post_includecats'   => '0',        // include categories in post's tag list
-                    'post_notagstext'    => 'none',     // text to display if no tags found
-
-                    /* tag cloud options */
-                    'cloud_linkformat'   => '',         // post tag format (initialized to $link_tagcloud)
-                    'cloud_tagseparator' => ' ',        // tag separator character(s)
-                    'cloud_includecats'  => '0',        // include categories in tag cloud
-                    'cloud_sortorder'    => 'natural',  // tag sorting: natural, countup/asc, countdown/desc, alpha
-                    'cloud_displaymax'   => '0',        // maximum # of tags to display (all if set to zero)
-                    'cloud_displaymin'   => '0',        // minimum tag count to include in tag cloud
-                    'cloud_scalemax'     => '0',        // maximum value for count scaling (no scaling if zero)
-                    'cloud_scalemin'     => '0'         // minimum value for count scaling
-                    );
-
-                $tablename = $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1);
-
-                $wpdb->query('DROP TABLE IF EXISTS ' . $tablename);
-
-                foreach($options as $optname => $optval) {
-                    delete_option('jkeywords_' . $optname);
-                }
+                foreach ( $options as $o )
+                        delete_option('jkeywords_' . $o);
 
                 $this->done();
         }
 
-
-        function done ( ) {
+        function done() {
                 echo '<div class="narrow">';
-                echo '<p><h3>'.__('Import Complete!').'</h3></p>';              
+                echo '<p><h3>'.__('Import Complete!').'</h3></p>';
                 echo '</div>';
         }
 
-
-        function JeromesKeyword_Import ( ) {
-
-                // Nothing.
-
+        function JeromesKeyword_Import() {
         }
 
 }
-
 
 // create the import object