From: garvinhicking Date: Mon, 25 Apr 2005 16:50:43 +0000 (+0000) Subject: Fix importers when not on the same DB X-Git-Tag: 0.9~499 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b9ad5985012f4fdf6435b0e3dc2ff6f7f545c1ad;p=s9y.git Fix importers when not on the same DB --- diff --git a/docs/NEWS b/docs/NEWS index 7be4632..360ed9b 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,9 @@ Version 0.9 () ------------------------------------------------------------------------ + * Fix importers when source database is not the same as the target + database (garvinhicking) + * Allow the serendipity_event_trackback additional trackbacks plugin to send trackbacks even if your entry did not contain at least one link. Also fix not sending trackbacks containing "#" fragments diff --git a/include/admin/import.inc.php b/include/admin/import.inc.php index 1a96a65..5ec20ed 100644 --- a/include/admin/import.inc.php +++ b/include/admin/import.inc.php @@ -90,6 +90,16 @@ class Serendipity_Import { } } } + + function &nativeQuery($query, $db = false) { + global $serendipity; + + mysql_select_db($this->data['name']); + $return = &mysql_query($query, $db); + print_r($return); + mysql_select_db($serendipity['dbName']); + return $return; + } } if ( isset($serendipity['GET']['importFrom']) ) { diff --git a/include/admin/importers/b2evolution.inc.php b/include/admin/importers/b2evolution.inc.php index 5328a19..24edaa1 100644 --- a/include/admin/importers/b2evolution.inc.php +++ b/include/admin/importers/b2evolution.inc.php @@ -89,7 +89,7 @@ class Serendipity_Import_b2evolution extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT ID AS ID, + $res = @$this->nativeQuery("SELECT ID AS ID, user_login AS user_login, user_pass AS user_pass, user_email AS user_email, @@ -132,7 +132,7 @@ class Serendipity_Import_b2evolution extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM evo_posts ORDER BY ID;", $b2db); + $res = @$this->nativeQuery("SELECT * FROM evo_posts ORDER BY ID;", $b2db); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($b2db)); } @@ -172,7 +172,7 @@ class Serendipity_Import_b2evolution extends Serendipity_Import { } /* Even more category stuff */ - $res = @mysql_query("SELECT * FROM evo_postcats;", $b2db); + $res = @$this->nativeQuery("SELECT * FROM evo_postcats;", $b2db); if (!$res) { return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($b2db)); } @@ -203,7 +203,7 @@ class Serendipity_Import_b2evolution extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM evo_comments;", $b2db); + $res = @$this->nativeQuery("SELECT * FROM evo_comments;", $b2db); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($b2db)); } @@ -265,7 +265,7 @@ class Serendipity_Import_b2evolution extends Serendipity_Import { $where = "WHERE cat_parent_ID = '" . mysql_escape_string($parentid) . "'"; } - $res = mysql_query("SELECT * FROM evo_categories + $res = $this->nativeQuery("SELECT * FROM evo_categories " . $where); if (!$res) { echo mysql_error(); diff --git a/include/admin/importers/bblog.inc.php b/include/admin/importers/bblog.inc.php index cd458cf..ebf9710 100644 --- a/include/admin/importers/bblog.inc.php +++ b/include/admin/importers/bblog.inc.php @@ -91,7 +91,7 @@ class Serendipity_Import_bblog extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT id AS ID, + $res = @$this->nativeQuery("SELECT id AS ID, password AS pw, nickname AS user_login, email AS user_email, @@ -120,7 +120,7 @@ class Serendipity_Import_bblog extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}sections", $bblogdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}sections", $bblogdb); if (!$res) { return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($bblogdb)); } @@ -142,7 +142,7 @@ class Serendipity_Import_bblog extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}posts ORDER BY postid;", $bblogdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}posts ORDER BY postid;", $bblogdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($bblogdb)); } @@ -193,7 +193,7 @@ class Serendipity_Import_bblog extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments WHERE type = 'comment';", $bblogdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}comments WHERE type = 'comment';", $bblogdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($bblogdb)); } diff --git a/include/admin/importers/bmachine.inc.php b/include/admin/importers/bmachine.inc.php index 7d05cc1..5b322a6 100644 --- a/include/admin/importers/bmachine.inc.php +++ b/include/admin/importers/bmachine.inc.php @@ -89,7 +89,7 @@ class Serendipity_Import_bmachine extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT id AS ID, + $res = @$this->nativeQuery("SELECT id AS ID, user_login AS user_login, user_pass AS user_pass, user_email AS user_email, @@ -126,7 +126,7 @@ class Serendipity_Import_bmachine extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT id AS cat_ID, + $res = @$this->nativeQuery("SELECT id AS cat_ID, cat_name AS cat_name, cat_info AS category_description FROM bmc_cats ORDER BY id;", $txpdb); @@ -154,7 +154,7 @@ class Serendipity_Import_bmachine extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM bmc_posts ORDER BY id;", $txpdb); + $res = @$this->nativeQuery("SELECT * FROM bmc_posts ORDER BY id;", $txpdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($txpdb)); } @@ -195,7 +195,7 @@ class Serendipity_Import_bmachine extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM bmc_comments;", $txpdb); + $res = @$this->nativeQuery("SELECT * FROM bmc_comments;", $txpdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($txpdb)); } diff --git a/include/admin/importers/geeklog.inc.php b/include/admin/importers/geeklog.inc.php index b4f6603..4031e7f 100644 --- a/include/admin/importers/geeklog.inc.php +++ b/include/admin/importers/geeklog.inc.php @@ -95,7 +95,7 @@ class Serendipity_Import_geeklog extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT uid AS ID, + $res = @$this->nativeQuery("SELECT uid AS ID, username AS user_login, passwd AS user_pass, email AS user_email, @@ -125,7 +125,7 @@ class Serendipity_Import_geeklog extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT tid AS cat_ID, topic AS cat_name, topic AS category_description FROM {$this->data['prefix']}topics ORDER BY tid;", $gdb); + $res = @$this->nativeQuery("SELECT tid AS cat_ID, topic AS cat_name, topic AS category_description FROM {$this->data['prefix']}topics ORDER BY tid;", $gdb); if (!$res) { return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($gdb)); } @@ -150,7 +150,7 @@ class Serendipity_Import_geeklog extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}stories ORDER BY sid;", $gdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}stories ORDER BY sid;", $gdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($gdb)); } @@ -192,7 +192,7 @@ class Serendipity_Import_geeklog extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $gdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}comments;", $gdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($gdb)); } diff --git a/include/admin/importers/nucleus.inc.php b/include/admin/importers/nucleus.inc.php index 7dce7ac..9aa6ebe 100644 --- a/include/admin/importers/nucleus.inc.php +++ b/include/admin/importers/nucleus.inc.php @@ -92,7 +92,7 @@ class Serendipity_Import_Nucleus extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT mnumber AS ID, mname AS user_login, mpassword AS user_pass, memail AS user_email, madmin AS user_level FROM {$this->data['prefix']}member;", $nucdb); + $res = @$this->nativeQuery("SELECT mnumber AS ID, mname AS user_login, mpassword AS user_pass, memail AS user_email, madmin AS user_level FROM {$this->data['prefix']}member;", $nucdb); if (!$res) { return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($nucdb)); } @@ -121,7 +121,7 @@ class Serendipity_Import_Nucleus extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT catid AS cat_ID, cname AS cat_name, cdesc AS category_description FROM {$this->data['prefix']}category ORDER BY catid;", $nucdb); + $res = @$this->nativeQuery("SELECT catid AS cat_ID, cname AS cat_name, cdesc AS category_description FROM {$this->data['prefix']}category ORDER BY catid;", $nucdb); if (!$res) { return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($nucdb)); } @@ -146,7 +146,7 @@ class Serendipity_Import_Nucleus extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}item ORDER BY itime;", $nucdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}item ORDER BY itime;", $nucdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($nucdb)); } @@ -187,7 +187,7 @@ class Serendipity_Import_Nucleus extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comment;", $nucdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}comment;", $nucdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($nucdb)); } diff --git a/include/admin/importers/phpbb.inc.php b/include/admin/importers/phpbb.inc.php index 6604451..5fcf917 100644 --- a/include/admin/importers/phpbb.inc.php +++ b/include/admin/importers/phpbb.inc.php @@ -91,7 +91,7 @@ class Serendipity_Import_phpbb extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT user_id AS ID, + $res = @$this->nativeQuery("SELECT user_id AS ID, username AS user_login, user_password AS user_pass, user_email AS user_email, @@ -123,7 +123,7 @@ class Serendipity_Import_phpbb extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT cat_id AS cat_ID, + $res = @$this->nativeQuery("SELECT cat_id AS cat_ID, cat_title AS cat_name FROM {$this->data['prefix']}categories", $gdb); if (!$res) { @@ -147,7 +147,7 @@ class Serendipity_Import_phpbb extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT forum_id AS cat_ID, + $res = @$this->nativeQuery("SELECT forum_id AS cat_ID, cat_id AS parent_cat_id, forum_name AS cat_name, forum_desc AS category_description @@ -184,7 +184,7 @@ class Serendipity_Import_phpbb extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT t.topic_title, + $res = @$this->nativeQuery("SELECT t.topic_title, t.topic_poster, t.forum_id, p.post_time, @@ -241,7 +241,7 @@ class Serendipity_Import_phpbb extends Serendipity_Import { /* Comments */ $topic_id = $entries[$x]['topic_id']; - $c_res = @mysql_query("SELECT t.topic_title, + $c_res = @$this->nativeQuery("SELECT t.topic_title, t.topic_poster, p.poster_id, t.forum_id, diff --git a/include/admin/importers/pmachine.inc.php b/include/admin/importers/pmachine.inc.php index 25acc59..9c8275c 100644 --- a/include/admin/importers/pmachine.inc.php +++ b/include/admin/importers/pmachine.inc.php @@ -92,7 +92,7 @@ class Serendipity_Import_pMachine extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT id AS ID, + $res = @$this->nativeQuery("SELECT id AS ID, username AS user_login, `password` AS user_pass, email AS user_email, @@ -127,7 +127,7 @@ class Serendipity_Import_pMachine extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT id AS cat_ID, + $res = @$this->nativeQuery("SELECT id AS cat_ID, category AS cat_name, category AS category_description FROM {$this->data['prefix']}categories ORDER BY id", $pmdb); @@ -155,7 +155,7 @@ class Serendipity_Import_pMachine extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}weblog ORDER BY t_stamp;", $pmdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}weblog ORDER BY t_stamp;", $pmdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($pmdb)); } @@ -196,7 +196,7 @@ class Serendipity_Import_pMachine extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $pmdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}comments;", $pmdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($pmdb)); } diff --git a/include/admin/importers/sunlog.inc.php b/include/admin/importers/sunlog.inc.php index 0e8b3b3..4e5649e 100644 --- a/include/admin/importers/sunlog.inc.php +++ b/include/admin/importers/sunlog.inc.php @@ -97,7 +97,7 @@ class Serendipity_Import_sunlog extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT id AS ID, + $res = @$this->nativeQuery("SELECT id AS ID, name AS user_login, email AS user_email, homepage AS user_url @@ -132,7 +132,7 @@ class Serendipity_Import_sunlog extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}articles ORDER BY id;", $sunlogdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}articles ORDER BY id;", $sunlogdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($sunlogdb)); } @@ -164,7 +164,7 @@ class Serendipity_Import_sunlog extends Serendipity_Import { } /* Even more category stuff */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}transfer_c;", $sunlogdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}transfer_c;", $sunlogdb); if (!$res) { return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($sunlogdb)); } @@ -195,7 +195,7 @@ class Serendipity_Import_sunlog extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}c_comments;", $sunlogdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}c_comments;", $sunlogdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($sunlogdb)); } @@ -244,7 +244,7 @@ class Serendipity_Import_sunlog extends Serendipity_Import { function importCategories($parentid = 0, $new_parentid = 0) { $where = "WHERE parent = '" . mysql_escape_string($parentid) . "'"; - $res = mysql_query("SELECT * FROM {$this->data['prefix']}categories + $res = $this->nativeQuery("SELECT * FROM {$this->data['prefix']}categories " . $where); if (!$res) { echo mysql_error(); diff --git a/include/admin/importers/textpattern.inc.php b/include/admin/importers/textpattern.inc.php index d17316f..5d0b814 100644 --- a/include/admin/importers/textpattern.inc.php +++ b/include/admin/importers/textpattern.inc.php @@ -95,7 +95,7 @@ class Serendipity_Import_textpattern extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT user_id AS ID, + $res = @$this->nativeQuery("SELECT user_id AS ID, name AS user_login, `pass` AS user_pass, email AS user_email, @@ -138,7 +138,7 @@ class Serendipity_Import_textpattern extends Serendipity_Import { /* Entries */ // Notice: Textpattern doesn't honor the prefix for this table. Wicked system. - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}textpattern ORDER BY Posted;", $txpdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}textpattern ORDER BY Posted;", $txpdb); if (!$res) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($txpdb)); } @@ -179,7 +179,7 @@ class Serendipity_Import_textpattern extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}txp_discuss;", $txpdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}txp_discuss;", $txpdb); if (!$res) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($txpdb)); } @@ -219,7 +219,7 @@ class Serendipity_Import_textpattern extends Serendipity_Import { } function importCategories($parentname = 'root', $parentid = 0) { - $res = mysql_query("SELECT * FROM {$this->data['prefix']}txp_category + $res = $this->nativeQuery("SELECT * FROM {$this->data['prefix']}txp_category WHERE parent = '" . mysql_escape_string($parentname) . "' AND type = 'article'"); if (!$res) { echo mysql_error(); diff --git a/include/admin/importers/wordpress.inc.php b/include/admin/importers/wordpress.inc.php index 8661117..2abccab 100644 --- a/include/admin/importers/wordpress.inc.php +++ b/include/admin/importers/wordpress.inc.php @@ -91,7 +91,7 @@ class Serendipity_Import_WordPress extends Serendipity_Import { } /* Users */ - $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$this->data['prefix']}users;", $wpdb); + $res = @$this->nativeQuery("SELECT ID, user_login, user_pass, user_email, user_level FROM {$this->data['prefix']}users;", $wpdb); if ( !$res ) { return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($wpdb)); } @@ -121,7 +121,7 @@ class Serendipity_Import_WordPress extends Serendipity_Import { } /* Categories */ - $res = @mysql_query("SELECT cat_ID, cat_name, category_description, category_parent FROM {$this->data['prefix']}categories ORDER BY category_parent, cat_ID;", $wpdb); + $res = @$this->nativeQuery("SELECT cat_ID, cat_name, category_description, category_parent FROM {$this->data['prefix']}categories ORDER BY category_parent, cat_ID;", $wpdb); if ( !$res ) { return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($wpdb)); } @@ -163,7 +163,7 @@ class Serendipity_Import_WordPress extends Serendipity_Import { serendipity_rebuildCategoryTree(); /* Entries */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}posts ORDER BY post_date;", $wpdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}posts ORDER BY post_date;", $wpdb); if ( !$res ) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb)); } @@ -190,7 +190,7 @@ class Serendipity_Import_WordPress extends Serendipity_Import { } /* Entry/category */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}post2cat;", $wpdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}post2cat;", $wpdb); if ( !$res ) { return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb)); } @@ -212,7 +212,7 @@ class Serendipity_Import_WordPress extends Serendipity_Import { } /* Comments */ - $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $wpdb); + $res = @$this->nativeQuery("SELECT * FROM {$this->data['prefix']}comments;", $wpdb); if ( !$res ) { return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($wpdb)); }