Changeset 226 for branches

Timestamp:

11/28/2009 05:51:58 PM (2 years ago)

Author:

Acinonyx

Message:

[awmn] Add active peers search fields to hostmaster's ranges page

Location:

branches/awmn

Files:

• globals/language/english.php (modified) (3 diffs)
• globals/language/greek.php (modified) (3 diffs)
• includes/pages/hostmaster/hostmaster_ranges.php (modified) (5 diffs)

branches/awmn/globals/language/english.php

@@ -105 +105 @@
         'ap' => "Access Point",
         'aps' => "Access Points",
+        'aps_abbr' => "APs",
         'aps_search' => "Search for Access Points",
         'aps_found' => "Access Points found",
@@ -164 +165 @@
         'no' => "No",
         'backbone' => "Backbone",
+        'backbones_abbr' => "BBs",
         'unlinked' => "Not linked",
         'find_coordinates' => "Find coordinates",
@@ -288 +290 @@
                 'peer' => 'Peer',
                 'total_active_peers' => 'Active peers',
+                'total_active_p2p' => 'Active backbone links',
+                'total_active_aps' => 'Active access points',
                 'total_active_clients' => 'Active clients',
                 'has_ap' => 'Has Access Point',

branches/awmn/globals/language/greek.php

@@ -131 +131 @@
         'ap' => "Access Point",
         'aps' => "Access Points",
+        'aps_abbr' => "APs",
         'aps_search' => "ΑΜαζήτηση Access Points",
         'aps_found' => "Access Points ποÏ
@@ -219 +220 @@
         'no' => "Όχι",
         'backbone' => "Backbone",
+        'backbones_abbr' => "BBs",
         'unlinked' => "ΑσύΜΎετοι",
         'find_coordinates' => "Βρείτε τις σÏ
@@ -364 +366 @@
                 'total_active_peers' => 'ΕΜεργές ΎιασÏ
 ΜΎέσεις',
+                'total_active_p2p' => 'ΕΜεργές ΎιασÏ
+ΜΎέσεις backbone',
+                'total_active_aps' => 'ΕΜεργά Access Point',
                 'total_active_clients' => 'ΕΜεργοί πελάτες',
                 'has_ap' => 'ΔιαΞέτει Access Point',

branches/awmn/includes/pages/hostmaster/hostmaster_ranges.php

@@ -34 +34 @@
                 $form_search_ranges->data = array("0" => array("Field" => "ip", "fullField" => "ip"));
                 $form_search_ranges->db_data('ip_ranges.status, ip_ranges.delete_req, nodes.id, nodes.name');
+                array_push($form_search_ranges->data, array('Compare' => 'numeric', 'Field' => 'total_active_p2p', 'fullField' => 'total_active_p2p'));
+                array_push($form_search_ranges->data, array('Compare' => 'numeric', 'Field' => 'total_active_aps', 'fullField' => 'total_active_aps'));
                 $form_search_ranges->db_data_search();
                 return $form_search_ranges;
@@ -39 +41 @@
 
         function table_ip_ranges() {
-                global $construct, $db;
+                global $construct, $db, $lang;
                 $form_search_ranges = $this->form_search_ranges();
-                $where = $form_search_ranges->db_data_where(array('ip' => 'exclude', 'nodes__name' => 'starts_with'));
+                $where = $form_search_ranges->db_data_where(array('ip' => 'exclude', 'nodes__name' => 'starts_with', "total_active_p2p" => 'exclude', "total_active_aps" => 'exclude'));
                 $table_ip_ranges = new table(array('TABLE_NAME' => 'table_ip_ranges', 'FORM_NAME' => 'table_ip_ranges'));
                 $where = ($where !=''?"(".$where.") AND ":"");
@@ -53 +55 @@
                 }
                 if ($where!='') $where = substr($where, 0, -5);
+                $having = $form_search_ranges->db_data_where(array('ip' => 'exclude', 'ip_ranges__status' => 'exclude', 'ip_ranges__delete_req' => 'exclude', 'nodes__id' => 'exclude', 'nodes__name' => 'exclude'));
                 $table_ip_ranges->db_data(
-                        'ip_ranges.id, "" AS ip_range, ip_ranges.ip_start, ip_ranges.ip_end, ip_ranges.date_in, ip_ranges.status, ip_ranges.delete_req',
+                        'ip_ranges.id, 
+                                "" AS ip_range, 
+                                ip_ranges.ip_start, 
+                                ip_ranges.ip_end, 
+                                ip_ranges.date_in, 
+                                ip_ranges.status, 
+                                ip_ranges.delete_req, 
+                                COUNT(DISTINCT p2p.id) AS total_active_p2p, 
+                                COUNT(DISTINCT aps.id) AS total_active_aps, 
+                                "" AS total_active_peers',
                         'ip_ranges ' .
-                        'LEFT JOIN nodes ON ip_ranges.node_id = nodes.id',
+                        'LEFT JOIN nodes ON ip_ranges.node_id = nodes.id 
+                                LEFT JOIN links ON ip_ranges.node_id = links.node_id AND links.status = "active" 
+                                LEFT JOIN links AS p2p ON links.type = "p2p" 
+                                        AND links.peer_node_id = p2p.node_id 
+                                        AND p2p.type = "p2p" 
+                                        AND p2p.peer_node_id = links.node_id 
+                                        AND p2p.status = "active" 
+                                LEFT JOIN links as aps ON links.type = "ap" 
+                                        AND links.id = aps.id',
                         $where,
-                        "",
+                        "ip_ranges.id".
+                        ($having!=''?' HAVING ('.$having.')':""),
                         "ip_ranges.date_in DESC, ip_ranges.status ASC");
                 $table_ip_ranges->db_data_search($form_search_ranges);
@@ -71 +92 @@
                 for($i=1;$i<count($table_ip_ranges->data);$i++) {
                         if (isset($table_ip_ranges->data[$i])) {
+                                $table_ip_ranges->data[$i]['total_active_peers'] = ($table_ip_ranges->data[$i]['total_active_p2p']>0?$table_ip_ranges->data[$i]['total_active_p2p']." ".$lang['backbones_abbr']:"").($table_ip_ranges->data[$i]['total_active_aps']>0?" + ".$table_ip_ranges->data[$i]['total_active_aps']." ".$lang['aps_abbr']:"");
                                 $table_ip_ranges->info['EDIT'][$i] = makelink(array("page" => "hostmaster", "subpage" => "range", "iprange" => $table_ip_ranges->data[$i]['id']));
                         }
@@ -76 +98 @@
                 $table_ip_ranges->info['EDIT_COLUMN'] = 'ip_range';
                 $table_ip_ranges->info['MULTICHOICE_LABEL'] = 'delete';
-                $table_ip_ranges->db_data_remove('id', 'ip_start', 'ip_end');
+                $table_ip_ranges->db_data_remove('id', 'ip_start', 'ip_end', 'total_active_p2p', 'total_active_aps');
                 $table_ip_ranges->db_data_translate('ip_ranges__status', 'ip_ranges__delete_req');
                 return $table_ip_ranges;