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

[new-commit at lists.openvcp.org]

Author: cryptronic
Date: 2008-09-12 21:36:23 +0000 (Fri, 12 Sep 2008)
New Revision: 628

Modified:
   trunk/webinterface/core/Vserver.class.php
   trunk/webinterface/mods/super/admins/nodes.php
   trunk/webinterface/mods/super/vservers/info.php
   trunk/webinterface/mods/super/vservers/vsnavi.php
Log:
Little bugfixes

Modified: trunk/webinterface/core/Vserver.class.php
===================================================================
--- trunk/webinterface/core/Vserver.class.php	2008-09-12 20:41:14 UTC (rev 627)
+++ trunk/webinterface/core/Vserver.class.php	2008-09-12 21:36:23 UTC (rev 628)
@@ -515,7 +515,7 @@
 	 * 
 	 * @return boolean
 	 */
-	public function setSchedule($schedule, $interval = 32, $prioritybias = 0, $tokens = 500, $tokensmin = 200, $tokensmax = 1000 ) {
+	public function setSchedule($schedule, $interval = 32, $prioritybias = 0, $tokens = 500, $tokensmin = 200, $tokensmax = 1000, $fill_rate2 = 1, $interval2 = 5, $idle_time = false) {
 		$request = $this->XML->newRequestObject("vserver.set_schedule");
 		$this->XML->addValue($request, "string", $this->vserverinfo['name']);
 		$this->XML->addStructMember($request, "fill-rate", "string", number_format($schedule, 0));
@@ -524,6 +524,11 @@
 		$this->XML->addStructMember($request, "tokens", "string", $tokens);
 		$this->XML->addStructMember($request, "tokens-min", "string", $tokensmin);
 		$this->XML->addStructMember($request, "tokens-max", "string", $tokensmax);
+		$this->XML->addStructMember($request, "fill-rate2", "string", $fill_rate2);
+		$this->XML->addStructMember($request, "interval2", "string", $interval2);
+		if($idle_time == 0) {
+			$this->XML->addStructMember($request, "idle-time", "string", "");
+		}
 		$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
 		if($this->XML->getValues($response, 'boolean')) {
 			return true;

Modified: trunk/webinterface/mods/super/admins/nodes.php
===================================================================
--- trunk/webinterface/mods/super/admins/nodes.php	2008-09-12 20:41:14 UTC (rev 627)
+++ trunk/webinterface/mods/super/admins/nodes.php	2008-09-12 21:36:23 UTC (rev 628)
@@ -113,7 +113,7 @@
 	if(@$PARAMS[0] == "save")
 	{
 		$nodeList = NodeFactory::getNodeFactory()->getNodeList();
-		$adminList = Admin::getAdminList();
+		$adminList = AdminFactory::getInstance()->getAdminList();
 		foreach($nodeList as $nodeId)
 		{
 			$node = NodeFactory::getNodeFactory()->getNodeByID($nodeId['id']);

Modified: trunk/webinterface/mods/super/vservers/info.php
===================================================================
--- trunk/webinterface/mods/super/vservers/info.php	2008-09-12 20:41:14 UTC (rev 627)
+++ trunk/webinterface/mods/super/vservers/info.php	2008-09-12 21:36:23 UTC (rev 628)
@@ -61,14 +61,13 @@
 $GUI->tableAddCol($row, $vserver->getName());
 $row = $GUI->tableAddRow($table);
 $GUI->tableAddCol($row, _("customername"));
-$GUI->formAddDropdown($GUI->tableAddCol($row, ""), "customer", createDropdownContent("table_user", array('id', 'loginname'), ($AUTH->getPrivileges('see_all_users') == 'y') ? NULL : array('adminid' => $USERINFO['id']),  "none", array('loginname' => 'ASC')), $vserver->getUserObject()->getId());
+$GUI->formAddDropdown($GUI->tableAddCol($row, ""), "customer", createDropdownContent("table_user", array('id', 'loginname'), ($AUTH->getPrivileges('see_all_users') == 'y') ? NULL : array('adminid' => $USERINFO['id']), "none", array('loginname' => 'ASC')), $vserver->getUserObject()->getId());
 $row = $GUI->tableAddRow($table);
 $GUI->tableAddCol($row, _("node"));
 $GUI->tableAddCol($row, $node->getName());
 $row = $GUI->tableAddRow($table);
 $GUI->tableAddCol($row, _("adminname"));
-$availadmins = createDropdownContent("table_admin", array('id', 'loginname'), ($AUTH->getPrivileges('see_admins') == 'y') ? NULL : array('id' => $USERINFO['id'], array('loginname' => 'ASC')), "none");
-$GUI->formAddDropdown($GUI->tableAddCol($row, ""), "admin", $availadmins, $vserver->getAdminObject()->getId());
+$GUI->formAddDropdown($GUI->tableAddCol($row, ""), "admin", createDropdownContent("table_admin", array('id', 'loginname'), ($AUTH->getPrivileges('see_admins') == 'y') ? NULL : array('id' => $USERINFO['id']), "none", array('loginname' => 'ASC')), $vserver->getAdminObject()->getId());
 $row = $GUI->tableAddRow($table);
 $GUI->tableAddCol($row, _("hostname"));
 $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "hostname", $vserver->getHostname());

Modified: trunk/webinterface/mods/super/vservers/vsnavi.php
===================================================================
--- trunk/webinterface/mods/super/vservers/vsnavi.php	2008-09-12 20:41:14 UTC (rev 627)
+++ trunk/webinterface/mods/super/vservers/vsnavi.php	2008-09-12 21:36:23 UTC (rev 628)
@@ -22,6 +22,10 @@
  * @package OpenVCP-v0.4
  */
 
+if($vserver->getAdmin() != $USERINFO['id'] && $AUTH->getPrivileges('see_admins') != 'y')
+{
+	OpenVCP::gotoURL("super/vservers");
+}
 
 $GUI->addContentMenuHead($vserver->getName(), 3, 1);
 $GUI->addContentMenuSub("info/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("info"), 2);