CHANGE:クエリ生成に使われているi18n::formatted_datetime()をDB::formatDateTime()に変更

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

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index bc86bce..ad4b6b4 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -941,7 +941,7 @@ class Admin
                                $categories = DB::getResult($query);
                                foreach ( $categories as $cat )
                                {
-                                       if ( $oCat->catid != $selected )
+                                       if ( $cat['catid'] != $selected )
                                        {
                                        echo "<option value=\"{$cat['catid']}\" {$selectText} >" . Entity::hsc($cat['cname']) . "</option>\n";
                                        }
@@ -1511,7 +1511,7 @@ class Admin
                $currenttime = $blog->getCorrectTime(time());
                
                $query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'";
-               $query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime));
+               $query = sprintf($query, sql_table('item'), (integer) $blogid, DB::formatDateTime($currenttime));
                $result = DB::getResult($query);
                
                if ( $result->rowCount() > 0 )
@@ -3614,15 +3614,15 @@ class Admin
         );
 
 
-        // add slashes for sql queries
-        $bname =        DB::quoteValue($bname);
-        $bshortname =   DB::quoteValue($bshortname);
-        $btimeoffset =  DB::quoteValue($btimeoffset);
-        $bdesc =        DB::quoteValue($bdesc);
-        $bdefskin =     DB::quoteValue($bdefskin);
-
         // create blog
-        $query = 'INSERT INTO '.sql_table('blog')." (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ($bname, $bshortname, $bdesc, $btimeoffset, $bdefskin)";
+               $query = sprintf('INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s)',
+                       sql_table('blog'),
+                       DB::quoteValue($bname),
+                       DB::quoteValue($bshortname),
+                       DB::quoteValue($bdesc),
+                       DB::quoteValue($btimeoffset),
+                       DB::quoteValue($bdefskin)
+               );
         DB::execute($query);
         $blogid = DB::getInsertId();
         $blog   =& $manager->getBlog($blogid);
@@ -3630,8 +3630,13 @@ class Admin
         // create new category
         $catdefname = (defined('_EBLOGDEFAULTCATEGORY_NAME') ? _EBLOGDEFAULTCATEGORY_NAME : 'General');
         $catdefdesc = (defined('_EBLOGDEFAULTCATEGORY_DESC') ? _EBLOGDEFAULTCATEGORY_DESC : 'Items that do not fit in other categories');
-        $sql = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)';
-        DB::execute(sprintf($sql, sql_table('category'), $blogid, DB::quoteValue($catdefname), DB::quoteValue($catdefdesc)));
+               $query = sprintf('INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)',
+                       sql_table('category'),
+                       $blogid,
+                       DB::quoteValue($catdefname),
+                       DB::quoteValue($catdefdesc)
+               );
+        DB::execute($query);
         $catid = DB::getInsertId();
 
         // set as default category
@@ -3640,7 +3645,7 @@ class Admin
 
         // create team member
         $memberid = $member->getID();
-        $query = 'INSERT INTO '.sql_table('team')." (tmember, tblog, tadmin) VALUES ($memberid, $blogid, 1)";
+        $query = sprintf('INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1)', sql_table('team'), $memberid, $blogid);
         DB::execute($query);
 
         $itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item');
@@ -4335,7 +4340,7 @@ selector();
                
                $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, %s, %s)";
                $query = sprintf($query, sql_table('template'), (integer) $id, $partname, $content);
-               if ( DB::execute($query) )
+               if ( DB::execute($query) === FALSE )
                {
                        $err = DB::getError();
                        exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);
@@ -5681,7 +5686,7 @@ selector();
                
                $query = "UPDATE %s SET value=%s WHERE name=%s";
                $query = sprintf($query, sql_table('config'), $val, $name);
-               if ( DB::execute($query) )
+               if ( DB::execute($query) === FALSE )
                {
                        $err = DB::getError();
                        die("Query error: " . $err[2]);