Changeset 208 for branches

Timestamp:

10/03/2009 02:40:04 PM (3 years ago)

Author:

Acinonyx

Message:

[awmn] Allow changing of node area

Location:

branches/awmn

Files:

• globals/language/english.php (modified) (1 diff)
• globals/language/greek.php (modified) (1 diff)
• includes/pages/mynodes/mynodes.php (modified) (1 diff)
• includes/pages/mynodes/mynodes_range.php (modified) (1 diff)

branches/awmn/globals/language/english.php

@@ -472 +472 @@
                                 'body' => 'Changing the node name is not allowed.'
                         ),
-                        'nodes_field_area_id' => array(
-                                'title' => 'Change node area',
-                                'body' => 'Changing the node area is not allowed. Your IP C-Class has been assigned to you according to the area of your node. For more info, contact with the hostmaster team.'
-                        ),
                         'nodes_no_area_id' => array(
                                 'title' => 'Area error',

branches/awmn/globals/language/greek.php

@@ -627 +627 @@
 .'
                         ),
-                        'nodes_field_area_id' => array(
-                                'title' => 'Αλλαγή ΎήΌοÏ
-/κοιΜότητας κόΌβοÏ
-',
-                                'body' => 'ΔεΜ επιτρέπεται η αλλαγή περιοχής τοÏ
- κόΌβοÏ
-. Σας έχοÏ
-Îœ αποΎοΞεί IP C-Classes, Όε βάση τηΜ περιοχή ποÏ
- έχετε ήΎη Ύηλώσει. Για περισσότερες λεπτοΌέρειες, επικοιΜωΜήστε Όε τηΜ οΌάΎα hostmaster.'
-                        ),
                         'nodes_no_area_id' => array(
                                 'title' => 'ΣφάλΌα ΎήΌοÏ

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

@@ -393 +393 @@
                                 $name_ns = validate_name_ns($_POST['nodes__name'], get('node'));
                         }
-                        if ($old_v[0]['area_id'] != $_POST['nodes__area_id'] && 
-                                        $db->cnt('', 'ip_ranges', "node_id = ".intval(get('node'))) > 0) {
-                                $main->message->set_fromlang('error', 'nodes_field_area_id', makelink("",TRUE));
-                                return;
-                        }
                 }
                 

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

@@ -40 +40 @@
                 $data = $db->get("ip_ranges.ip_start AS ip_start, ip_ranges.ip_end AS ip_end, areas.ip_start AS area_ip_start, areas.ip_end AS area_ip_end",
                                         "ip_ranges
-                                        INNER JOIN nodes ON nodes.id = ip_ranges.node_id
-                                        INNER JOIN areas ON nodes.area_id = areas.id",
+                                        INNER JOIN areas",
                                         "areas.ip_start <= ip_ranges.ip_start AND areas.ip_end >= ip_ranges.ip_end AND areas.id = '".$area_id."'", "" , "ip_end ASC");