get_node_commanders goes to backend

diff --git a/wwwroot/backend/mysql/backend.inc b/wwwroot/backend/mysql/backend.inc
index 01717362fe91be455dbcc7fb1147b11d38cea2a9..a9b4915417abd60e12e7265ce3bba71c90957fa4 100644 (file)
--- a/wwwroot/backend/mysql/backend.inc
+++ b/wwwroot/backend/mysql/backend.inc
@@ -505,7 +505,25 @@ public static function getNodeUserlist($node_id) {
        return $userlist;
 }
 
+// getNodeCommanders
+
+// Get logins of all node commanders (used in configure)
+// Secure.
+// Returns list of (node_permission, login)
 
-}
 
+public static function getNodeCommanders($node_id) {
+       global $db;
+       $set=$db->query("select node_permission,users.login from node_access 
+                       left join users on node_access.user_id=users.user_id where 
+                       node_id='$node_id' and node_permission!='' order by node_permission");
+
+       while ($set->next()) {
+               $commanders[$set->getString('node_permission')].=$set->getString('login').";";
+       }
+
+       return $commanders;
+}
+       
+}
 ?>

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_node_commanders.php b/wwwroot/inc/smarty/node_methodz/function.get_node_commanders.php
index 5cdb9020942c3687428105888f7e205fc8506043..437c4ccf4f2e09e0336bfa1e88b8c6765c48d62e 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_node_commanders.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_node_commanders.php
@@ -1,12 +1,9 @@
 <?php
 function smarty_function_get_node_commanders($brawco,&$smarty) {
-       global $db,$node;
+       global $node;
        $node_id=$node['node_id'];
-       $set=$db->query("select node_permission,users.login from node_access left join users on node_access.user_id=users.user_id where node_id='$node_id' and node_permission!='' order by node_permission");
-
-       while ($set->next()) {
-               $commanders[$set->getString('node_permission')].=$set->getString('login').";";
-       }
+       
+       $commanders=nodes::getNodeCommanders($node_id);
 
        $smarty->assign('get_node_commanders',empty($commanders) ? "" : $commanders);
        $smarty->assign('masters',empty($commanders['master']) ? "" : $commanders['master']);

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_node_commanders2.php b/wwwroot/inc/smarty/node_methodz/function.get_node_commanders2.php
index 63ef82e01885146efe3d18023e2555998324a982..2f8faea7afb8dd552df2c85cce644408d7844533 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_node_commanders2.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_node_commanders2.php
@@ -1,4 +1,8 @@
 <?php
+
+//XXX duplicate to get_node_commanders,
+//only one can survive;)
+
 function smarty_function_get_node_commanders2($brawco,&$smarty) {
     global $db,$node;
     $node_id=$node['node_id'];