[Commits] r674 - in trunk/webinterface: core mods/super/admins

[new-commit at lists.openvcp.org]

Author: ftx
Date: 2009-07-07 21:42:36 +0000 (Tue, 07 Jul 2009)
New Revision: 674

Modified:
   trunk/webinterface/core/Socket.php
   trunk/webinterface/mods/super/admins/delete.php
Log:
little bugfix



Modified: trunk/webinterface/core/Socket.php
===================================================================
--- trunk/webinterface/core/Socket.php	2009-07-07 10:20:13 UTC (rev 673)
+++ trunk/webinterface/core/Socket.php	2009-07-07 21:42:36 UTC (rev 674)
@@ -282,7 +282,7 @@
 			else
 			{
 				unset($this->sockets[$node]);
-				OpenVCP::coreError("invalid node");
+				OpenVCP::coreError("invalid node", 1);
 			}
 			
 			return isset($this->sockets[$node]) ? true : false;

Modified: trunk/webinterface/mods/super/admins/delete.php
===================================================================
--- trunk/webinterface/mods/super/admins/delete.php	2009-07-07 10:20:13 UTC (rev 673)
+++ trunk/webinterface/mods/super/admins/delete.php	2009-07-07 21:42:36 UTC (rev 674)
@@ -31,6 +31,7 @@
 $LOG->setUserId($USERINFO['id']);
 $LOG->setLevel('admin');
 require_once('Node.class.php');
+require_once('NodeFactory.class.php');
 
 include "navi.php";
 
@@ -51,7 +52,7 @@
 	$admin = $DB->select($DB->table_admin, NULL, NULL, array('loginname' => $PARAMS[1]));
 	$DB->delete($DB->table_admin, array('loginname' => $PARAMS[1]));
 	$DB->delete($DB->table_admin_privileges, array('adminid' => $admin[0]['id']));
-	$nodeList = Node::getNodeList();
+	$nodeList = NodeFactory::getNodeFactory()->getNodeList();
 	foreach($nodeList as $node) {
 		$node = new Node($node['id']);
 		$node->deleteAdmin($admin[0]['id']);