Show category name before deleting

diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php
index 1d15f8c9f970ddc17522c67ecf475cbfda5407cf..1cb81ad892dc2c8860c4ae33d6de19c8fcac6a22 100644 (file)
--- a/include/admin/category.inc.php
+++ b/include/admin/category.inc.php
@@ -36,28 +36,14 @@ if (isset($_POST['SAVE']) && serendipity_checkFormToken()) {
             */
         }
 
-        /* Check to see if a category with the same name, already exist */
-        $sql = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}category
-                                        WHERE category_name = '". serendipity_db_escape_string($name) ."'", true);
-        if ( $sql ) {
-            echo '<div class="serendipityAdminMsgError">'. sprintf(CATEGORY_ALREADY_EXIST, htmlspecialchars($name)) .'</div>';
-        } else {
-            $catid = serendipity_addCategory($name, $desc, $authorid, $icon, $parentid);
-            serendipity_ACLGrant($catid, 'category', 'read', $serendipity['POST']['cat']['read_authors']);
-            serendipity_ACLGrant($catid, 'category', 'write', $serendipity['POST']['cat']['write_authors']);
-
-            echo '<div class="serendipityAdminMsgSuccess">'. CATEGORY_SAVED .'</div>';
-        }
+        $catid = serendipity_addCategory($name, $desc, $authorid, $icon, $parentid);
+        serendipity_ACLGrant($catid, 'category', 'read', $serendipity['POST']['cat']['read_authors']);
+        serendipity_ACLGrant($catid, 'category', 'write', $serendipity['POST']['cat']['write_authors']);
 
+        echo '<div class="serendipityAdminMsgSuccess">'. CATEGORY_SAVED .'</div>';
 
     } elseif ($serendipity['GET']['adminAction'] == 'edit') {
-            /* Check to see if a category with the same name, already exist */
-            $sql = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}category
-                                                WHERE category_name = '". serendipity_db_escape_string($name) ."'
-                                                    AND categoryid <> ". (int)$serendipity['GET']['cid'], true);
-            if ( $sql ) {
-                echo '<div class="serendipityAdminMsgError">'. sprintf(CATEGORY_ALREADY_EXIST, htmlspecialchars($name)) .'</div>';
-            } else if (!serendipity_checkPermission('adminCategoriesMaintainOthers') && !serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write')) {
+            if (!serendipity_checkPermission('adminCategoriesMaintainOthers') && !serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write')) {
                 echo '<div class="serendipityAdminMsgError">'. PERM_DENIED .'</div>';
             } else {
                 /* Check to make sure parent is not a child of self */
@@ -131,12 +117,12 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
     if ( $serendipity['GET']['adminAction'] == 'delete' ) {
         $this_cat = serendipity_fetchCategoryInfo($serendipity['GET']['cid']);
         if (   (serendipity_checkPermission('adminCategoriesDelete') && serendipity_checkPermission('adminCategoriesMaintainOthers'))
-            || (serendipity_checkPermission('adminCategoriesDelete') && ($serendipity['authorid'] == $this_cat['authorid'] || $this_cat['authorid'] == '0')) 
-            || (serendipity_checkPermission('adminCategoriesDelete') && serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write'))) { 
+            || (serendipity_checkPermission('adminCategoriesDelete') && ($serendipity['authorid'] == $this_cat['authorid'] || $this_cat['authorid'] == '0'))
+            || (serendipity_checkPermission('adminCategoriesDelete') && serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write'))) {
 ?>
         <form method="POST" name="serendipityCategory" action="?serendipity[adminModule]=category&amp;serendipity[adminAction]=doDelete&amp;serendipity[cid]=<?php echo $serendipity['GET']['cid'] ?>">
         <?php echo serendipity_setFormToken(); ?>
-            <br />
+            <h3><?php echo $this_cat['category_name']; ?></h3>
             <?php echo CATEGORY_REMAINING ?>:
             <select name="serendipity[cat][remaining_catid]">
                 <option value="0">- <?php echo NO_CATEGORY ?> -</option>