From 1d73be2cad3e5961a07a70400f663188eb6d80ca Mon Sep 17 00:00:00 2001 From: Tony Lambregts Date: Sun, 2 Jan 2005 00:48:39 +0000 Subject: [PATCH] Fix up editing of vendors. Don't allow vendors with attached apps to be deleted. --- admin/adminVendors.php | 25 ++++++++++++++++++------- admin/editVendor.php | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/admin/adminVendors.php b/admin/adminVendors.php index 750ba3b..56046d9 100644 --- a/admin/adminVendors.php +++ b/admin/adminVendors.php @@ -22,14 +22,25 @@ if ($_REQUEST['sub']) { if($_REQUEST['sub'] == 'delete') { - $sQuery = "DELETE FROM vendor WHERE vendorId = ".$_REQUEST['vendorId'].";"; - echo "$sQuery"; + $sQuery = "SELECT * FROM appFamily WHERE vendorId = ".$_REQUEST['vendorId'].";"; + if (debugging()) echo "$sQuery"; $hResult = query_appdb($sQuery); - echo html_frame_start("Delete vendor: ".$_REQUEST['vendorId'],400,"",0); - if($hResult) + + + if(!$hResult || !mysql_num_rows($hResult)) { - //success - echo "

Vendor was successfully deleted

\n"; + $sQuery = "DELETE FROM vendor WHERE vendorId = ".$_REQUEST['vendorId'].";"; + if (debugging()) echo "$sQuery"; + $hResult = query_appdb($sQuery); + echo html_frame_start("Delete vendor: ".$_REQUEST['vendorId'],400,"",0); + if($hResult) + { + //success + echo "

Vendor was successfully deleted

\n"; + } + } else + { + echo "

Error: Can not delete a vendor with applications attached to it!

\n"; } echo html_frame_end(" "); echo html_back_link(1,'adminVendors.php'); @@ -64,7 +75,7 @@ if ($_REQUEST['sub']) { if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } echo "\n"; - echo " ".$ob->vendorName."\n"; + echo " ".$ob->vendorName."\n"; echo " vendorURL."\">".$ob->vendorURL."\n"; echo " [delete]\n"; echo "\n\n"; diff --git a/admin/editVendor.php b/admin/editVendor.php index 291a53c..926e755 100644 --- a/admin/editVendor.php +++ b/admin/editVendor.php @@ -16,6 +16,7 @@ else $admin_mode = 1; } +$vendorId = $_REQUEST['vendorId']; apidb_header("Edit Vendor Information"); $t = new TableVE("edit");