Changeset 222 for branches/awmn/includes/pages/mynodes/mynodes.php

Timestamp:

10/14/2009 02:11:21 PM (3 years ago)

Author:

Acinonyx

Message:

[awmn] Allow users to delete zones and nameservers without making a request to hostmaster

File:

• branches/awmn/includes/pages/mynodes/mynodes.php (modified) (8 diffs)

branches/awmn/includes/pages/mynodes/mynodes.php

@@ -95 +95 @@
                 $table_dns = new table(array('TABLE_NAME' => 'table_dns', 'FORM_NAME' => 'table_dns'));
                 $table_dns->db_data(
-                        'dns_zones.id, dns_zones.name, dns_zones.date_in, dns_zones.status, dns_zones.delete_req, dns_zones.type',
+                        'dns_zones.id, dns_zones.name, dns_zones.date_in, dns_zones.status, dns_zones.type',
                         'dns_zones',
                         'dns_zones.node_id = '.intval(get('node')),
@@ -101 +101 @@
                         "dns_zones.type ASC, dns_zones.date_in ASC");
                 $table_dns->db_data_multichoice('dns_zones', 'id');
-                $table_dns->db_data_multichoice_checked('delete_req', 'Y');
                 for($i=1;$i<count($table_dns->data);$i++) {
                         if (isset($table_dns->data[$i])) {
@@ -109 +108 @@
                 }
                 $table_dns->info['EDIT_COLUMN'] = 'name';
-                $table_dns->info['MULTICHOICE_LABEL'] = 'delete_request';
-                $table_dns->db_data_remove('id', 'delete_req', 'type');
+                $table_dns->info['MULTICHOICE_LABEL'] = 'delete';
+                $table_dns->db_data_remove('id', 'type');
                 $table_dns->db_data_translate('dns_zones__status');
                 return $table_dns;
@@ -119 +118 @@
                 $table_nameservers = new table(array('TABLE_NAME' => 'table_nameservers', 'FORM_NAME' => 'table_nameservers'));
                 $table_nameservers->db_data(
-                        'dns_nameservers.id, dns_nameservers.name, dns_nameservers.ip, dns_nameservers.date_in, dns_nameservers.status, nodes.name_ns AS nodes_name_ns, dns_nameservers.delete_req',
+                        'dns_nameservers.id, dns_nameservers.name, dns_nameservers.ip, dns_nameservers.date_in, dns_nameservers.status, nodes.name_ns AS nodes_name_ns',
                         'dns_nameservers, nodes',
                         "nodes.id = ".intval(get('node'))." AND dns_nameservers.node_id = nodes.id",
@@ -131 +130 @@
                 }
                 $table_nameservers->db_data_multichoice('dns_nameservers', 'id');
-                $table_nameservers->db_data_multichoice_checked('delete_req', 'Y');
                 for($i=1;$i<count($table_nameservers->data);$i++) {
                         if (isset($table_nameservers->data[$i])) {
@@ -138 +136 @@
                 }
                 $table_nameservers->info['EDIT_COLUMN'] = 'name';
-                $table_nameservers->info['MULTICHOICE_LABEL'] = 'delete_request';
-                $table_nameservers->db_data_remove('id', 'nodes_name_ns', 'delete_req');
+                $table_nameservers->info['MULTICHOICE_LABEL'] = 'delete';
+                $table_nameservers->db_data_remove('id', 'nodes_name_ns');
                 $table_nameservers->db_data_translate('dns_nameservers__status');
                 return $table_nameservers;
@@ -467 +465 @@
                 global $db, $main;
                 $ret = TRUE;
-                $ret = $ret && $db->set("dns_zones", array('delete_req' => 'N'), "node_id = ".intval(get('node')));
-                foreach( (array) $_POST['id'] as $key => $value) {
-                        $ret = $ret && $db->set("dns_zones", array('delete_req' => 'Y'), "id = '".intval($value)."' AND node_id =  ".intval(get('node')));
-                }
-                if ($ret) {
-                        $main->message->set_fromlang('info', 'update_success', makelink("",TRUE));
+                foreach( (array) $_POST['id'] as $key => $value) {
+                        $ret = $ret && $db->del("dns_zones, dns_zones_nameservers", 
+                                                'dns_zones 
+                                                        LEFT JOIN dns_zones_nameservers ON dns_zones.id = dns_zones_nameservers.zone_id', 
+                                                "dns_zones.id = '".intval($value)."' AND dns_zones.node_id =  ".intval(get('node')));
+                }
+                if ($ret) {
+                        $main->message->set_fromlang('info', 'delete_success', makelink("",TRUE));
                 } else {
                         $main->message->set_fromlang('error', 'generic');               
@@ -481 +481 @@
                 global $db, $main;
                 $ret = TRUE;
-                $ret = $ret && $db->set("dns_nameservers", array('delete_req' => 'N'), "node_id = ".intval(get('node')));
-                foreach( (array) $_POST['id'] as $key => $value) {
-                        $ret = $ret && $db->set("dns_nameservers", array('delete_req' => 'Y'), "id = '".intval($value)."' AND node_id =  ".intval(get('node')));
-                }
-                if ($ret) {
-                        $main->message->set_fromlang('info', 'update_success', makelink("",TRUE));
+                foreach( (array) $_POST['id'] as $key => $value) {
+                        $ret = $ret && $db->del("dns_nameservers, dns_zones_nameservers", 
+                                                'dns_nameservers 
+                                                        LEFT JOIN dns_zones_nameservers ON dns_nameservers.id = dns_zones_nameservers.nameserver_id', 
+                                                "dns_nameservers.id = '".intval($value)."' AND dns_nameservers.node_id =  ".intval(get('node')));
+                }
+                if ($ret) {
+                        $main->message->set_fromlang('info', 'delete_success', makelink("",TRUE));
                 } else {
                         $main->message->set_fromlang('error', 'generic');