[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/www/admin/trove trove_cat_edit.php, 1.18, 1.19
From: |
tperdue |
Subject: |
[Gforge-commits] gforge/www/admin/trove trove_cat_edit.php, 1.18, 1.19 |
Date: |
Wed, 16 Jun 2004 21:47:32 -0500 |
Update of /cvsroot/gforge/gforge/www/admin/trove
In directory db.perdue.net:/home/tperdue/share/www.gforge.org/www/admin/trove
Modified Files:
trove_cat_edit.php
Log Message:
should be able to properly delete from trove cats
Index: trove_cat_edit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/trove/trove_cat_edit.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- trove_cat_edit.php 6 Apr 2004 16:02:03 -0000 1.18
+++ trove_cat_edit.php 17 Jun 2004 02:47:28 -0000 1.19
@@ -71,35 +71,25 @@
if ($form_trove_cat_id==$default_trove_cat){
exit_error(
$Language->getText('admin_trove_cat_edit','error_in_trove_operation_cant_delete'));
}
- $sql = "select count(*) from trove_group_link where
trove_cat_id='$form_trove_cat_id'";
- $row_count = db_fetch_array(db_query($sql));
- $res = $row_count['count'];
- if ($res > 0) {
-
exit_error($Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
$Language->getText('admin_trove_cat_edit','error_in_trove_operation_cant_delete_in_use'));
- }
-
- $res = db_query("
- SELECT trove_cat_id FROM trove_cat WHERE
parent='$form_trove_cat_id'
- ");
-
+ $res=db_query("SELECT * FROM trove_cat WHERE
parent='$form_trove_cat_id'");
if (!$res) {
exit_error(
$Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
db_error());
}
if (db_numrows($res)>0) {
exit_error(
$Language->getText('admin_trove_cat_edit','cant_delete_has_subcategories'),
db_error());
} else {
- $res=db_query(" DELETE FROM trove_treesums WHERE
trove_cat_id='$form_trove_cat_id'");
- if (!$res || db_affected_rows($res)<1) {
- exit_error(
$Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
db_error());
- }
- $res=db_query(" DELETE FROM trove_cat WHERE
trove_cat_id='$form_trove_cat_id'");
- if (!$res || db_affected_rows($res)<1) {
+ $res=db_query("DELETE FROM trove_treesums WHERE
trove_cat_id='$form_trove_cat_id'");
+ if (!$res) {
exit_error(
$Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
db_error());
}
- $res=db_query(" DELETE FROM trove_group_link WHERE
trove_cat_id='$form_trove_cat_id'");
+ $res=db_query("DELETE FROM trove_group_link WHERE
trove_cat_id='$form_trove_cat_id'");
if (!$res) {
exit_error(
$Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
db_error());
}
+ $res=db_query("DELETE FROM trove_cat WHERE
trove_cat_id='$form_trove_cat_id'");
+ if (!$res || db_affected_rows($res)<1) {
+ exit_error(
$Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
db_error());
+ }
}
session_redirect("/admin/trove/trove_cat_list.php");
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/www/admin/trove trove_cat_edit.php, 1.18, 1.19,
tperdue <=