FIX: 通常/管理画面共に、スキンの編集・複製・削除ページのURLが固定だったのを修正

listplug_table_skinlist()、listplug_table_adminskinlist()で<%editurl%>、<%cloneurl%>、<%deleteurl%>が使えるように修正。合わせてスキンファイルも修正。

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index 0d37d8d..5a09e7e 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -1537,10 +1537,10 @@ function listplug_table_templatelist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
                        }\r
                        \r
-                       $deleteurl      = $CONF['AdminURL'] . "index.php?action=templatedelete&templateid={$current->tdnumber}";\r
-                       $editurl        = $CONF['AdminURL'] . "index.php?action=templateedit&templateid={$current->tdnumber}";\r
-                       $cloneurl       = $CONF['AdminURL'] . "index.php?action=templateclone&templateid={$current->tdnumber}";\r
-                       $url = "index.php?action=templateclone&templateid={$current->tdnumber}";\r
+                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=templatedelete&templateid={$current->tdnumber}";\r
+                       $editurl        = "{$CONF['AdminURL']}index.php?action=templateedit&templateid={$current->tdnumber}";\r
+                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=templateclone&templateid={$current->tdnumber}";\r
+                       \r
                        $data = array(\r
                                'templatename'  => Entity::hsc($current->tdname),\r
                                'templatedesc'  => Entity::hsc($current->tddesc),\r
@@ -1625,7 +1625,10 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'];\r
                        }\r
                        \r
-                       $url  = $manager->addTicketToUrl('index.php?action=skinclone&skinid=' . intval($current->sdnumber));\r
+                       $editurl        = "{$CONF['AdminURL']}index.php?action=skinedit&skinid={$current->sdnumber}";\r
+                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=skinclone&skinid={$current->sdnumber}";\r
+                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=skindelete&skinid={$current->sdnumber}";\r
+                       \r
                        $data = array(\r
                                'skintypelabel' => _LISTS_TYPE,\r
                                'skintype'              => Entity::hsc($current->sdtype),\r
@@ -1636,7 +1639,9 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                'skindesc'              => Entity::hsc($current->sddesc),\r
                                'skinid'                => (integer) $current->sdnumber,\r
                                'tabindex'              => $vars['tabindex'],\r
-                               'cloneurl'              => Entity::hsc($url),\r
+                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
+                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
+                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'clonebtn'              => _LISTS_CLONE,\r
                                'delbtn'                => _LISTS_DELETE,\r
@@ -2036,7 +2041,10 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'];\r
                        }\r
                        \r
-                       $url  = $manager->addTicketToUrl('index.php?action=adminskinclone&skinid=' . intval($current->sdnumber));\r
+                       $editurl        = "{$CONF['AdminURL']}index.php?action=adminskinedit&skinid={$current->sdnumber}";\r
+                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=adminskinclone&skinid={$current->sdnumber}";\r
+                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=adminskindelete&skinid={$current->sdnumber}";\r
+                       \r
                        $data = array(\r
                                'skintypelabel' => _LISTS_TYPE,\r
                                'skintype'              => Entity::hsc($current->sdtype),\r
@@ -2047,7 +2055,9 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
                                'skindesc'              => Entity::hsc($current->sddesc),\r
                                'skinid'                => (integer) $current->sdnumber,\r
                                'tabindex'              => $vars['tabindex'],\r
-                               'cloneurl'              => Entity::hsc($url),\r
+                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
+                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
+                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'clonebtn'              => _LISTS_CLONE,\r
                                'delbtn'                => _LISTS_DELETE,\r
@@ -2183,9 +2193,9 @@ function listplug_table_admintemplatelist($vars, $type, $templateName = '')
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
                        }\r
-                       $deleteurl      = $CONF['AdminURL'] . "index.php?action=admintemplatedelete&templateid={$current->tdnumber}";\r
-                       $editurl        = $CONF['AdminURL'] . "index.php?action=admintemplateedit&templateid={$current->tdnumber}";\r
-                       $cloneurl       = $CONF['AdminURL'] . "index.php?action=admintemplateclone&templateid={$current->tdnumber}";\r
+                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=admintemplatedelete&templateid={$current->tdnumber}";\r
+                       $editurl        = "{$CONF['AdminURL']}index.php?action=admintemplateedit&templateid={$current->tdnumber}";\r
+                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=admintemplateclone&templateid={$current->tdnumber}";\r
                        $data = array(\r
                                'templatename'  => Entity::hsc($current->tdname),\r
                                'templatedesc'  => Entity::hsc($current->tddesc),\r

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index 68f136c..9cf771e 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -2573,24 +2573,34 @@ selector();
 <td><%reason%></td>\r
 <td><a href="<%adminurl%>index.php?action=banlistdelete&amp;blogid=<%blogid%>&amp;iprange=<%iprange%>"><%delbtn%></a></td>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD"><![CDATA[<th><%colname%></th><th><%coldesc%></th><th colspan="3"><%colact%></th>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY"><![CDATA[<td><%skinname%><br /><br />\r
-<%skintypelabel%> <%skintype%><br />\r
-<%incmodelabel%> <%incmode%><br />\r
-<%incpreflabel%> <%incpref%><br />\r
-<%skinthumb%>\r
-<%readme%></td>\r
-<td class="availableSkinTypes"><%skindesc%><%skinparts%></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%adminurl%>index.php?action=skinedit&amp;skinid=<%skinid%>" tabindex="<%tabindex%>"><%editbtn%>\r
-</a></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%cloneurl%>" tabindex="<%tabindex%>"><%clonebtn%>\r
-</a></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%adminurl%>index.php?action=skindelete&amp;skinid=<%skinid%>" tabindex="<%tabindex%>"><%delbtn%>\r
-</a></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD"><![CDATA[\r
+       <th><%colname%></th>\r
+       <th><%coldesc%></th>\r
+       <th colspan="3"><%colact%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY"><![CDATA[\r
+       <td><%skinname%><br /><br />\r
+       <%skintypelabel%> <%skintype%><br />\r
+       <%incmodelabel%> <%incmode%><br />\r
+       <%incpreflabel%> <%incpref%><br />\r
+       <%skinthumb%>\r
+       <%readme%></td>\r
+       <td class="availableSkinTypes"><%skindesc%><%skinparts%></td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%editurl%>" tabindex="<%tabindex%>">\r
+       <%editbtn%>\r
+       </a>\r
+       </td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%cloneurl%>" tabindex="<%tabindex%>">\r
+       <%clonebtn%>\r
+       </a>\r
+       </td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%deleteurl%>" tabindex="<%tabindex%>">\r
+       <%delbtn%>\r
+       </a>\r
+       </td>\r
 ]]></part>\r
     <part name="SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM"><![CDATA[<td>\r
 <a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%blogid%>" title="<%ttsettingtext%>"><%settingtext%></a>\r