convert,upgrades内のコードも含めてDBクラスを使用するコードに修正（未テスト）

[nucleus-jp/nucleus-next.git] / nucleus / convert / functions.inc.php

diff --git a/nucleus/convert/functions.inc.php b/nucleus/convert/functions.inc.php
index cf5fede..cf28fb5 100644 (file)
--- a/nucleus/convert/functions.inc.php
+++ b/nucleus/convert/functions.inc.php
@@ -804,9 +804,12 @@ class BlogImport {
                $query = 'INSERT INTO '.sql_table('item').' (ITITLE, IBODY, IMORE, IBLOG, IAUTHOR, ITIME, ICLOSED, IKARMAPOS, IKARMANEG, ICAT) '
                           . "VALUES ('$title', '$body', '$more', $blogid, $authorid, '$timestamp', $closed, $karmapos, $karmaneg,  $category)";
 
-               mysql_query($query) or die("Error while executing query: " . $query);
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
 
-               return mysql_insert_id();
+               return DB::getInsertId();
        }
 
        function sql_addToBlog($name, $shortname, $ownerid) {
@@ -814,15 +817,18 @@ class BlogImport {
                $shortname      = addslashes($shortname);
 
                // create new category first
-               mysql_query('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another category')");
-               $defcat = mysql_insert_id();
+               DB::execute('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another category')");
+               $defcat = DB::getInsertId();
 
                $query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ('$name','$shortname',1 ,0, $defcat)";
-               mysql_query($query) or die("Error while executing query: " . $query);
-               $id = mysql_insert_id();
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
+               $id = DB::getInsertId();
 
                // update category row so it links to blog
-               mysql_query('UPDATE ' . sql_table('category') . ' SET cblog=' . intval($id). ' WHERE catid=' . intval($defcat));
+               DB::execute('UPDATE ' . sql_table('category') . ' SET cblog=' . intval($id). ' WHERE catid=' . intval($defcat));
 
                BlogImport::sql_addToTeam($id,$ownerid,1);
 
@@ -842,9 +848,12 @@ class BlogImport {
                           . ' (CUSER, CMAIL, CMEMBER, CBODY, CITEM, CTIME, CHOST, CBLOG, CIP) '
                           . "VALUES ('$name', '$url', $memberid, '$body', $itemid, '$timestamp', '$host', $blogid, '$ip')";
 
-               mysql_query($query) or die("Error while executing query: " . $query);
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
 
-               return mysql_insert_id();
+               return DB::getInsertId();
        }
 
        function sql_addToTeam($blogid, $memberid, $admin) {
@@ -852,13 +861,14 @@ class BlogImport {
                $query = 'INSERT INTO '.sql_table('team').' (TMEMBER, TBLOG, TADMIN) '
                           . "VALUES ($memberid, $blogid, $admin)";
 
-               mysql_query($query) or die("Error while executing query: " . $query);
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
 
-               return mysql_insert_id();
+               return DB::getInsertId();
        }
 
-
-
 }
 
 // some sort of version checking
@@ -890,9 +900,12 @@ if ($ver > 250)
                $query = 'INSERT INTO '.sql_table('item').' (ITITLE, IBODY, IMORE, IBLOG, IAUTHOR, ITIME, ICLOSED, IKARMAPOS, IKARMANEG, ICAT) '
                           . "VALUES ('$title', '$body', '$more', $blogid, $authorid, '$timestamp', $closed, $karmapos, $karmaneg,  $category)";
 
-               mysql_query($query) or die("Error while executing query: " . $query);
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
 
-               return mysql_insert_id();
+               return DB::getInsertId();
        }
 
 
@@ -902,16 +915,18 @@ if ($ver > 250)
                $shortname = addslashes($shortname);
 
                // create new category first
-               mysql_query('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another categort')");
-               $defcat = mysql_insert_id();
+               DB::execute('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another categort')");
+               $defcat = DB::getInsertId();
 
                $query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ('$name','$shortname',1 ,0, $defcat)";
-               mysql_query($query) or die("Error while executing query: " . $query);
-               $id = mysql_insert_id();
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
+               $id = DB::getInsertId();
 
                convert_addToTeam($id,$ownerid,1);
 
-
                return $id;
        }
 
@@ -927,9 +942,12 @@ if ($ver > 250)
                           . ' (CUSER, CMAIL, CMEMBER, CBODY, CITEM, CTIME, CHOST, CBLOG, CIP) '
                           . "VALUES ('$name', '$url', $memberid, '$body', $itemid, '$timestamp', '$host', $blogid, '$ip')";
 
-               mysql_query($query) or die("Error while executing query: " . $query);
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
 
-               return mysql_insert_id();
+               return DB::getInsertId();
        }
 
        // TODO: remove this function (replaced by BlogImport::sql_addToTeam)
@@ -938,9 +956,12 @@ if ($ver > 250)
                $query = 'INSERT INTO '.sql_table('team').' (TMEMBER, TBLOG, TADMIN) '
                           . "VALUES ($memberid, $blogid, $admin)";
 
-               mysql_query($query) or die("Error while executing query: " . $query);
-
-               return mysql_insert_id();
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+               }
+               
+               return DB::getInsertId();
        }
 
        function convert_showLogin($type) {