FIX: コメントの編集・削除、アクセス禁止の追加と削除が行えないバグの修正

TODOとして、AdminActions::parse_banlistdeletedlist()においては<%blogsettings%>のタグ一式が使えたほうがよいことを挙げる。

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 746985b..36b8b6c 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -1314,8 +1314,8 @@ class Admin
                );\r
                $manager->notify('PreUpdateComment', $data);\r
                \r
-               $query = "UPDATE %s SET cmail='%s', cemail  = '%s', cbody= '%s' WHERE cnumber=%d;";\r
-               $query = sprintf($query, sql_real_escape_string($url), sql_real_escape_string($url), sql_real_escape_string($url), (integer) $commentid);\r
+               $query = "UPDATE %s SET cmail='%s', cemail='%s', cbody='%s' WHERE cnumber=%d;";\r
+               $query = sprintf($query, sql_table('comment'), sql_real_escape_string($url), sql_real_escape_string($email), sql_real_escape_string($body), (integer) $commentid);\r
                sql_query($query);\r
                \r
                // get itemid\r
@@ -5098,9 +5098,8 @@ class Admin
        {\r
                global $member, $manager;\r
                \r
-               $member->blogAdminRights($blogid) or self::disallow();\r
-               \r
                $blogid = intRequestVar('blogid');\r
+               $member->blogAdminRights($blogid) or self::disallow();\r
                \r
                self::pagehead();\r
                self::$skin->parse('banlist');\r
@@ -5137,19 +5136,19 @@ class Admin
        {\r
                global $member, $manager;\r
                \r
-               $member->blogAdminRights($blogid) or self::disallow();\r
-               \r
                $blogid         = intPostVar('blogid');\r
                $allblogs       = postVar('allblogs');\r
                $iprange        = postVar('iprange');\r
                \r
+               $member->blogAdminRights($blogid) or self::disallow();\r
+               \r
                $deleted = array();\r
                \r
                if ( !$allblogs )\r
                {\r
                        if ( Ban::removeBan($blogid, $iprange) )\r
                        {\r
-                               array_push($deleted, $blogid);\r
+                               $deleted[] = $blogid;\r
                        }\r
                }\r
                else\r
@@ -5160,7 +5159,7 @@ class Admin
                        {\r
                                if ( Ban::removeBan($blogje, $iprange) )\r
                                {\r
-                                       array_push($deleted, $blogje);\r
+                                       $deleted[] = $blogje;\r
                                }\r
                        }\r
                }\r
@@ -5170,6 +5169,9 @@ class Admin
                        self::error(_ERROR_DELETEBAN);\r
                }\r
                \r
+               /* TODO: we should use other ways */\r
+               $_REQUEST['delblogs'] = $deleted;\r
+               \r
                self::pagehead();\r
                self::$skin->parse('banlistdeleteconfirm');\r
                self::pagefoot();\r

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 15b0441..ff3c888 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1494,12 +1494,13 @@ class AdminActions extends BaseActions
        public function parse_banlistdeletedlist($templateName = '')
        {
                global $manager;
-               $templates = array();
                
+               $templates = array();
                if ( $templateName )
                {
                        $templates = Template::read($templateName);
                }
+               
                if ( !array_key_exists('BANLIST_DELETED_LIST', $templates) || empty($templates['BANLIST_DELETED_LIST']) )
                {
                        $template = "<li><%blogname%></li>\n";
@@ -1514,10 +1515,11 @@ class AdminActions extends BaseActions
                {
                        $blog =& $manager->getBlog($delblog);
                        $data =  array(
-                               Entity::hsc($blog->getName())
+                               'blogname' => Entity::hsc($blog->getName())
                        );
-                       Template::fill($template, $data);
+                       echo Template::fill($template, $data);
                }
+               
                return;
        }
        
@@ -2734,6 +2736,13 @@ class AdminActions extends BaseActions
                                $comment['body'] = str_replace('<br />', '', $comment['body']);
                                $comment['body'] = preg_replace("#<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\")?>[^<]*</a>#", "\\1", $comment['body']);
                                echo $comment['body'];
+                               break;
+                       case 'cmail':
+                               echo $comment['userid'];
+                               break;
+                       case 'url':
+                               echo $comment['userid'];
+                               break;
                        default:
                                echo $comment[$type];
                                break;
@@ -3380,7 +3389,7 @@ class AdminActions extends BaseActions
         */
        public function parse_getblogsetting($which)
        {
-               global $blog;
+               global $blog, $manager;
                
                if ( $blog )
                {
@@ -3388,7 +3397,6 @@ class AdminActions extends BaseActions
                }
                elseif ( $bid = intRequestVar('blogid') )
                {
-                       global $manager;
                        $b = $manager->getBlog($bid);
                }
                else

diff --git a/skins/admin/defaultadmin/skinbackup.xml b/skins/admin/defaultadmin/skinbackup.xml
index 9fec4e2..f721dea 100644 (file)
--- a/skins/admin/defaultadmin/skinbackup.xml
+++ b/skins/admin/defaultadmin/skinbackup.xml
@@ -844,7 +844,7 @@ selector();
     <part name="commentdelete"><![CDATA[<h2><%text(_DELETE_CONFIRM)%></h2>\r
             <p><%text(_CONFIRMTXT_COMMENT)%></p>\r
             <div class="note">\r
-            <b><%text(_EDITC_WHO%)>:</b> <%deletecomment(author)%>\r
+            <b><%text(_EDITC_WHO)%>:</b> <%deletecomment(author)%>\r
             <br />\r
             <b><%text(_EDITC_TEXT)%>:</b> <%deletecomment(body)%>\r
             </div>\r
@@ -859,7 +859,7 @@ selector();
                 <div>\r
                     <input type="hidden" name="action" value="commentupdate" />\r
                     <%ticket%>\r
-                    <input type="hidden" name="itemid" value="<%editcomment(id)%>" />\r
+                    <input type="hidden" name="commentid" value="<%editcomment(id)%>" />\r
                     <table>\r
                         <tr>\r
                             <th colspan="2"><%text(_EDITC_TITLE)%></th>\r