diff -r c72d6d51f3d3 -r c255196bc447 delete_domain.php
--- a/delete_domain.php	Wed Mar 12 20:45:56 2008 +0000
+++ b/delete_domain.php	Tue Mar 25 22:45:31 2008 +0000
@@ -20,50 +20,59 @@
  */
 
 require_once("inc/toolkit.inc.php");
+include_once("inc/header.inc.php");
 
-if (!level(5))
-{
-        error(ERR_LEVEL_5);
-        
+if (verify_permission(zone_content_edit_others)) { $perm_edit = "all" ; }
+elseif (verify_permission(zone_content_edit_own)) { $perm_edit = "own" ;}
+else { $perm_edit = "none" ; }
+
+$zone_id = "-1";
+if (isset($_GET['id']) && v_num($_GET['id'])) {
+	$zone_id = $_GET['id'];
+}
+
+$confirm = "-1";
+if (isset($_GET['confirm']) && v_num($_GET['confirm'])) {
+	$confirm = $_GET['confirm'];
+}
+
+$zone_info = get_zone_info_from_id($zone_id);
+$zone_owners = get_fullnames_owners_from_domainid($zone_id);
+$user_is_zone_owner = verify_user_is_owner_zoneid($zone_id);
+
+if ($zone_id == "-1"){
+	error(ERR_INV_INPUT);
+	include_once("inc/footer.inc.php");
+	exit;
 }
 
-if (isset($_GET["id"])) {
-        if ((isset($_GET["confirm"])) && ($_GET['confirm'] == '0')) {
-                clean_page("index.php");
-        } elseif ((isset($_GET["confirm"])) && ($_GET['confirm'] == '1')) {
-                delete_domain($_GET["id"]);
-                clean_page("index.php");
-        }
-        include_once("inc/header.inc.php");
-        $info = get_domain_info_from_id($_GET["id"]);
-        ?><h2><?php echo _('Delete zone'); ?> "<?php echo $info["name"] ?>"</h2>
-        <?php
-	if($info["owner"])
-	{
-		print (_('Owner') . ": " . $info["owner"] . "<br>"); 
+echo "     <h2>" . _('Delete zone') . " \"" . $zone_info['name']. "\"</h2>\n";
+
+if ($confirm == '1') {
+	if ( delete_domain($zone_id) ) {
+		success(SUC_ZONE_DEL);
 	}
-	print (_('Type') . ": " . strtolower($info["type"]) . "<br>");
-	print (_('Number of records in zone') . ": " . $info["numrec"] . "<br>");
-	if($info["type"] == "SLAVE")
-	{
-		$slave_master = get_domain_slave_master($_GET["id"]);
-		if(supermaster_exists($slave_master))
-		{
-			print ("<font class=\"warning\">");
-			printf(_('You are about to delete a slave zone of which the master nameserver, %s, is a supermaster. Deleting the zone now, will result in temporary removal only. Whenever the supermaster sends a notification for this zone, it will be added again!'), $slave_master);
-			print ("</font><br>");
+} else {
+	if ( $perm_edit == "all" || ( $perm_edit == "own" && $user_is_zone_owner == "1") ) {	
+		echo "      " . _('Owner') . ": " . $zone_owners . "<br>\n";
+		echo "      " . _('Type') . ": " . $zone_info['type'] . "\n";
+		if ( $zone_info['type'] == "SLAVE" ) {
+			$slave_master = get_domain_slave_master($zone_id);
+			if(supermaster_exists($slave_master)) {
+				echo "        <p>         \n";
+				printf (_('You are about to delete a slave zone of which the master nameserver, %s, is a supermaster. Deleting the zone now, will result in temporary removal only. Whenever the supermaster sends a notification for this zone, it will be added again!'), $slave_master);
+				echo "        </p>\n";
+			}
 		}
+		echo "     <p>" . _('Are you sure?') . "</p>\n";
+		echo "     <br><br>\n";
+		echo "     <input type=\"button\" class=\"button\" OnClick=\"location.href='" . $_SERVER["REQUEST_URI"] . "&confirm=1'\" value=\"" . _('Yes') . "\">\n";
+		echo "     <input type=\"button\" class=\"button\" OnClick=\"location.href='index.php'\" value=\"" . _('No') . "\">\n";
+	} else {
+		error(ERR_PERM_DEL_ZONE);
 	}
-	?>
-	<font class="warning"><?php echo _('Are you sure?'); ?></font>
-	<br><br>
-	<input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<?php echo _('Yes'); ?>">
-	<input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<?php echo _('No'); ?>">
-	<?php
-} elseif ($_GET["edit"]) {
-        include_once("inc/header.inc.php");
-} else {
-        include_once("inc/header.inc.php");
-        echo _('Nothing to do!');
 }
+
 include_once("inc/footer.inc.php");
+
+?>