Changeset 151

Timestamp:

03/08/2006 10:51:16 PM (6 years ago)

Author:

Winner

Message:

Add: Services support.
Bug fix: Extra field displaying error on registration page.

Location:

trunk

Files:

• globals/functions.php (modified) (1 diff)
• globals/language/english.php (modified) (4 diffs)
• globals/language/greek.php (modified) (4 diffs)
• includes/main_center.php (modified) (1 diff)
• includes/main_menu.php (modified) (3 diffs)
• includes/pages/admin/admin_nodes_services.php (added)
• includes/pages/admin/admin_services.php (added)
• includes/pages/admin/admin_services_service.php (added)
• includes/pages/mynodes/mynodes.php (modified) (5 diffs)
• includes/pages/mynodes/mynodes_services.php (added)
• includes/pages/nodes/nodes_view.php (modified) (3 diffs)
• includes/pages/services (added)
• includes/pages/services/services.php (added)
• includes/pages/users/users.php (modified) (2 diffs)
• templates/basic/constructors/table.tpl (modified) (1 diff)
• templates/basic/constructors/table2.tpl (modified) (1 diff)
• templates/basic/images/services-small.png (added)
• templates/basic/images/services.gif (added)
• templates/basic/includes/main_menu.tpl (modified) (4 diffs)
• templates/basic/includes/pages/admin/admin_nodes_services.tpl (added)
• templates/basic/includes/pages/admin/admin_services.tpl (added)
• templates/basic/includes/pages/admin/admin_services_service.tpl (added)
• templates/basic/includes/pages/mynodes/mynodes.tpl (modified) (1 diff)
• templates/basic/includes/pages/mynodes/mynodes_services.tpl (added)
• templates/basic/includes/pages/nodes/nodes_view.tpl (modified) (1 diff)
• templates/basic/includes/pages/nodes/nodes_view_table_services.tpl (added)
• templates/basic/includes/pages/services (added)
• templates/basic/includes/pages/services/services.tpl (added)

trunk/globals/functions.php

@@ -365 +365 @@
         }
 }
+
+function url_fix ($url, $default_prefix="http://") {
+        // Windows shares (samba) check
+        if (substr(stripslashes($url), 0, 2) == '\\\\') {
+                return 'file://'.str_replace('\\', '/', substr(stripslashes($url), 2));
+        }
+        // Insert default prefix
+        if (strpos($url, '://') === FALSE) {
+                return $default_prefix.$url;
+        }
+}
+
 ?>

trunk/globals/language/english.php

@@ -73 +73 @@
         'dns_zones_search' => "Search for DNS zones",
         'dns_zones_found' => "DNS zones found",
+        
+        'all_services' => "Network services",
+        'active_services' => "Active services",
+        'services_search' => "Search services",
+        'services_found' => "Services found",
+        'services_categories' => "Services categories",
+        'services_categories_add' => "Add service category",
+        'services_categories_edit' => "Edit service category",
+        'services_edit' => "Edit service",
+        'services_add' => "Add service",
+        'services' => "Services",
+        
         'user_add' => "New user",
         'user_edit' => "User profile",
@@ -297 +309 @@
                 'ip_addresses__info' => 'Info',
 
+                'services__title' => 'Category',
+                'services__protocol' => 'Protocol',
+                'services__protocol-tcp' => 'TCP',
+                'services__protocol-udp' => 'UDP',
+                'services__port' => 'Port',
+
+                'nodes_services__node_id' => 'Node',
+                'nodes_services__service_id' => 'Category',
+                'nodes_services__date_in' => 'Added',
+                'nodes_services__ip_id' => 'IP Address',
+                'nodes_services__url' => 'URL',
+                'nodes_services__status' => 'Status',
+                'nodes_services__status-active' => 'Active',
+                'nodes_services__status-inactive' => 'Inactive',
+                'nodes_services__info' => 'Info',
+                'nodes_services__protocol' => 'Protocol',
+                'nodes_services__protocol-tcp' => 'TCP',
+                'nodes_services__protocol-udp' => 'UDP',
+                'nodes_services__port' => 'Port',
+                
                 'photos__date_in' => 'Date',
                 'photos__view_point' => 'Aspect',
@@ -523 +555 @@
                         'body' => 'In this page you can search for DNS zones of the network by filling in the corresponding fields. The results are displayed in the follwing table. Furthermore, you cat choose a node for viewing.'
                 ),
+                
+                'services' => array(
+                        'title' => 'Services',
+                        'body' => 'In this page you can search for network services by filling in the corresponding fields. The results are displayed in the follwing table. Furthermore, you cat choose a service or a node for viewing.'
+                ),
+                
                 'mynodes_add' => array(
                         'title' => 'Add node',
@@ -579 +617 @@
                         'body' => 'In this page you can add or edit an IP address for your node. The \'Hostname\' field describes the device that the corresponding IP address belongs to and must be the same for all the IP addresses of that device.'
                 ),
+                
+                'mynodes_services_add' => array(
+                        'title' => 'Add Service',
+                        'body' => 'In this page you can add a service of your node. The IP Address field should contain the IP address that the service is listening at. The URL field should contain a link to the service or a link to a page about the service. The Protocol and Port should contain the protocol (ie. tcp,udp) and the port that the service uses.'
+                ),
+                'mynodes_services_edit' => array(
+                        'title' => 'Edit Service',
+                        'body' => 'In this page you can edit a service of your node. The IP Address field contains all the IP addresses that you have commit and should contain the IP address that the service is listening at. The URL field should contain a link to the service or a link to a page about the service. The Protocol and Port should contain the protocol (ie. tcp,udp) and the port that the service uses.'
+                ),
+                'admin_services' => array(
+                        'title' => 'Services Administration',
+                        'body' => 'In this page you can add, edit or delete a Services Category. From the <<Edit Services>> link you can see all network services and edit them.'
+                ),
+                
                 'nodes_search' => array(
                         'title' => 'Network nodes',

trunk/globals/language/greek.php

@@ -85 +85 @@
         'dns_zones_found' => "ΖώΜες DNS ποÏ
  βρέΞηκαΜ",
+
+        'all_services' => "Υπηρεσίες ΎικτύοÏ
+",
+        'active_services' => "ΕΜεργές Ï
+πηρεσίες",
+        'services_search' => "ΑΜαζήτηση Ï
+πηρεσιώΜ",
+        'services_found' => "Υπηρεσίες ποÏ
+ βρέΞηκαΜ",
+        'services_edit' => "ΕπεΟεργασία Ï
+πηρεσίας",
+        'services_add' => "ΠροσΞήκη Ï
+πηρεσίας",
+        'services' => "Υπηρεσίες",
+        'services_categories' => "Κατηγορίες Ï
+πηρεσίωΜ",
+        'services_categories_add' => "ΠροσΞήκη κατηγορίας Ï
+πηρεσίωΜ",
+        'services_categories_edit' => "ΕπεΟεργασία κατηγορίας Ï
+πηρεσίωΜ",
+
         'user_add' => "Εγγραφή ΜέοÏ
  χρήστη",
@@ -373 +394 @@
                 'ip_addresses__always_on-N' => 'ΟΧΙ',
                 'ip_addresses__info' => 'Πληροφορίες',
-
+        
+                'services__title' => 'Κατηγορία',
+                'services__protocol' => 'Πρωτόκολλο',
+                'services__protocol-tcp' => 'TCP',
+                'services__protocol-udp' => 'UDP',
+                'services__port' => 'Πόρτα',
+
+                'nodes_services__node_id' => 'ΚόΌβος',
+                'nodes_services__service_id' => 'Κατηγορία',
+                'nodes_services__date_in' => 'ΠροστέΞηκε',
+                'nodes_services__ip_id' => 'ΔιεύΞÏ
+Μση IP',
+                'nodes_services__url' => 'URL',
+                'nodes_services__status' => 'Κατάσταση',
+                'nodes_services__status-active' => 'ΕΜεργή',
+                'nodes_services__status-inactive' => 'ΑΜεΜεργή',
+                'nodes_services__info' => 'Πληροφορίες',
+                'nodes_services__protocol' => 'Πρωτόκολλο',
+                'nodes_services__protocol-tcp' => 'TCP',
+                'nodes_services__protocol-udp' => 'UDP',
+                'nodes_services__port' => 'Πόρτα',
+                
                 'photos__date_in' => 'ΗΌεροΌηΜία',
                 'photos__view_point' => 'ΚατεύΞÏ
@@ -727 +769 @@
 .'
                 ),
+                
+                'services' => array(
+                        'title' => 'Υπηρεσίες',
+                        'body' => 'Στη σελίΎα αÏ
+τή Όπορείτε Μα αΜαζητήσετε Ï
+πηρεσίες τοÏ
+ ΎικτύοÏ
+, Όε βάση τα πεΎία ποÏ
+ προσφέροΜται. ΀α αποτελέσΌατα εΌφαΜίζοΜται στοΜ παρακάτω πίΜακα. Επίσης, Όπορείτε Μα ΌεταφερΞείτε σε κάποια Ï
+πηρεσία (αΜ προσφέρεται URL) ή Μα επιλέΟετε κάποιοΜ κόΌβο για προβολή τωΜ στοιχείωΜ τοÏ
+.'
+                ),
+                
                 'mynodes_add' => array(
                         'title' => 'ΠροσΞήκη κόΌβοÏ
@@ -862 +917 @@
  ΌηχαΜήΌατος.'
                 ),
+                
+                'mynodes_services_add' => array(
+                        'title' => 'ΠροσΞήκη Ï
+πηρεσίας',
+                        'body' => 'Στη σελίΎα αÏ
+τή Όπορείτε Μα προσΞέσετε Όία Ï
+πηρεσία τοÏ
+ κόΌβοÏ
+ σας. ΀ο πεΎίο ΔιεύΞÏ
+Μση IP περιέχει όλες τις ΎιεÏ
+ΞύΜσεις ποÏ
+ έχετε Ύηλώσει και πρέπει Μα καΞορίζει τηΜ IP στηΜ οποία τρέχει (ακούει) η Ï
+πηρεσία. ΀ο πεΎίο URL, πρέπει Μα περιέχει το link για τηΜ Ï
+πηρεσία ή το link για κάποια σελίΎα ποÏ
+ αΜαφέρεται στηΜ Ï
+πηρεσία. ΀έλος τα πεΎία Πρωτόκολλο και Πόρτα, πρέπει Μα αΜαφέροΜται στο πρωτόκολλο ποÏ
+ χρησιΌοποιεί η Ï
+πηρεσία (π.χ. tcp, udp) και στηΜ πόρτα ποÏ
+ ακούει.'
+                ),
+                'mynodes_services_edit' => array(
+                        'title' => 'ΕπεΟεργασία Ï
+πηρεσίας',
+                        'body' => 'Στη σελίΎα αÏ
+τή Όπορείτε Μα επεΟεργαστείτε Όία Ï
+πηρεσία τοÏ
+ κόΌβοÏ
+ σας. ΀ο πεΎίο ΔιεύΞÏ
+Μση IP περιέχει όλες τις ΎιεÏ
+ΞύΜσεις ποÏ
+ έχετε Ύηλώσει και πρέπει Μα καΞορίζει τηΜ IP στηΜ οποία τρέχει (ακούει) η Ï
+πηρεσία. ΀ο πεΎίο URL, πρέπει Μα περιέχει το link για τηΜ Ï
+πηρεσία ή το link για κάποια σελίΎα ποÏ
+ αΜαφέρεται στηΜ Ï
+πηρεσία. ΀έλος τα πεΎία Πρωτόκολλο και Πόρτα, πρέπει Μα αΜαφέροΜται στο πρωτόκολλο ποÏ
+ χρησιΌοποιεί η Ï
+πηρεσία (π.χ. tcp, udp) και στηΜ πόρτα ποÏ
+ ακούει.'
+                ),
+                
                 'nodes_search' => array(
                         'title' => 'ΚόΌβοι ΎικτύοÏ

trunk/includes/main_center.php

@@ -65 +65 @@
                         case 'gmap':
                         case 'gearth':
+                        case 'services':
                         case 'search':
                                 return TRUE;

trunk/includes/main_menu.php

@@ -62 +62 @@
                                 $this->tpl['link_admin_nodes'] = makelink(array("page" => "admin", "subpage" => "nodes"));
                                 $this->tpl['link_admin_users'] = makelink(array("page" => "admin", "subpage" => "users"));
+                                $this->tpl['link_admin_nodes_services'] = makelink(array("page" => "admin", "subpage" => "nodes_services"));
+                                $this->tpl['link_admin_services'] = makelink(array('page' => 'admin', 'subpage' => 'services'));
                         }
                         if ($main->userdata->privileges['admin'] === TRUE || $main->userdata->privileges['hostmaster'] === TRUE) {
@@ -88 +90 @@
                 $this->tpl['link_allnodes'] = makelink(array("page" => "nodes"));
                 $this->tpl['link_allranges'] = makelink(array("page" => "ranges", "subpage" => "search"));
+                $this->tpl['link_allservices'] = makelink(array("page" => "services"));
                 $this->tpl['link_alldnszones'] = makelink(array("page" => "dnszones"));
                 $this->tpl['link_restore_password'] = makelink(array("page" => "users", "action" => "restore"));
@@ -142 +145 @@
                                                 'links.id'
                                                 );
+                $this->tpl['stats_services_active'] =
+                                $db->cnt('',
+                                                'nodes_services',
+                                                'nodes_services.status = "active"'
+                                                );
+                $this->tpl['stats_services_total'] =
+                                $db->cnt('',
+                                                'nodes_services',
+                                                ''
+                                                );
                 return template($this->tpl, __FILE__);
         }

trunk/includes/pages/mynodes/mynodes.php

@@ -265 +265 @@
         }
 
+        function table_services() {
+                global $construct, $db, $main;
+                $table_services = new table(array('TABLE_NAME' => 'table_services', 'FORM_NAME' => 'table_services'));
+                $table_services->db_data(
+                        'services.title, nodes_services.id, nodes.id AS nodes__id, ip_addresses.ip, nodes_services.url, nodes_services.info, nodes_services.status, nodes_services.date_in',
+                        'nodes_services
+                        LEFT JOIN nodes on nodes_services.node_id = nodes.id
+                        LEFT JOIN services on nodes_services.service_id = services.id
+                        LEFT JOIN ip_addresses ON ip_addresses.id = nodes_services.ip_id',
+                        "nodes_services.node_id = '".get('node')."'",
+                        '',
+                        "nodes_services.date_in ASC");
+                foreach( (array) $table_services->data as $key => $value) {
+                        if ($key != 0) {
+                                if ($table_services->data[$key]['ip']) 
+                                        $table_services->data[$key]['ip'] = long2ip($table_services->data[$key]['ip']);
+                                $table_services->info['EDIT'][$key] = makelink(array("page" => "mynodes", "subpage" => "services", "node" => intval(get('node')), "service" => $table_services->data[$key]['id']));
+                        }
+                }
+                $table_services->info['EDIT_COLUMN'] = 'title';
+                $table_services->db_data_translate('nodes_services__status');
+                $table_services->db_data_multichoice('nodes_services', 'id');
+                $table_services->info['MULTICHOICE_LABEL'] = 'delete';
+                $table_services->db_data_remove('id','nodes__id');
+                return $table_services;
+        }
+        
         function table_photosview() {
                 global $db, $vars;
@@ -325 +352 @@
                                 $this->tpl['table_subnets'] = $construct->table($this->table_subnets(), __FILE__);
                                 $this->tpl['table_ipaddr'] = $construct->table($this->table_ipaddr(), __FILE__);
+                                $this->tpl['table_services'] = $construct->table($this->table_services(), __FILE__);
                                 $this->tpl['table_photosview'] = $construct->table($this->table_photosview(), __FILE__);
                                 if ($this->has_owner_access()) $this->tpl['link_node_delete'] = makelink(array('action' => 'delete'), TRUE);
@@ -335 +363 @@
                                 $this->tpl['link_subnet_add'] = makelink(array('page' => 'mynodes', 'subpage' => 'subnet', 'node' => get('node'), 'subnet' => 'add'));
                                 $this->tpl['link_ipaddr_add'] = makelink(array('page' => 'mynodes', 'subpage' => 'ipaddr', 'node' => get('node'), 'ipaddr' => 'add'));
+                                $this->tpl['link_services_add'] = makelink(array('page' => 'mynodes', 'subpage' => 'services', 'node' => get('node'), 'service' => 'add'));
+
                         }
                         $this->tpl['link_gmap_pickup'] = makelink(array('page' => 'pickup', 'subpage' => 'gmap', "object_lat" => "form_node.elements['nodes__latitude']", "object_lon" => "form_node.elements['nodes__longitude']"));
@@ -375 +405 @@
                         $db->set('ip_addresses', array('node_id' => $_POST['nodes__id']), "node_id = ".intval(get('node')));
                         $db->set('ip_ranges', array('node_id' => $_POST['nodes__id']), "node_id = ".intval(get('node')));
+                        $db->set('services', array('node_id' => $_POST['nodes__id']), "node_id = '".get('node')."'");
                         $db->set('links', array('node_id' => $_POST['nodes__id']), "node_id = ".intval(get('node')));
                         $db->set('links', array('peer_node_id' => $_POST['nodes__id']), "peer_node_id = ".intval(get('node')));
@@ -485 +516 @@
                 foreach( (array) $_POST['id'] as $key => $value) {
                         $ret = $ret && $db->del("ip_addresses", "id = '".$value."'");
+                }
+                if ($ret) {
+                        $main->message->set_fromlang('info', 'delete_success', makelink("",TRUE));
+                } else {
+                        $main->message->set_fromlang('error', 'generic');               
+                }
+        }
+        
+        function output_onpost_table_services() {
+                global $db, $main;
+                $ret = TRUE;
+                foreach( (array) $_POST['id'] as $key => $value) {
+                        $ret = $ret && $db->del("nodes_services", "id = '".$value."'");
                 }
                 if ($ret) {

trunk/includes/pages/nodes/nodes_view.php

@@ -134 +134 @@
                 return $table_nameservers;
         }
-
+        
         function table_links_p2p() {
                 global $db;
@@ -240 +240 @@
                 return $table_ipaddr_subnets;
         }
-                
+
+        function table_services() {
+                global $db, $vars, $lang;
+                $table_services = new table(array('TABLE_NAME' => 'table_services', 'FORM_NAME' => 'table_services'));
+                $table_services->db_data(
+                        'services.title, nodes_services.id, nodes.id AS nodes__id, ip_addresses.ip, nodes_services.url, nodes_services.info, nodes_services.status, nodes_services.date_in, IFNULL(nodes_services.protocol, services.protocol) AS protocol, IFNULL(nodes_services.port, services.port) AS port',
+                        'nodes_services
+                        LEFT JOIN nodes on nodes_services.node_id = nodes.id
+                        LEFT JOIN services on nodes_services.service_id = services.id
+                        LEFT JOIN ip_addresses ON ip_addresses.id = nodes_services.ip_id',
+                        "nodes_services.node_id = '".get('node')."'",
+                        '',
+                        "services.title ASC");
+
+                foreach( (array) $table_services->data as $key => $value) {
+                        if ($key != 0) {
+                                if ($table_services->data[$key]['ip']) {
+                                        $table_services->data[$key]['ip'] = long2ip($table_services->data[$key]['ip']);
+                                        if ($table_services->data[$key]['protocol'] && $table_services->data[$key]['port']) {
+                                                $table_services->data[$key]['ip'] .= ' ('.$lang['db']['nodes_services__protocol-'.$table_services->data[$key]['protocol']].'/'.$table_services->data[$key]['port'].')';
+                                        }
+                                }
+                                $table_services->info['LINK']['services__title'][$key] = $table_services->data[$key]['url'];
+                        }
+                }
+                $table_services->db_data_remove('id','nodes__id', 'url', 'protocol', 'port');
+                $table_services->db_data_translate('nodes_services__status');
+                return $table_services;
+        }
+        
         function output() {
                 if ($_SERVER['REQUEST_METHOD'] == 'POST' && method_exists($this, 'output_onpost_'.$_POST['form_name'])) return call_user_func(array($this, 'output_onpost_'.$_POST['form_name']));
@@ -275 +304 @@
 
                 $this->tpl['table_ipaddr_subnets'] = $construct->table($this->table_ipaddr_subnets(), __FILE__);
-                
+                $this->tpl['table_services'] = $construct->table($this->table_services(), __FILE__);
                 $t = $db->get('id, date_in, view_point, info', 'photos', "node_id = ".intval(get('node')));
                 foreach( (array) $t as $key => $value) {

trunk/includes/pages/users/users.php

@@ -36 +36 @@
                 global $main, $db, $vars, $lang;
                 $form_user = new form(array('FORM_NAME' => 'form_user'));
-                $form_user->db_data('users.username, users.password, users.surname, users.name, users.email, users.phone, users.info'.($main->userdata->privileges['admin'] === TRUE?', rights.type, users.status':''));
+                $form_user->db_data('users.username, users.password, users.surname, users.name, users.email, users.phone, users.info, users.language');
                 // Hide password...
                 $form_user->data[1]['value'] = '';
@@ -44 +44 @@
                 $form_user->data[2]['Field'] .= '_c';
                 $form_user->data[2]['fullField'] .= '_c';
+                $form_user->data[8]['Type'] = 'enum';
+                $form_user->data[8]['Null'] = '';
+                $form_user->data[8]['Type_Enums'][0] = array("value" => "", "output" => $lang['default']);
+                foreach($vars['language']['enabled'] as $key => $value) {
+                        if ($value) array_push($form_user->data[8]['Type_Enums'], array("value" => $key, "output" => ($lang['languages'][$key]==''?$key:$lang['languages'][$key])));
+                }
+                
                 if ($main->userdata->privileges['admin'] === TRUE) {
-                        $form_user->data[8]['Type'] = 'enum_multi';
+                        $form_user->db_data('rights.type, users.status');
+                        $form_user->data[9]['Type'] = 'enum_multi';
                         $form_user->db_data_values_multi("rights", "user_id", get('user'), 'type');     
+                        
                         $form_user->db_data('users_nodes.node_id, users_nodes.node_id');
-                        $form_user->data[10]['Field'] = 'node_id_owner';
-                        $form_user->data[10]['fullField'] = 'node_id_owner';
+                        $form_user->data[11]['Field'] = 'node_id_owner';
+                        $form_user->data[11]['fullField'] = 'node_id_owner';
                         $form_user->db_data_pickup("node_id_owner", "nodes", $db->get("nodes.id AS value, CONCAT(nodes.name, ' (#', nodes.id, ')') AS output", "users_nodes, nodes", "nodes.id = users_nodes.node_id AND users_nodes.user_id = '".get('user')."' AND users_nodes.owner = 'Y'"), TRUE);
                         $form_user->db_data_pickup("users_nodes.node_id", "nodes", $db->get("nodes.id AS value, CONCAT(nodes.name, ' (#', nodes.id, ')') AS output", "users_nodes, nodes", "nodes.id = users_nodes.node_id AND users_nodes.user_id = '".get('user')."' AND users_nodes.owner != 'Y'"), TRUE);           
                 }
-                $form_user->db_data('users.language');
-                $form_user->data[12]['Type'] = 'enum';
-                $form_user->data[12]['Null'] = '';
-                $form_user->data[12]['Type_Enums'][0] = array("value" => "", "output" => $lang['default']);
-                foreach($vars['language']['enabled'] as $key => $value) {
-                        if ($value) array_push($form_user->data[12]['Type_Enums'], array("value" => $key, "output" => ($lang['languages'][$key]==''?$key:$lang['languages'][$key])));
-                }
+                
                 $form_user->db_data_values("users", "id", get('user'));
                 $form_user->data[1]['value'] = '';

trunk/templates/basic/constructors/table.tpl

@@ -71 +71 @@
                 {assign var=onclick value="javascript: window.opener.pickup(window.opener.document.`$extra_data.PICKUP_OBJECT`,'`$extra_data.PICKUP_OUTPUT[row]`','`$extra_data.PICKUP_VALUE[row]`', window); return false;"|stripslashes}
         {/if}
-        <td class="{$cellclass}">{if $key==$edit_column && $smarty.section.row.index != 0}<a href="{$edit}"{if $extra_data.PICKUP_COLUMN != ''} onclick="{$onclick}"{/if}>{$cell|escape}</a>{else}{$cell|escape}{/if}</td>
+        <td class="{$cellclass}">
+                {if $key==$edit_column && $smarty.section.row.index != 0}
+                <a href="{$edit}"{if $extra_data.PICKUP_COLUMN != ''} onclick="{$onclick}"{/if}>
+                {/if}
+                {if $extra_data.LINK.$fullkey[row] != ''}
+                <a href="{$extra_data.LINK.$fullkey[row]}">
+                {/if}
+                {$cell|escape}
+                {if $key==$edit_column && $smarty.section.row.index != 0}</a>{/if}
+                {if $extra_data.LINK.$fullkey[row] != ''}
+                </a>
+                {/if}
+        </td>
         {/if}
         {/foreach}

trunk/templates/basic/constructors/table2.tpl

@@ -41 +41 @@
         {/if}
         
-        <td class="{$cellclass}">{$cell|escape}</td>
+        <td class="{$cellclass}">
+                {if $extra_data.LINK.$fullkey[row] != ''}
+                <a href="{$extra_data.LINK.$fullkey[row]}">
+                {/if}
+                {$cell|escape}
+                {if $extra_data.LINK.$fullkey[row] != ''}
+                </a>
+                {/if}
+        </td>
         {/if}
         {/foreach}

trunk/templates/basic/includes/main_menu.tpl

@@ -66 +66 @@
                                         <td class="table-search-menu-text"><img src="templates/basic/images/search_ip.gif" width="33" height="32" alt="{$lang.all_ranges}" />&nbsp;<a href="{$link_allranges}">{$lang.all_ranges}</a></td>
                                 </tr>
+                                <tr>
+                                        <td class="table-search-menu-text"><img src="templates/basic/images/services.gif" width="33" height="32" alt="{$lang.all_services}" />&nbsp;<a href="{$link_allservices}">{$lang.all_services}</a></td>
+                                </tr>
                                 <tr>
                                         <td class="table-search-menu-text">
@@ -104 +107 @@
                                 </tr>
                                 <tr>
-                                        <td rowspan="4" class="quick-login-text"><img src="templates/basic/images/stats.png" width="48" height="48" alt="{$lang.statistics}" /></td>
+                                        <td rowspan="5" class="quick-login-text"><img src="templates/basic/images/stats.png" width="48" height="48" alt="{$lang.statistics}" /></td>
                                         <td class="quick-login-text">{$stats_nodes_active}/{$stats_nodes_total} <span style="color: black;">{$lang.active_nodes|lower}</span></td>
                                 </tr>
@@ -116 +119 @@
                                         <td class="quick-login-text">{$stats_aps} <span style="color: black;">{$lang.aps|lower}</span></td>
                                 </tr>
+                                <tr>
+                                        <td class="quick-login-text">{$stats_services_active}/{$stats_services_total} <span style="color: black;">{$lang.active_services|lower}</span></td>
+                          </tr>
                                 <tr>
                                         <td colspan="2" class="table-middle-left-pad"></td>
@@ -167 +173 @@
                                         <td colspan="2" class="table-form-title"><img src="templates/basic/images/user-small.png" alt="{$lang.users}" />&nbsp;<a href="{$link_admin_users}">{$lang.users}</a></td>
                                 </tr>
+                                <tr class="table-form-row1">
+                                        <td colspan="2" class="table-form-title"><img src="templates/basic/images/services-small.png" alt="{$lang.services}" />&nbsp;<a href="{$link_admin_nodes_services}">{$lang.services}</a></td>
+                                </tr>
+                                <tr class="table-form-row1">
+                                        <td colspan="2" class="table-form-title"><img src="templates/basic/images/services-small.png" alt="{$lang.services_categories}" />&nbsp;<a href="{$link_admin_services}">{$lang.services_categories}</a></td>
+                                </tr>
                                 <tr>
                                         <td colspan="2" class="table-middle-left-pad"></td>

trunk/templates/basic/includes/pages/mynodes/mynodes.tpl

@@ -85 +85 @@
 <tr>
 <td class="table-page-pad">
+{include assign="t1" file="generic/link.tpl" link=$link_services_add content="`$lang.services_add`"}
+{include file=generic/title2.tpl title="`$lang.services` $t1" content=$table_services}
+</td>
+</tr>
+<tr>
+<td class="table-page-pad">
 {include file=generic/title2.tpl title="`$lang.myview`" content=$table_photosview}
 </td>

trunk/templates/basic/includes/pages/nodes/nodes_view.tpl

@@ -74 +74 @@
 <tr>
 <td colspan="2" class="table-page-pad">
+{include file=generic/title2.tpl title="`$lang.services`" content=$table_services}
+</td>
+</tr>
+<tr>
+<td colspan="2" class="table-page-pad">
 {include assign=t file=includes/pages/nodes/myview.tpl}
 {include file=generic/title2.tpl title="`$lang.myview`" content=$t}