MARGE:masterブランチのマージ（マージできない分について、データベースハンドラーを書き換え）

[nucleus-jp/nucleus-next.git] / nucleus / libs / ITEM.php

diff --git a/nucleus/libs/ITEM.php b/nucleus/libs/ITEM.php
index 4df0789..9de8eb4 100644 (file)
--- a/nucleus/libs/ITEM.php
+++ b/nucleus/libs/ITEM.php
@@ -98,15 +98,15 @@ class Item
                if ( !$allow_future )\r
                {\r
                        $blog =& $manager->getBlog(getBlogIDFromItemID($item_id));\r
-                       $query .= "AND i.itime <= '" . i18n::formatted_datetime('mysql', $blog->getCorrectTime()) ."'";\r
+                       $query .= 'AND i.itime <= ' . DB::formatDateTime($blog->getCorrectTime());\r
                }\r
                \r
                $query .= ' LIMIT 1';\r
-               $result = sql_query($query);\r
+               $result = DB::getResult($query);\r
                \r
-               if ( sql_num_rows($result) == 1 )\r
+               if ( $result->rowCount() == 1 )\r
                {\r
-                       $aItemInfo = sql_fetch_assoc($result);\r
+                       $aItemInfo = $result->fetch(PDO::FETCH_ASSOC);\r
                        $aItemInfo['timestamp'] = strtotime($aItemInfo['itime']);\r
                        return $aItemInfo;\r
                }\r
@@ -165,7 +165,7 @@ class Item
                }\r
                \r
                // create new category if needed\r
-               if ( i18n::strpos($i_catid, 'newcat') )\r
+               if ( i18n::strpos($i_catid, 'newcat') === 0 )\r
                {\r
                        // get blogid\r
                        list($i_blogid) = sscanf($i_catid, "newcat-%d");\r
@@ -313,11 +313,11 @@ class Item
                // update item itself\r
                $query =  'UPDATE ' . sql_table('item')\r
                                . ' SET'\r
-                               . " ibody = '" . sql_real_escape_string($body) . "',"\r
-                               . " ititle = '" . sql_real_escape_string($title) . "',"\r
-                               . " imore = '" . sql_real_escape_string($more) . "',"\r
-                               . " iclosed = " . intval($closed) . ","\r
-                               . " icat = " . intval($catid);\r
+                               . ' ibody = ' . DB::quoteValue($body) . ','\r
+                               . ' ititle = ' . DB::quoteValue($title) . ','\r
+                               . ' imore = ' . DB::quoteValue($more) . ','\r
+                               . ' iclosed = ' . intval($closed) . ','\r
+                               . ' icat = ' . intval($catid);\r
                \r
                // if we received an updated timestamp that is in the past, but past posting is not allowed, reject that date change (timestamp = 0 will make sure the current date is kept)\r
                if ( (!$blog->allowPastPosting()) && ($timestamp < $blog->getCorrectTime()) )\r
@@ -361,20 +361,20 @@ class Item
                {\r
                        $query .= ', idraft = 1';\r
                        // set timestamp back to zero for a draft\r
-                       $query .= ", itime = '" . i18n::formatted_datetime('mysql', $timestamp) ."'";\r
+                       $query .= ', itime = ' . DB::formatDateTime($timestamp);\r
                }\r
                \r
                // update timestamp when needed\r
                if ( $timestamp != 0 )\r
                {\r
-                       $query .= ", itime = '" . i18n::formatted_datetime('mysql', $timestamp) ."'";\r
+                       $query .= ', itime = ' . DB::formatDateTime($timestamp);\r
                }\r
                \r
                // make sure the correct item is updated\r
                $query .= ' WHERE inumber = ' . $itemid;\r
                \r
                // off we go!\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $manager->notify('PostUpdateItem', array('itemid' => $itemid));\r
                \r
@@ -431,12 +431,12 @@ class Item
                // update item table\r
                $query = "UPDATE %s SET iblog=%d, icat=%d WHERE inumber=%d";\r
                $query = sprintf($query, sql_table('item'), $new_blogid, $new_catid, $itemid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // update comments\r
                $query = "UPDATE %s SET cblog=%d WHERE citem=%d";\r
                $query = sprintf($query, sql_table('comment'), $new_blogid, $itemid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $manager->notify(\r
                        'PostMoveItem',\r
@@ -473,12 +473,12 @@ class Item
                // delete item\r
                $query = "DELETE FROM %s WHERE inumber=%d";\r
                $query = sprintf($query, sql_table('item'), $itemid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete the comments associated with the item\r
                $query = "DELETE FROM %s WHERE citem=%d";\r
                $query = sprintf($query, sql_table('comment'), $itemid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all associated plugin options\r
                NucleusPlugin::delete_option_values('item', $itemid);\r
@@ -514,14 +514,14 @@ class Item
                                return 0;\r
                        }\r
                        $blog =& $manager->getBlog($blogid);\r
-                       $query .= " and itime<='" . i18n::formatted_datetime('mysql', $blog->getCorrectTime()) ."'";\r
+                       $query .= ' and itime<=' . DB::formatDateTime($blog->getCorrectTime());\r
                }\r
                if ( !$draft )\r
                {\r
                        $query .= ' and idraft=0';\r
                }\r
-               $result = sql_query($query);\r
-               return ( sql_num_rows($result) != 0 );\r
+               $result = DB::getResult($query);\r
+               return ( $result->rowCount() != 0 );\r
        }\r
        \r
        /**\r
@@ -576,7 +576,7 @@ class Item
                }\r
                \r
                // create new category if needed\r
-               if ( i18n::strpos($catid,'newcat') === 0 )\r
+               if ( i18n::strpos($i_catid,'newcat') === 0 )\r
                {\r
                        // Set in default category\r
                        $blog =& $manager->getBlog($i_blogid);\r