Changeset 118
- Timestamp:
- 12/14/2005 07:42:28 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
-
globals/language/english.php (modified) (4 diffs)
-
globals/language/greek.php (modified) (4 diffs)
-
includes/main_menu.php (modified) (1 diff)
-
includes/pages/hostmaster/hostmaster_dnsnameserver.php (modified) (4 diffs)
-
includes/pages/hostmaster/hostmaster_dnszone.php (modified) (4 diffs)
-
includes/pages/hostmaster/hostmaster_range.php (modified) (4 diffs)
-
includes/pages/mynodes/mynodes_dnszone.php (modified) (1 diff)
-
includes/pages/mynodes/mynodes_range.php (modified) (1 diff)
-
install/schema.sql (modified) (1 diff)
-
templates/basic/includes/main_menu.tpl (modified) (3 diffs)
-
templates/basic/includes/pages/hostmaster/hostmaster_dnsnameserver.tpl (modified) (2 diffs)
-
templates/basic/includes/pages/hostmaster/hostmaster_dnszone.tpl (modified) (2 diffs)
-
templates/basic/includes/pages/hostmaster/hostmaster_range.tpl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals/language/english.php
r116 r118 61 61 'dns_zones' => "DNS zones", 62 62 'dns_nameservers' => "Nameservers (NS)", 63 ' pending' => "pending",63 'waiting' => "waiting", 64 64 'for_deletion' => "to delete", 65 65 'welcome' => "Welcome", … … 197 197 'ip_ranges__ip_end' => 'Up to', 198 198 'ip_ranges__status' => 'Status', 199 'ip_ranges__status-waiting' => 'Waiting check', 199 200 'ip_ranges__status-pending' => 'Pending', 200 201 'ip_ranges__status-active' => 'Active', … … 214 215 'dns_zones__type-reverse' => 'Reverse', 215 216 'dns_zones__status' => 'Status', 217 'dns_zones__status-waiting' => 'Waiting check', 216 218 'dns_zones__status-pending' => 'Pending', 217 219 'dns_zones__status-active' => 'Active', … … 234 236 'dns_nameservers__ip' => 'IP address', 235 237 'dns_nameservers__status' => 'Status', 238 'dns_nameservers__status-waiting' => 'Waiting check', 236 239 'dns_nameservers__status-pending' => 'Pending', 237 240 'dns_nameservers__status-active' => 'Active', -
trunk/globals/language/greek.php
r116 r118 69 69 'dns_zones' => "ÎÏÎœÎµÏ DNS", 70 70 'dns_nameservers' => "Nameservers (NS)", 71 ' pending' => "Ïε αΜαΌοΜή",71 'waiting' => "ÏÏÎ¿Ï ÎλεγÏο", 72 72 'for_deletion' => "για ΎιαγÏαÏή", 73 73 'welcome' => "ÎαλÏÏ Î®ÏΞαÏε", … … 252 252 'ip_ranges__ip_end' => 'ÎÎÏÏι', 253 253 'ip_ranges__status' => 'ÎαÏάÏÏαÏη', 254 'ip_ranges__status-waiting' => 'Î ÏÎ¿Ï ÎλεγÏο', 254 255 'ip_ranges__status-pending' => 'Σε αΜαΌοΜή', 255 256 'ip_ranges__status-active' => 'ÎΜεÏγÏ', … … 271 272 'dns_zones__type-reverse' => 'Reverse', 272 273 'dns_zones__status' => 'ÎαÏάÏÏαÏη', 274 'dns_zones__status-waiting' => 'Î ÏÎ¿Ï ÎλεγÏο', 273 275 'dns_zones__status-pending' => 'Σε αΜαΌοΜή', 274 276 'dns_zones__status-active' => 'ÎΜεÏγÏ', … … 294 296 ÎœÏη IP', 295 297 'dns_nameservers__status' => 'ÎαÏάÏÏαÏη', 298 'dns_nameservers__status-waiting' => 'Î ÏÎ¿Ï ÎλεγÏο', 296 299 'dns_nameservers__status-pending' => 'Σε αΜαΌοΜή', 297 300 'dns_nameservers__status-active' => 'ÎΜεÏγÏ', -
trunk/includes/main_menu.php
r113 r118 55 55 56 56 $this->tpl['link_dnsnameservers'] = makelink(array("page" => "hostmaster", "subpage" => "dnsnameservers")); 57 $this->tpl['link_dnsnameservers_ pending'] = makelink(array("page" => "hostmaster", "subpage" => "dnsnameservers", "form_search_nameservers_search" => serialize(array("dns_nameservers__status" => "pending"))));58 $this->tpl['dnsnameservers_ pending'] = $db->cnt('', "dns_nameservers", "status = 'pending'");57 $this->tpl['link_dnsnameservers_waiting'] = makelink(array("page" => "hostmaster", "subpage" => "dnsnameservers", "form_search_nameservers_search" => serialize(array("dns_nameservers__status" => "waiting", "dns_nameservers__delete_req" => "N")))); 58 $this->tpl['dnsnameservers_waiting'] = $db->cnt('', "dns_nameservers", "status = 'waiting' AND delete_req = 'N'"); 59 59 $this->tpl['link_dnsnameservers_req_del'] = makelink(array("page" => "hostmaster", "subpage" => "dnsnameservers", "form_search_nameservers_search" => serialize(array("dns_nameservers__delete_req" => "Y")))); 60 60 $this->tpl['dnsnameservers_req_del'] = $db->cnt('', "dns_nameservers", "delete_req = 'Y'"); 61 61 62 62 $this->tpl['link_dnszones'] = makelink(array("page" => "hostmaster", "subpage" => "dnszones")); 63 $this->tpl['link_dnszones_ pending'] = makelink(array("page" => "hostmaster", "subpage" => "dnszones", "form_search_dns_search" => serialize(array("dns_zones__status" => "pending"))));64 $this->tpl['dnszones_ pending'] = $db->cnt('', "dns_zones", "status = 'pending'");63 $this->tpl['link_dnszones_waiting'] = makelink(array("page" => "hostmaster", "subpage" => "dnszones", "form_search_dns_search" => serialize(array("dns_zones__status" => "waiting", "dns_zones__delete_req" => "N")))); 64 $this->tpl['dnszones_waiting'] = $db->cnt('', "dns_zones", "status = 'waiting' AND delete_req = 'N'"); 65 65 $this->tpl['link_dnszones_req_del'] = makelink(array("page" => "hostmaster", "subpage" => "dnszones", "form_search_dns_search" => serialize(array("dns_zones__delete_req" => "Y")))); 66 66 $this->tpl['dnszones_req_del'] = $db->cnt('', "dns_zones", "delete_req = 'Y'"); 67 67 68 68 $this->tpl['link_ranges'] = makelink(array("page" => "hostmaster", "subpage" => "ranges")); 69 $this->tpl['link_ranges_ pending'] = makelink(array("page" => "hostmaster", "subpage" => "ranges", "form_search_ranges_search" => serialize(array("ip_ranges__status" => "pending"))));70 $this->tpl['ranges_ pending'] = $db->cnt('', "ip_ranges", "status = 'pending'");69 $this->tpl['link_ranges_waiting'] = makelink(array("page" => "hostmaster", "subpage" => "ranges", "form_search_ranges_search" => serialize(array("ip_ranges__status" => "waiting", "ip_ranges__delete_req" => "N")))); 70 $this->tpl['ranges_waiting'] = $db->cnt('', "ip_ranges", "status = 'waiting' AND delete_req = 'N'"); 71 71 $this->tpl['link_ranges_req_del'] = makelink(array("page" => "hostmaster", "subpage" => "ranges", "form_search_ranges_search" => serialize(array("ip_ranges__delete_req" => "Y")))); 72 72 $this->tpl['ranges_req_del'] = $db->cnt('', "ip_ranges", "delete_req = 'Y'"); -
trunk/includes/pages/hostmaster/hostmaster_dnsnameserver.php
r32 r118 47 47 LEFT JOIN regions ON areas.region_id = regions.id', 48 48 "dns_nameservers.id = '".get('nameserver')."'"); 49 for($i=1;$i<count($table_node_info->data);$i++) { 50 if (isset($table_node_info->data[$i])) { 51 $table_node_info->data[$i]['nodes__name'] .= " (#".$table_node_info->data[$i]['id'].")"; 52 $table_node_info->info['EDIT'][$i] = makelink(array("page" => "mynodes", "node" => $table_node_info->data[$i]['id'])); 53 } 54 } 55 $table_node_info->info['EDIT_COLUMN'] = 'nodes__name'; 56 $table_node_info->db_data_remove('id'); 49 57 return $table_node_info; 50 58 } … … 54 62 $table_user_info = new table(array('TABLE_NAME' => 'table_user_info')); 55 63 $table_user_info->db_data( 56 'users _nodes.owner, users.username, users.surname, users.name, users.name, users.email, users.phone, users.info',64 'users.id, users.username, users_nodes.owner, users.surname, users.name, users.name, users.email, users.phone, users.info', 57 65 'dns_nameservers ' . 58 66 'LEFT JOIN users_nodes ON users_nodes.node_id = dns_nameservers.node_id … … 61 69 '', 62 70 'users_nodes.owner ASC'); 71 for($i=1;$i<count($table_user_info->data);$i++) { 72 if (isset($table_user_info->data[$i])) { 73 $table_user_info->info['EDIT'][$i] = makelink(array("page" => "users", "user" => $table_user_info->data[$i]['id'])); 74 } 75 } 76 $table_user_info->info['EDIT_COLUMN'] = 'username'; 77 $table_user_info->db_data_remove('id'); 63 78 $table_user_info->db_data_translate('users_nodes__owner'); 64 79 return $table_user_info; 80 } 81 82 function table_links() { 83 global $db; 84 $table_links = new table(array('TABLE_NAME' => 'table_links', 'FORM_NAME' => 'table_links')); 85 $table_links->db_data( 86 'links.id, links.type, "" AS peer, links.peer_node_id, n_p.name AS peer_node_name, n_c.name AS peer_ap_nodename, n_c.id AS peer_ap_nodeid, l_c.ssid AS peer_ap_ssid, links.ssid, links.status AS links__status, l_p.status AS l_p__status, l_c.status AS l_c__status', 87 'links 88 LEFT JOIN dns_nameservers ON dns_nameservers.node_id = links.node_id 89 LEFT JOIN links AS l_p ON links.peer_node_id = l_p.node_id AND links.node_id = l_p.peer_node_id 90 LEFT JOIN nodes AS n_p ON links.peer_node_id = n_p.id 91 LEFT JOIN links AS l_c ON links.peer_ap_id = l_c.id 92 LEFT JOIN nodes AS n_c ON l_c.node_id = n_c.id', 93 "dns_nameservers.id = '".get('nameserver')."' AND (links.type != 'p2p' OR l_p.node_id IS NOT NULL)", 94 "", 95 "links.type ASC, links.date_in ASC"); 96 for($i=1;$i<count($table_links->data);$i++) { 97 if (isset($table_links->data[$i])) { 98 if ($table_links->data[$i]['type'] == 'p2p') { 99 $table_links->data[$i]['peer'] = $table_links->data[$i]['peer_node_name']." (#".$table_links->data[$i]['peer_node_id'].")"; 100 $table_links->data[$i]['links__status'] = ($table_links->data[$i]['l_p__status']=="inactive"?"inactive":$table_links->data[$i]['links__status']); 101 } 102 if ($table_links->data[$i]['type'] == 'client') { 103 $table_links->data[$i]['peer'] = $table_links->data[$i]['peer_ap_nodename']." (#".$table_links->data[$i]['peer_ap_nodeid'].")"; 104 $table_links->data[$i]['ssid'] = $table_links->data[$i]['peer_ap_ssid']; 105 $table_links->data[$i]['links__status'] = ($table_links->data[$i]['l_c__status']=="inactive"?"inactive":$table_links->data[$i]['links__status']); 106 } 107 } 108 } 109 $table_links->db_data_remove('id', 'peer_node_id', 'peer_node_name', 'peer_ap_nodename', 'peer_ap_nodeid', 'peer_ap_ssid', 'l_c__status', 'l_p__status'); 110 $table_links->db_data_translate('links__type', 'links__status'); 111 return $table_links; 112 } 113 114 function table_dns() { 115 global $db, $vars; 116 $table_dns = new table(array('TABLE_NAME' => 'table_dns', 'FORM_NAME' => 'table_dns')); 117 $table_dns->db_data( 118 'dns_zones.id, dns_zones.name, dns_zones.date_in, dns_zones.status, dns_zones.delete_req, dns_zones.type', 119 'dns_zones ' . 120 'INNER JOIN dns_zones_nameservers ON dns_zones_nameservers.zone_id = dns_zones.id', 121 'dns_zones_nameservers.nameserver_id = '.get('nameserver'), 122 "", 123 "dns_zones.type ASC, dns_zones.date_in ASC"); 124 for($i=1;$i<count($table_dns->data);$i++) { 125 if (isset($table_dns->data[$i])) { 126 if ($table_dns->data[$i]['type'] == 'forward') $table_dns->data[$i]['name'] .= ".".$vars['dns']['root_zone']; 127 $table_dns->info['EDIT'][$i] = makelink(array("page" => "hostmaster", "subpage" => "dnszone", "zone" => $table_dns->data[$i]['id'])); 128 } 129 } 130 $table_dns->info['EDIT_COLUMN'] = 'name'; 131 $table_dns->db_data_remove('id', 'type'); 132 $table_dns->db_data_translate('dns_zones__delete_req', 'dns_zones__status'); 133 return $table_dns; 65 134 } 66 135 … … 71 140 $this->tpl['table_node_info'] = $construct->table($this->table_node_info(), __FILE__); 72 141 $this->tpl['table_user_info'] = $construct->table($this->table_user_info(), __FILE__); 142 $this->tpl['table_links'] = $construct->table($this->table_links(), __FILE__); 143 $this->tpl['table_dns'] = $construct->table($this->table_dns(), __FILE__); 73 144 return template($this->tpl, __FILE__); 74 145 } -
trunk/includes/pages/hostmaster/hostmaster_dnszone.php
r32 r118 59 59 LEFT JOIN regions ON areas.region_id = regions.id', 60 60 "dns_zones.id = '".get('zone')."'"); 61 for($i=1;$i<count($table_node_info->data);$i++) { 62 if (isset($table_node_info->data[$i])) { 63 $table_node_info->data[$i]['nodes__name'] .= " (#".$table_node_info->data[$i]['id'].")"; 64 $table_node_info->info['EDIT'][$i] = makelink(array("page" => "mynodes", "node" => $table_node_info->data[$i]['id'])); 65 } 66 } 67 $table_node_info->info['EDIT_COLUMN'] = 'nodes__name'; 68 $table_node_info->db_data_remove('id'); 61 69 return $table_node_info; 62 70 } … … 66 74 $table_user_info = new table(array('TABLE_NAME' => 'table_user_info')); 67 75 $table_user_info->db_data( 68 'users _nodes.owner, users.username, users.surname, users.name, users.name, users.email, users.phone, users.info',76 'users.id, users.username, users_nodes.owner, users.surname, users.name, users.name, users.email, users.phone, users.info', 69 77 'dns_zones ' . 70 78 'LEFT JOIN users_nodes ON users_nodes.node_id = dns_zones.node_id … … 73 81 '', 74 82 'users_nodes.owner ASC'); 83 for($i=1;$i<count($table_user_info->data);$i++) { 84 if (isset($table_user_info->data[$i])) { 85 $table_user_info->info['EDIT'][$i] = makelink(array("page" => "users", "user" => $table_user_info->data[$i]['id'])); 86 } 87 } 88 $table_user_info->info['EDIT_COLUMN'] = 'username'; 89 $table_user_info->db_data_remove('id'); 75 90 $table_user_info->db_data_translate('users_nodes__owner'); 76 91 return $table_user_info; 77 92 } 78 93 94 function table_links() { 95 global $db; 96 $table_links = new table(array('TABLE_NAME' => 'table_links', 'FORM_NAME' => 'table_links')); 97 $table_links->db_data( 98 'links.id, links.type, "" AS peer, links.peer_node_id, n_p.name AS peer_node_name, n_c.name AS peer_ap_nodename, n_c.id AS peer_ap_nodeid, l_c.ssid AS peer_ap_ssid, links.ssid, links.status AS links__status, l_p.status AS l_p__status, l_c.status AS l_c__status', 99 'links 100 LEFT JOIN dns_zones ON dns_zones.node_id = links.node_id 101 LEFT JOIN links AS l_p ON links.peer_node_id = l_p.node_id AND links.node_id = l_p.peer_node_id 102 LEFT JOIN nodes AS n_p ON links.peer_node_id = n_p.id 103 LEFT JOIN links AS l_c ON links.peer_ap_id = l_c.id 104 LEFT JOIN nodes AS n_c ON l_c.node_id = n_c.id', 105 "dns_zones.id = '".get('zone')."' AND (links.type != 'p2p' OR l_p.node_id IS NOT NULL)", 106 "", 107 "links.type ASC, links.date_in ASC"); 108 for($i=1;$i<count($table_links->data);$i++) { 109 if (isset($table_links->data[$i])) { 110 if ($table_links->data[$i]['type'] == 'p2p') { 111 $table_links->data[$i]['peer'] = $table_links->data[$i]['peer_node_name']." (#".$table_links->data[$i]['peer_node_id'].")"; 112 $table_links->data[$i]['links__status'] = ($table_links->data[$i]['l_p__status']=="inactive"?"inactive":$table_links->data[$i]['links__status']); 113 } 114 if ($table_links->data[$i]['type'] == 'client') { 115 $table_links->data[$i]['peer'] = $table_links->data[$i]['peer_ap_nodename']." (#".$table_links->data[$i]['peer_ap_nodeid'].")"; 116 $table_links->data[$i]['ssid'] = $table_links->data[$i]['peer_ap_ssid']; 117 $table_links->data[$i]['links__status'] = ($table_links->data[$i]['l_c__status']=="inactive"?"inactive":$table_links->data[$i]['links__status']); 118 } 119 } 120 } 121 $table_links->db_data_remove('id', 'peer_node_id', 'peer_node_name', 'peer_ap_nodename', 'peer_ap_nodeid', 'peer_ap_ssid', 'l_c__status', 'l_p__status'); 122 $table_links->db_data_translate('links__type', 'links__status'); 123 return $table_links; 124 } 125 79 126 function output() { 80 127 if ($_SERVER['REQUEST_METHOD'] == 'POST' && method_exists($this, 'output_onpost_'.$_POST['form_name'])) return call_user_func(array($this, 'output_onpost_'.$_POST['form_name'])); … … 83 130 $this->tpl['table_node_info'] = $construct->table($this->table_node_info(), __FILE__); 84 131 $this->tpl['table_user_info'] = $construct->table($this->table_user_info(), __FILE__); 132 $this->tpl['table_links'] = $construct->table($this->table_links(), __FILE__); 85 133 return template($this->tpl, __FILE__); 86 134 } -
trunk/includes/pages/hostmaster/hostmaster_range.php
r66 r118 58 58 LEFT JOIN regions ON areas.region_id = regions.id', 59 59 "ip_ranges.id = '".get('iprange')."'"); 60 for($i=1;$i<count($table_node_info->data);$i++) { 61 if (isset($table_node_info->data[$i])) { 62 $table_node_info->data[$i]['nodes__name'] .= " (#".$table_node_info->data[$i]['id'].")"; 63 $table_node_info->info['EDIT'][$i] = makelink(array("page" => "mynodes", "node" => $table_node_info->data[$i]['id'])); 64 } 65 } 66 $table_node_info->info['EDIT_COLUMN'] = 'nodes__name'; 67 $table_node_info->db_data_remove('id'); 60 68 return $table_node_info; 61 69 } … … 65 73 $table_user_info = new table(array('TABLE_NAME' => 'table_user_info')); 66 74 $table_user_info->db_data( 67 'users _nodes.owner, users.username, users.surname, users.name, users.name, users.email, users.phone, users.info',75 'users.id, users.username, users_nodes.owner, users.surname, users.name, users.name, users.email, users.phone, users.info', 68 76 'ip_ranges ' . 69 77 'LEFT JOIN users_nodes ON users_nodes.node_id = ip_ranges.node_id … … 72 80 '', 73 81 'users_nodes.owner ASC'); 82 for($i=1;$i<count($table_user_info->data);$i++) { 83 if (isset($table_user_info->data[$i])) { 84 $table_user_info->info['EDIT'][$i] = makelink(array("page" => "users", "user" => $table_user_info->data[$i]['id'])); 85 } 86 } 87 $table_user_info->info['EDIT_COLUMN'] = 'username'; 88 $table_user_info->db_data_remove('id'); 74 89 $table_user_info->db_data_translate('users_nodes__owner'); 75 90 return $table_user_info; 76 91 } 77 92 93 function table_links() { 94 global $db; 95 $table_links = new table(array('TABLE_NAME' => 'table_links', 'FORM_NAME' => 'table_links')); 96 $table_links->db_data( 97 'links.id, links.type, "" AS peer, links.peer_node_id, n_p.name AS peer_node_name, n_c.name AS peer_ap_nodename, n_c.id AS peer_ap_nodeid, l_c.ssid AS peer_ap_ssid, links.ssid, links.status AS links__status, l_p.status AS l_p__status, l_c.status AS l_c__status', 98 'links 99 LEFT JOIN ip_ranges ON ip_ranges.node_id = links.node_id 100 LEFT JOIN links AS l_p ON links.peer_node_id = l_p.node_id AND links.node_id = l_p.peer_node_id 101 LEFT JOIN nodes AS n_p ON links.peer_node_id = n_p.id 102 LEFT JOIN links AS l_c ON links.peer_ap_id = l_c.id 103 LEFT JOIN nodes AS n_c ON l_c.node_id = n_c.id', 104 "ip_ranges.id = '".get('iprange')."' AND (links.type != 'p2p' OR l_p.node_id IS NOT NULL)", 105 "", 106 "links.type ASC, links.date_in ASC"); 107 for($i=1;$i<count($table_links->data);$i++) { 108 if (isset($table_links->data[$i])) { 109 if ($table_links->data[$i]['type'] == 'p2p') { 110 $table_links->data[$i]['peer'] = $table_links->data[$i]['peer_node_name']." (#".$table_links->data[$i]['peer_node_id'].")"; 111 $table_links->data[$i]['links__status'] = ($table_links->data[$i]['l_p__status']=="inactive"?"inactive":$table_links->data[$i]['links__status']); 112 } 113 if ($table_links->data[$i]['type'] == 'client') { 114 $table_links->data[$i]['peer'] = $table_links->data[$i]['peer_ap_nodename']." (#".$table_links->data[$i]['peer_ap_nodeid'].")"; 115 $table_links->data[$i]['ssid'] = $table_links->data[$i]['peer_ap_ssid']; 116 $table_links->data[$i]['links__status'] = ($table_links->data[$i]['l_c__status']=="inactive"?"inactive":$table_links->data[$i]['links__status']); 117 } 118 } 119 } 120 $table_links->db_data_remove('id', 'peer_node_id', 'peer_node_name', 'peer_ap_nodename', 'peer_ap_nodeid', 'peer_ap_ssid', 'l_c__status', 'l_p__status'); 121 $table_links->db_data_translate('links__type', 'links__status'); 122 return $table_links; 123 } 124 78 125 function output() { 79 126 if ($_SERVER['REQUEST_METHOD'] == 'POST' && method_exists($this, 'output_onpost_'.$_POST['form_name'])) return call_user_func(array($this, 'output_onpost_'.$_POST['form_name'])); … … 82 129 $this->tpl['table_node_info'] = $construct->table($this->table_node_info(), __FILE__); 83 130 $this->tpl['table_user_info'] = $construct->table($this->table_user_info(), __FILE__); 131 $this->tpl['table_links'] = $construct->table($this->table_links(), __FILE__); 84 132 return template($this->tpl, __FILE__); 85 133 } -
trunk/includes/pages/mynodes/mynodes_dnszone.php
r81 r118 68 68 $f = array(); 69 69 if (get('zone') == 'add') { 70 $f = array('dns_zones.status' => ' pending', 'dns_zones.type' => get('type'), "dns_zones.node_id" => get('node'));70 $f = array('dns_zones.status' => 'waiting', 'dns_zones.type' => get('type'), "dns_zones.node_id" => get('node')); 71 71 $ret = $form_zone->db_set($f, 72 72 "dns_zones", "id", get('zone')); -
trunk/includes/pages/mynodes/mynodes_range.php
r80 r118 97 97 $form_getrange = $this->form_getrange(); 98 98 $nextr = $this->calculate_next_range(); 99 $status = " pending";99 $status = "waiting"; 100 100 $ret = TRUE; 101 101 $ret = $form_getrange->db_set(array("node_id" => get('node'), "ip_start" => $nextr['ip_start'], "ip_end" => $nextr['ip_end'], "status" => $status)); -
trunk/install/schema.sql
r86 r118 1 # 2 # Table structure for table 'areas' 3 # 4 5 CREATE TABLE areas ( 6 id int(10) unsigned NOT NULL default '0', 7 region_id int(10) unsigned NOT NULL default '0', 8 name varchar(40) NOT NULL default '', 9 ip_start int(10) unsigned NOT NULL default '0', 10 ip_end int(10) unsigned NOT NULL default '0', 11 info text, 12 PRIMARY KEY (id) 13 ) TYPE=MyISAM; 14 15 16 17 # 18 # Table structure for table 'dns_nameservers' 19 # 20 21 CREATE TABLE dns_nameservers ( 22 id int(10) unsigned NOT NULL auto_increment, 23 date_in datetime NOT NULL default '0000-00-00 00:00:00', 24 node_id int(10) unsigned NOT NULL default '0', 25 name enum('ns0','ns1','ns2','ns3') NOT NULL default 'ns0', 26 ip int(10) unsigned NOT NULL default '0', 27 status enum('active','pending','rejected','invalid') NOT NULL default 'pending', 28 delete_req enum('Y','N') NOT NULL default 'N', 29 PRIMARY KEY (id), 30 UNIQUE KEY unique_keys (name,node_id) 31 ) TYPE=MyISAM; 32 33 34 35 # 36 # Table structure for table 'dns_zones' 37 # 38 39 CREATE TABLE dns_zones ( 40 id int(10) unsigned NOT NULL auto_increment, 41 date_in datetime NOT NULL default '0000-00-00 00:00:00', 42 type enum('forward','reverse') NOT NULL default 'forward', 43 name varchar(30) NOT NULL default '', 44 node_id int(10) unsigned default '0', 45 status enum('active','pending','rejected','invalid') NOT NULL default 'pending', 46 info text, 47 delete_req enum('Y','N') NOT NULL default 'N', 48 PRIMARY KEY (id), 49 UNIQUE KEY unique_keys (name,type) 50 ) TYPE=MyISAM; 51 52 53 54 # 55 # Table structure for table 'dns_zones_nameservers' 56 # 57 58 CREATE TABLE dns_zones_nameservers ( 59 id int(10) unsigned NOT NULL auto_increment, 60 zone_id int(10) unsigned NOT NULL default '0', 61 nameserver_id int(10) unsigned NOT NULL default '0', 62 PRIMARY KEY (id), 63 UNIQUE KEY unique_keys (zone_id,nameserver_id) 64 ) TYPE=MyISAM; 65 66 67 68 # 69 # Table structure for table 'ip_addresses' 70 # 71 72 CREATE TABLE ip_addresses ( 73 id int(10) unsigned NOT NULL auto_increment, 74 date_in datetime NOT NULL default '0000-00-00 00:00:00', 75 hostname varchar(50) NOT NULL default '', 76 ip int(10) unsigned NOT NULL default '0', 77 mac varchar(17) default NULL, 78 node_id int(10) unsigned NOT NULL default '0', 79 type enum('router','server','pc','wireless-bridge','voip','camera','other') NOT NULL default 'pc', 80 always_on enum('Y','N') NOT NULL default 'N', 81 info text, 82 PRIMARY KEY (id) 83 ) TYPE=MyISAM; 84 85 86 87 # 88 # Table structure for table 'ip_ranges' 89 # 90 91 CREATE TABLE ip_ranges ( 92 id int(10) unsigned NOT NULL auto_increment, 93 date_in datetime NOT NULL default '0000-00-00 00:00:00', 94 node_id int(10) unsigned NOT NULL default '0', 95 ip_start int(10) unsigned NOT NULL default '0', 96 ip_end int(10) unsigned NOT NULL default '0', 97 status enum('active','pending','rejected','invalid') NOT NULL default 'pending', 98 info text, 99 delete_req enum('Y','N') NOT NULL default 'N', 100 PRIMARY KEY (id), 101 UNIQUE KEY unique_keys (node_id,ip_start,ip_end) 102 ) TYPE=MyISAM; 103 104 105 106 # 107 # Table structure for table 'links' 108 # 109 110 CREATE TABLE links ( 111 id int(10) unsigned NOT NULL auto_increment, 112 date_in datetime NOT NULL default '0000-00-00 00:00:00', 113 node_id int(10) unsigned NOT NULL default '0', 114 peer_node_id int(10) unsigned default NULL, 115 peer_ap_id int(10) unsigned default NULL, 116 type enum('p2p','ap','client') NOT NULL default 'p2p', 117 ssid varchar(50) default NULL, 118 protocol enum('IEEE 802.11b','IEEE 802.11g','IEEE 802.11a','other') default NULL, 119 channel varchar(50) default NULL, 120 status enum('active','inactive') NOT NULL default 'active', 121 equipment text, 122 info text, 123 PRIMARY KEY (id) 124 ) TYPE=MyISAM; 125 126 127 128 # 129 # Table structure for table 'nodes' 130 # 131 132 CREATE TABLE nodes ( 133 id int(10) unsigned NOT NULL auto_increment, 134 date_in datetime NOT NULL default '0000-00-00 00:00:00', 135 name varchar(50) NOT NULL default '', 136 name_ns varchar(50) NOT NULL default '', 137 area_id int(10) unsigned default '0', 138 latitude float default NULL, 139 longitude float default NULL, 140 elevation int(10) unsigned default NULL, 141 info text, 142 PRIMARY KEY (id), 143 UNIQUE KEY unique_keys (name_ns) 144 ) TYPE=MyISAM; 145 146 147 148 # 149 # Table structure for table 'photos' 150 # 151 152 CREATE TABLE photos ( 153 id int(10) unsigned NOT NULL auto_increment, 154 date_in datetime NOT NULL default '0000-00-00 00:00:00', 155 node_id int(10) unsigned NOT NULL default '0', 156 type enum('galery','view') NOT NULL default 'galery', 157 view_point enum('N','NE','E','SE','S','SW','W','NW','PANORAMIC') default NULL, 158 info text, 159 PRIMARY KEY (id) 160 ) TYPE=MyISAM; 161 162 163 164 # 165 # Table structure for table 'regions' 166 # 167 168 CREATE TABLE regions ( 169 id int(10) unsigned NOT NULL default '0', 170 name varchar(40) NOT NULL default '', 171 ip_start int(10) unsigned NOT NULL default '0', 172 ip_end int(10) unsigned NOT NULL default '0', 173 info text, 174 PRIMARY KEY (id) 175 ) TYPE=MyISAM; 176 177 178 179 # 180 # Table structure for table 'rights' 181 # 182 183 CREATE TABLE rights ( 184 id int(10) unsigned NOT NULL auto_increment, 185 user_id int(10) unsigned NOT NULL default '0', 186 type enum('blocked','admin','hostmaster') NOT NULL default 'blocked', 187 PRIMARY KEY (id), 188 UNIQUE KEY unique_keys (type,user_id) 189 ) TYPE=MyISAM; 190 191 192 193 # 194 # Table structure for table 'subnets' 195 # 196 197 CREATE TABLE subnets ( 198 id int(10) unsigned NOT NULL auto_increment, 199 date_in datetime NOT NULL default '0000-00-00 00:00:00', 200 node_id int(10) unsigned default NULL, 201 ip_start int(10) unsigned NOT NULL default '0', 202 ip_end int(10) unsigned NOT NULL default '0', 203 type enum('local','link','client') NOT NULL default 'local', 204 link_id int(10) unsigned default NULL, 205 client_node_id int(10) unsigned default NULL, 206 PRIMARY KEY (id) 207 ) TYPE=MyISAM; 208 209 210 211 # 212 # Table structure for table 'users' 213 # 214 215 CREATE TABLE users ( 216 id int(10) unsigned NOT NULL auto_increment, 217 date_in datetime NOT NULL default '0000-00-00 00:00:00', 218 username varchar(30) NOT NULL default '', 219 password varchar(40) default NULL, 220 surname varchar(30) default NULL, 221 name varchar(30) default NULL, 222 phone varchar(60) default NULL, 223 email varchar(50) NOT NULL default '', 224 info text, 225 last_session datetime default NULL, 226 last_visit datetime default NULL, 227 status enum('activated','pending') NOT NULL default 'pending', 228 account_code varchar(20) default NULL, 229 PRIMARY KEY (id), 230 UNIQUE KEY unique_keys (username), 231 UNIQUE KEY unique_keys_2 (email) 232 ) TYPE=MyISAM; 233 234 235 236 # 237 # Table structure for table 'users_nodes' 238 # 239 240 CREATE TABLE users_nodes ( 241 id int(10) unsigned NOT NULL auto_increment, 242 user_id int(10) unsigned NOT NULL default '0', 243 node_id int(10) unsigned NOT NULL default '0', 244 owner enum('Y','N') NOT NULL default 'N', 245 PRIMARY KEY (id), 246 UNIQUE KEY unique_keys (node_id,user_id) 247 ) TYPE=MyISAM; 248 1 2 CREATE TABLE `areas` ( 3 `id` int(10) unsigned NOT NULL default '0', 4 `region_id` int(10) unsigned NOT NULL default '0', 5 `name` varchar(40) NOT NULL default '', 6 `ip_start` int(10) unsigned NOT NULL default '0', 7 `ip_end` int(10) unsigned NOT NULL default '0', 8 `info` text, 9 PRIMARY KEY (`id`), 10 KEY `region_id` (`region_id`), 11 KEY `name` (`name`), 12 KEY `ip_start` (`ip_start`), 13 KEY `ip_end` (`ip_end`) 14 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 15 16 CREATE TABLE `dns_nameservers` ( 17 `id` int(10) unsigned NOT NULL auto_increment, 18 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 19 `node_id` int(10) unsigned NOT NULL default '0', 20 `name` enum('ns0','ns1','ns2','ns3') NOT NULL default 'ns0', 21 `ip` int(10) unsigned NOT NULL default '0', 22 `status` enum('waiting','active','pending','rejected','invalid') NOT NULL default 'waiting', 23 `delete_req` enum('Y','N') NOT NULL default 'N', 24 PRIMARY KEY (`id`), 25 UNIQUE KEY `unique_keys` (`name`,`node_id`), 26 KEY `date_in` (`date_in`), 27 KEY `node_id` (`node_id`), 28 KEY `ip` (`ip`), 29 KEY `status` (`status`), 30 KEY `delete_req` (`delete_req`) 31 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 32 33 CREATE TABLE `dns_zones` ( 34 `id` int(10) unsigned NOT NULL auto_increment, 35 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 36 `type` enum('forward','reverse') NOT NULL default 'forward', 37 `name` varchar(30) NOT NULL default '', 38 `node_id` int(10) unsigned default '0', 39 `status` enum('waiting','active','pending','rejected','invalid') NOT NULL default 'waiting', 40 `info` text, 41 `delete_req` enum('Y','N') NOT NULL default 'N', 42 PRIMARY KEY (`id`), 43 UNIQUE KEY `unique_keys` (`name`,`type`), 44 KEY `type` (`type`), 45 KEY `date_in` (`date_in`), 46 KEY `node_id` (`node_id`), 47 KEY `status` (`status`), 48 KEY `delete_req` (`delete_req`) 49 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 50 51 CREATE TABLE `dns_zones_nameservers` ( 52 `id` int(10) unsigned NOT NULL auto_increment, 53 `zone_id` int(10) unsigned NOT NULL default '0', 54 `nameserver_id` int(10) unsigned NOT NULL default '0', 55 PRIMARY KEY (`id`), 56 UNIQUE KEY `unique_keys` (`zone_id`,`nameserver_id`), 57 KEY `nameserver_id` (`nameserver_id`) 58 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 59 60 CREATE TABLE `ip_addresses` ( 61 `id` int(10) unsigned NOT NULL auto_increment, 62 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 63 `hostname` varchar(50) NOT NULL default '', 64 `ip` int(10) unsigned NOT NULL default '0', 65 `mac` varchar(17) default NULL, 66 `node_id` int(10) unsigned NOT NULL default '0', 67 `type` enum('router','server','pc','wireless-bridge','voip','camera','other') NOT NULL default 'pc', 68 `always_on` enum('Y','N') NOT NULL default 'N', 69 `info` text, 70 PRIMARY KEY (`id`), 71 KEY `ip` (`ip`), 72 KEY `node_id` (`node_id`), 73 KEY `hostname` (`hostname`), 74 KEY `type` (`type`) 75 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 76 77 CREATE TABLE `ip_ranges` ( 78 `id` int(10) unsigned NOT NULL auto_increment, 79 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 80 `node_id` int(10) unsigned NOT NULL default '0', 81 `ip_start` int(10) unsigned NOT NULL default '0', 82 `ip_end` int(10) unsigned NOT NULL default '0', 83 `status` enum('waiting','active','pending','rejected','invalid') NOT NULL default 'waiting', 84 `info` text, 85 `delete_req` enum('Y','N') NOT NULL default 'N', 86 PRIMARY KEY (`id`), 87 UNIQUE KEY `unique_keys` (`node_id`,`ip_start`,`ip_end`), 88 KEY `date_in` (`date_in`), 89 KEY `ip_start` (`ip_start`), 90 KEY `ip_end` (`ip_end`), 91 KEY `status` (`status`), 92 KEY `delete_req` (`delete_req`) 93 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 94 95 CREATE TABLE `links` ( 96 `id` int(10) unsigned NOT NULL auto_increment, 97 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 98 `node_id` int(10) unsigned NOT NULL default '0', 99 `peer_node_id` int(10) unsigned default NULL, 100 `peer_ap_id` int(10) unsigned default NULL, 101 `type` enum('p2p','ap','client') NOT NULL default 'p2p', 102 `ssid` varchar(50) default NULL, 103 `protocol` enum('IEEE 802.11b','IEEE 802.11g','IEEE 802.11a','other') default NULL, 104 `channel` varchar(50) default NULL, 105 `status` enum('active','inactive') NOT NULL default 'active', 106 `equipment` text, 107 `info` text, 108 PRIMARY KEY (`id`), 109 KEY `node_id` (`node_id`), 110 KEY `peer_node_id` (`peer_node_id`), 111 KEY `type` (`type`), 112 KEY `status` (`status`), 113 KEY `peer_ap_id` (`peer_ap_id`) 114 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 115 116 CREATE TABLE `nodes` ( 117 `id` int(10) unsigned NOT NULL auto_increment, 118 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 119 `name` varchar(50) NOT NULL default '', 120 `name_ns` varchar(50) NOT NULL default '', 121 `area_id` int(10) unsigned default '0', 122 `latitude` float default NULL, 123 `longitude` float default NULL, 124 `elevation` int(10) unsigned default NULL, 125 `info` text, 126 PRIMARY KEY (`id`), 127 UNIQUE KEY `unique_keys` (`name_ns`), 128 KEY `date_in` (`date_in`), 129 KEY `name` (`name`), 130 KEY `area_id` (`area_id`), 131 KEY `latitude` (`latitude`), 132 KEY `longitude` (`longitude`) 133 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; 134 135 CREATE TABLE `photos` ( 136 `id` int(10) unsigned NOT NULL auto_increment, 137 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 138 `node_id` int(10) unsigned NOT NULL default '0', 139 `type` enum('galery','view') NOT NULL default 'galery', 140 `view_point` enum('N','NE','E','SE','S','SW','W','NW','PANORAMIC') default NULL, 141 `info` text, 142 PRIMARY KEY (`id`), 143 KEY `date_in` (`date_in`), 144 KEY `node_id` (`node_id`), 145 KEY `type` (`type`), 146 KEY `view_point` (`view_point`) 147 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 148 149 CREATE TABLE `regions` ( 150 `id` int(10) unsigned NOT NULL default '0', 151 `name` varchar(40) NOT NULL default '', 152 `ip_start` int(10) unsigned NOT NULL default '0', 153 `ip_end` int(10) unsigned NOT NULL default '0', 154 `info` text, 155 PRIMARY KEY (`id`), 156 KEY `name` (`name`), 157 KEY `ip_start` (`ip_start`), 158 KEY `ip_end` (`ip_end`) 159 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 160 161 CREATE TABLE `rights` ( 162 `id` int(10) unsigned NOT NULL auto_increment, 163 `user_id` int(10) unsigned NOT NULL default '0', 164 `type` enum('blocked','admin','hostmaster') NOT NULL default 'blocked', 165 PRIMARY KEY (`id`), 166 UNIQUE KEY `unique_keys` (`type`,`user_id`), 167 KEY `user_id` (`user_id`) 168 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 169 170 CREATE TABLE `subnets` ( 171 `id` int(10) unsigned NOT NULL auto_increment, 172 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 173 `node_id` int(10) unsigned default NULL, 174 `ip_start` int(10) unsigned NOT NULL default '0', 175 `ip_end` int(10) unsigned NOT NULL default '0', 176 `type` enum('local','link','client') NOT NULL default 'local', 177 `link_id` int(10) unsigned default NULL, 178 `client_node_id` int(10) unsigned default NULL, 179 PRIMARY KEY (`id`), 180 KEY `node_id` (`node_id`) 181 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 182 183 CREATE TABLE `users` ( 184 `id` int(10) unsigned NOT NULL auto_increment, 185 `date_in` datetime NOT NULL default '0000-00-00 00:00:00', 186 `username` varchar(30) NOT NULL default '', 187 `password` varchar(40) default NULL, 188 `surname` varchar(30) default NULL, 189 `name` varchar(30) default NULL, 190 `phone` varchar(60) default NULL, 191 `email` varchar(50) NOT NULL default '', 192 `info` text, 193 `last_session` datetime default NULL, 194 `last_visit` datetime default NULL, 195 `status` enum('activated','pending') NOT NULL default 'pending', 196 `account_code` varchar(20) default NULL, 197 PRIMARY KEY (`id`), 198 UNIQUE KEY `username` (`username`), 199 UNIQUE KEY `email` (`email`), 200 KEY `date_in` (`date_in`), 201 KEY `password` (`password`), 202 KEY `surname` (`surname`), 203 KEY `name` (`name`), 204 KEY `status` (`status`) 205 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 206 207 CREATE TABLE `users_nodes` ( 208 `id` int(10) unsigned NOT NULL auto_increment, 209 `user_id` int(10) unsigned NOT NULL default '0', 210 `node_id` int(10) unsigned NOT NULL default '0', 211 `owner` enum('Y','N') NOT NULL default 'N', 212 PRIMARY KEY (`id`), 213 UNIQUE KEY `unique_keys` (`node_id`,`user_id`), 214 KEY `user_id` (`user_id`) 215 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -
trunk/templates/basic/includes/main_menu.tpl
r113 r118 184 184 </tr> 185 185 <tr> 186 <td colspan="2" class="menu-small-links">{include file="generic/link.tpl" link=$link_ranges_ pending content="$ranges_pending `$lang.pending`"} {include file="generic/link.tpl" link=$link_ranges_req_del content="$ranges_req_del `$lang.for_deletion`"}</td>186 <td colspan="2" class="menu-small-links">{include file="generic/link.tpl" link=$link_ranges_waiting content="$ranges_waiting `$lang.waiting`"} {include file="generic/link.tpl" link=$link_ranges_req_del content="$ranges_req_del `$lang.for_deletion`"}</td> 187 187 </tr> 188 188 {/if} … … 192 192 </tr> 193 193 <tr> 194 <td colspan="2" class="menu-small-links">{include file="generic/link.tpl" link=$link_dnszones_ pending content="$dnszones_pending `$lang.pending`"} {include file="generic/link.tpl" link=$link_dnszones_req_del content="$dnszones_req_del `$lang.for_deletion`"}</td>194 <td colspan="2" class="menu-small-links">{include file="generic/link.tpl" link=$link_dnszones_waiting content="$dnszones_waiting `$lang.waiting`"} {include file="generic/link.tpl" link=$link_dnszones_req_del content="$dnszones_req_del `$lang.for_deletion`"}</td> 195 195 </tr> 196 196 {/if} … … 200 200 </tr> 201 201 <tr> 202 <td colspan="2" class="menu-small-links">{include file="generic/link.tpl" link=$link_dnsnameservers_ pending content="$dnsnameservers_pending `$lang.pending`"} {include file="generic/link.tpl" link=$link_dnsnameservers_req_del content="$dnsnameservers_req_del `$lang.for_deletion`"}</td>202 <td colspan="2" class="menu-small-links">{include file="generic/link.tpl" link=$link_dnsnameservers_waiting content="$dnsnameservers_waiting `$lang.waiting`"} {include file="generic/link.tpl" link=$link_dnsnameservers_req_del content="$dnsnameservers_req_del `$lang.for_deletion`"}</td> 203 203 </tr> 204 204 {/if} -
trunk/templates/basic/includes/pages/hostmaster/hostmaster_dnsnameserver.tpl
r17 r118 23 23 <tr> 24 24 <td class="table-page-pad"> 25 {include file=generic/title1.tpl title="`$lang.nameserver_edit`" content=$form_nameserver} 26 </td> 27 </tr> 28 <tr> 29 <td class="table-page-pad"> 25 30 {include file=generic/title1.tpl title="`$lang.node_info`" content=$table_node_info} 26 31 </td> … … 33 38 <tr> 34 39 <td class="table-page-pad"> 35 {include file=generic/title1.tpl title="`$lang.nameserver_edit`" content=$form_nameserver} 40 {include file=generic/title1.tpl title="`$lang.links`" content=$table_links} 41 </td> 42 </tr> 43 <tr> 44 <td class="table-page-pad"> 45 {include file=generic/title1.tpl title="`$lang.links`" content=$table_dns} 36 46 </td> 37 47 </tr> -
trunk/templates/basic/includes/pages/hostmaster/hostmaster_dnszone.tpl
r17 r118 23 23 <tr> 24 24 <td class="table-page-pad"> 25 {include file=generic/title1.tpl title="`$lang.dnszone_edit`" content=$form_zone} 26 </td> 27 </tr> 28 <tr> 29 <td class="table-page-pad"> 25 30 {include file=generic/title1.tpl title="`$lang.node_info`" content=$table_node_info} 26 31 </td> … … 33 38 <tr> 34 39 <td class="table-page-pad"> 35 {include file=generic/title1.tpl title="`$lang. dnszone_edit`" content=$form_zone}40 {include file=generic/title1.tpl title="`$lang.links`" content=$table_links} 36 41 </td> 37 42 </tr> -
trunk/templates/basic/includes/pages/hostmaster/hostmaster_range.tpl
r17 r118 23 23 <tr> 24 24 <td class="table-page-pad"> 25 {include file=generic/title1.tpl title="`$lang.ip_range_edit`" content=$form_range} 26 </td> 27 </tr> 28 <tr> 29 <td class="table-page-pad"> 25 30 {include file=generic/title1.tpl title="`$lang.node_info`" content=$table_node_info} 26 31 </td> … … 33 38 <tr> 34 39 <td class="table-page-pad"> 35 {include file=generic/title1.tpl title="`$lang. ip_range_edit`" content=$form_range}40 {include file=generic/title1.tpl title="`$lang.links`" content=$table_links} 36 41 </td> 37 42 </tr>
Note: See TracChangeset
for help on using the changeset viewer.
