Changeset 860

Timestamp:

08/30/08 17:35:19 (3 months ago)

Author:

ayunyan

Message:

plugin:mtimport fixes typo

Files:

• plugins/mtimport/trunk/mtimport.plugin.php (modified) (12 diffs)

plugins/mtimport/trunk/mtimport.plugin.php

@@ -1 +1 @@
 <?php
 /**
- * MovableType Importer
+ * Movable Type Importer
+ * Import Movable Type Database
  *
  * @package mtimport
@@ -8 +9 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
  * @link http://habariproject.org/
+ *
+ * Tested with Movable Type Ver 4.12 (MySQL)
  */
 define('MT_IMPORT_BATCH', 100);
@@ -23 +26 @@
     {
         return array(
-            'name' => 'MovableType Importer',
+            'name' => 'Movable Type Importer',
             'version' => '0.01-alpha',
             'url' => 'http://habariproject.org/',
@@ -63 +66 @@
      * Plugin filter that supplies the UI for the MT importer
      *
+     * @access public
      * @param string $stageoutput The output stage UI
      * @param string $import_name The name of the selected importer
@@ -103 +107 @@
             'db_pass' => '',
             'db_prefix' => 'mt_',
-            'warning' => '',
-            'category_import' => 1,
-            'utw_import' => 0,
+            'warning' => ''
          );
         $inputs= array_merge( $default_values, $inputs );
@@ -141 +143 @@
     private function stage_2($inputs)
     {
-        $valid_fields= array( 'db_name','db_host','db_user','db_pass','db_prefix', 'category_import', 'utw_import' );
+        $valid_fields= array('db_name','db_host','db_user','db_pass','db_prefix');
         $inputs= array_intersect_key($_POST, array_flip($valid_fields));
         extract($inputs);
@@ -156 +158 @@
 <table>
     <tr><td><?php echo _t('Import Blog', 'mtimport'); ?></td><td>
-    <select name="blog_id" size="1">
-    <?php while (list(, $blog) = @each($blogs)): ?>
-      <option value="<?php echo $blog->blog_id; ?>"><?php echo htmlspecialchars($blog->blog_name); ?></option>
-    <?php endwhile; ?>
-    </select>
-    </td></tr>
+    <select name="blog_id" size="1">
+    <?php while (list(, $blog) = @each($blogs)): ?>
+      <option value="<?php echo $blog->blog_id; ?>"><?php echo htmlspecialchars($blog->blog_name); ?></option>
+    <?php endwhile; ?>
+    </select>
+    </td></tr>
 </table>
 <input type="hidden" name="stage" value="3">
@@ -341 +343 @@
             LEFT JOIN {$db_prefix}category ON entry_category_id = category_id
             WHERE entry_blog_id = '{$blog_id}'
-            ORDER BY id DESC LIMIT {$min}," . MT_IMPORT_BATCH . ';',
+            ORDER BY id DESC LIMIT {$min}," . MT_IMPORT_BATCH . ';',
             array(), 'Post');
 
@@ -448 +450 @@
         echo sprintf(_t('<p>Importing comments %d-%d of %d.</p>'), $min, $max, $commentcount);
 
-        $post_info= DB::get_results("SELECT post_id, value FROM " . DB::table('postinfo') . " WHERE name= 'mp_id';");
+        $post_info= DB::get_results("SELECT post_id, value FROM " . DB::table('postinfo') . " WHERE name= 'mt_id';");
         @reset($post_info);
         while (list(, $info) = @each($post_info)) {
@@ -484 +486 @@
                 $carray['status']= Comment::STATUS_UNAPPROVED;
             }
+            unset($carray['comment_junk_status']);
 
             if (!isset($post_map[$carray['mt_post_id']] ) ) {
@@ -555 +558 @@
         echo sprintf(_t('<p>Importing trackbacks %d-%d of %d.</p>'), $min, $max, $trackbackcount);
 
-        $post_info= DB::get_results("SELECT post_id, value FROM " . DB::table('postinfo') . " WHERE name= 'mp_id';");
+        $post_info= DB::get_results("SELECT post_id, value FROM " . DB::table('postinfo') . " WHERE name= 'mt_id';");
         @reset($post_info);
         while (list(, $info) = @each($post_info)) {
@@ -584 +587 @@
                 $carray['status']= Comment::STATUS_UNAPPROVED;
             }
+            unset($carray['trackback_is_disabled']);
 
             if (!isset($post_map[$carray['mt_post_id']] ) ) {