[Commits] r642 - in trunk/webinterface/mods: super super/admins super/customers super/nodes super/settings super/vservers user/options
new-commit at lists.openvcp.org
new-commit at lists.openvcp.org
Tue Dec 30 00:28:17 UTC 2008
Author: ftx
Date: 2008-12-30 00:28:17 +0000 (Tue, 30 Dec 2008)
New Revision: 642
Added:
trunk/webinterface/mods/super/navi.php
Modified:
trunk/webinterface/mods/super/admins/navi.php
trunk/webinterface/mods/super/customers/navi.php
trunk/webinterface/mods/super/main.php
trunk/webinterface/mods/super/nodes/navi.php
trunk/webinterface/mods/super/settings/main.php
trunk/webinterface/mods/super/settings/navi.php
trunk/webinterface/mods/super/vservers/ips.php
trunk/webinterface/mods/super/vservers/navi.php
trunk/webinterface/mods/user/options/main.php
Log:
Modified: trunk/webinterface/mods/super/admins/navi.php
===================================================================
--- trunk/webinterface/mods/super/admins/navi.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/admins/navi.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -21,6 +21,8 @@
* @version 0.4.0.1
* @package OpenVCP-v0.4
*/
+
+OpenVCP::setTextdomain('super_admins_navi');
if($AUTH->getPrivileges('see_admins') == 'y')
{
@@ -40,4 +42,6 @@
}
}
+
+OpenVCP::resetTextdomain();
?>
Modified: trunk/webinterface/mods/super/customers/navi.php
===================================================================
--- trunk/webinterface/mods/super/customers/navi.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/customers/navi.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -1,5 +1,8 @@
<?
+
+ OpenVCP::setTextdomain('super_customers_navi');
+
$GUI->addContentMenuHead(_("Customers"));
$GUI->addContentMenuSub("", _("customer overview"));
$GUI->addContentMenuSub("add", _("add customer"));
@@ -16,4 +19,6 @@
$GUI->addContentMenuSub($customer->getLoginname(), _("overview"));
$GUI->addContentMenuSub("edit/".$customer->getLoginname(), _("edit"));
}
+
+ OpenVCP::resetTextdomain();
?>
Modified: trunk/webinterface/mods/super/main.php
===================================================================
--- trunk/webinterface/mods/super/main.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/main.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -29,17 +29,9 @@
$LOG =& OpenVCP::call('Log', 'getReference');
$LOG->setLevel('admin');
$LOG->setUserId($USERINFO['id']);
-$GUI->addContentMenuHead(_("Home"));
-$GUI->addContentMenuSub("overview", _("overview"));
-$GUI->addContentMenuSub("logout", _("logout"));
-$GUI->addContentMenuHead(_("quick links"));
-$GUI->addContentMenuSub("admins/add", _("add admin"));
-$GUI->addContentMenuSub("customers/add", _("add customer"));
-$GUI->addContentMenuSub("nodes/add", _("add node"));
-$GUI->addContentMenuSub("vservers/add", _("add vserver"));
+include "navi.php";
-
require_once "Sendmail.class.php";
require_once "Vserver.class.php";
require_once "NodeFactory.class.php";
Added: trunk/webinterface/mods/super/navi.php
===================================================================
--- trunk/webinterface/mods/super/navi.php (rev 0)
+++ trunk/webinterface/mods/super/navi.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2008 Gerrit Wyen <gerrit at t4a.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * @author Gerrit Wyeb / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+
+ OpenVCP::setTextdomain('super_navi');
+
+ $GUI->addContentMenuHead(_("Home"));
+ $GUI->addContentMenuSub("overview", _("overview"));
+ $GUI->addContentMenuSub("logout", _("logout"));
+
+ $GUI->addContentMenuHead(_("quick links"));
+ $GUI->addContentMenuSub("admins/add", _("add admin"));
+ $GUI->addContentMenuSub("customers/add", _("add customer"));
+ $GUI->addContentMenuSub("nodes/add", _("add node"));
+ $GUI->addContentMenuSub("vservers/add", _("add vserver"));
+
+
+ OpenVCP::resetTextdomain();
+?>
Modified: trunk/webinterface/mods/super/nodes/navi.php
===================================================================
--- trunk/webinterface/mods/super/nodes/navi.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/nodes/navi.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -22,6 +22,9 @@
* @package OpenVCP-v0.4
*/
+
+OpenVCP::setTextdomain('super_nodes_navi');
+
$GUI->addContentMenuHead(_("Nodes"));
$GUI->addContentMenuSub("overview", _("overview"));
@@ -62,4 +65,6 @@
$GUI->addContentMenuHead(_("Misc"));
$GUI->addContentMenuSub("update", _("update vserver list"), 1);
}
+
+OpenVCP::resetTextdomain();
?>
Modified: trunk/webinterface/mods/super/settings/main.php
===================================================================
--- trunk/webinterface/mods/super/settings/main.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/settings/main.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -285,4 +285,4 @@
}
}
else
- OpenVCP::gotoURL('super/settings/own');
+ OpenVCP::gotoURL('super/settings/global');
Modified: trunk/webinterface/mods/super/settings/navi.php
===================================================================
--- trunk/webinterface/mods/super/settings/navi.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/settings/navi.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -22,6 +22,8 @@
* @package OpenVCP-v0.4
*/
+ OpenVCP::setTextdomain('super_settings_navi');
+
$GUI->addContentMenuHead(_("preferences"));
if($AUTH->getPrivileges('modify_global_settings') == 'y')
@@ -52,4 +54,5 @@
$GUI->addContentMenuSub("mail/add", _("add template"), 2);
+ OpenVCP::resetTextdomain();
?>
Modified: trunk/webinterface/mods/super/vservers/ips.php
===================================================================
--- trunk/webinterface/mods/super/vservers/ips.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/vservers/ips.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -80,9 +80,15 @@
}
if($dev == "nodev")
$nodev="true";
+ else if($dev == "tun" || $dev == "tap")
+ {
+ $tuntap = $dev;
+ $dev = $dev.$alias;
+ $alias = "";
+ }
$DB->update($DB->table_network, array('used' => 'y', 'vserverid' => $vserver->getID()) ,array('ip' => $ip));
- $vserver->addIp($ip, $dev, $mask, $alias, $bcast, $nodev);
+ $vserver->addIp($ip, $dev, $mask, $alias, $bcast, $nodev, $tuntap);
$GUI->p(_("ip successfully added. Make sure to restart the vserver before the changes take affect."));
}
else if(isset($_POST['deleteip']))
@@ -147,6 +153,7 @@
$ifaceList = $vserver->getNodeObject()->getInterfaces();
array_push($ifaceList, "nodev");
sort($ifaceList);
+
foreach($ifaceList as $interface)
{
$ifaceDrop[$interface] = $interface;
@@ -159,6 +166,8 @@
$GUI->tableAddCol($row, _("custom ip").": ");
$col = $GUI->tableAddCol($row, "");
$GUI->formAddInputElement($col, "text", "ipsingle");
+$ifaceDrop['create tun'] = "tun";
+$ifaceDrop['create tap'] = "tap";
$GUI->formAddDropdown($col, "interfacesingle", $ifaceDrop);
$row = $GUI->tableAddRow($table);
$GUI->tableAddCol($row, _("netmask").": ");
Modified: trunk/webinterface/mods/super/vservers/navi.php
===================================================================
--- trunk/webinterface/mods/super/vservers/navi.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/super/vservers/navi.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -22,6 +22,8 @@
* @package OpenVCP-v0.4
*/
+OpenVCP::setTextdomain('super_vservers_navi');
+
$GUI->addContentMenuHead(_("VServer"));
$GUI->addContentMenuSub("", _("overview"));
$GUI->addContentMenuSub("add", _("add vserver"));
@@ -36,5 +38,5 @@
$GUI->addContentMenuSub("template/add", _("add template"));
-
+OpenVCP::resetTextdomain();
?>
Modified: trunk/webinterface/mods/user/options/main.php
===================================================================
--- trunk/webinterface/mods/user/options/main.php 2008-12-30 00:26:49 UTC (rev 641)
+++ trunk/webinterface/mods/user/options/main.php 2008-12-30 00:28:17 UTC (rev 642)
@@ -67,7 +67,7 @@
$settings = $DB->select($DB->table_user_settings, NULL, NULL, array('userid' => $USERINFO['id']));
if(!is_array($settings))
{
- $settings = $DB->select($DB->table_user_settings_available, NULL, NULL, array('adminid' => $USERINFO['adminid']));
+ $settings = $DB->select($DB->table_user_settings_available, NULL, NULL);
}
if($PARAMS[0] == "settings")
{
More information about the Commits
mailing list