[Commits] r675 - in trunk/webinterface: core core/locale/de_DE/LC_MESSAGES core/locale/en_US/LC_MESSAGES mods/ajax mods/super/vservers mods/user/control
new-commit at lists.openvcp.org
new-commit at lists.openvcp.org
Sat Jul 18 15:44:25 UTC 2009
Author: cryptronic
Date: 2009-07-18 15:44:24 +0000 (Sat, 18 Jul 2009)
New Revision: 675
Added:
trunk/webinterface/mods/user/control/backups.php
trunk/webinterface/mods/user/control/change.php
trunk/webinterface/mods/user/control/hostname.php
trunk/webinterface/mods/user/control/power.php
trunk/webinterface/mods/user/control/reinstall.php
trunk/webinterface/mods/user/control/rescue.php
trunk/webinterface/mods/user/control/trafficlimit.php
Modified:
trunk/webinterface/core/GUI.php
trunk/webinterface/core/Vserver.class.php
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/auth_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_add.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_admin.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_delete.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_images.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_navi.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_nodes.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_add.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_delete.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_edit.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_navi.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_template.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_log_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_add.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_control.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_delete.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_edit.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_navi.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_node.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_update.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_mail.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_navi.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_add.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_bandwidth.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_control.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_flags.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_graph.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_info.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_ips.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_iptables.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_limits.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_navi.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_reinstall.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_rescue.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_stats.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_template.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_vsnavi.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_control_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_firewall_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_functions.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_options_main.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_graph.po
trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_main.po
trunk/webinterface/core/mysql.sql
trunk/webinterface/mods/ajax/NodeHandler.class.php
trunk/webinterface/mods/super/vservers/add.php
trunk/webinterface/mods/super/vservers/backup.php
trunk/webinterface/mods/super/vservers/info.php
trunk/webinterface/mods/super/vservers/limits.php
trunk/webinterface/mods/super/vservers/template.php
trunk/webinterface/mods/super/vservers/vsnavi.php
trunk/webinterface/mods/user/control/main.php
Log:
A lot of bugfixes and new features
Modified: trunk/webinterface/core/GUI.php
===================================================================
--- trunk/webinterface/core/GUI.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/GUI.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -548,9 +548,9 @@
public function h($text, $type = '1', $element = 0){
$type = $type === '1' ? '1' : '2';
if($element == 0)
- $this->contentData .= "<h$type>" . nl2br(htmlentities($text)) . "</h$type>\n";
+ $this->contentData .= "<h$type>" . nl2br($text) . "</h$type>\n";
else
- $this->contentData = str_replace("{eId".$element."}", "<h".$type.">" . nl2br(htmlentities($text)) . "</h".$type.">\n{eId".$element."}", $this->contentData);
+ $this->contentData = str_replace("{eId".$element."}", "<h".$type.">" . nl2br($text) . "</h".$type.">\n{eId".$element."}", $this->contentData);
}
/**
@@ -562,7 +562,7 @@
* @param string $id
* @return string
*/
- public function p($text, $element = 0, $htmlentities = true, $id = "")
+ public function p($text, $element = 0, $htmlentities = false, $id = "")
{
if($element == 0)
$this->contentData .= "<p" . (($id != "") ? " id=".$id : "") . ">" . nl2br(($htmlentities ? htmlentities($text) : $text)) . "</p>\n";
@@ -624,7 +624,7 @@
* @param string $text
* @param string $id
*/
- public function div($text, $id, $element = 0, $class = "", $htmlentities = true)
+ public function div($text, $id, $element = 0, $class = "", $htmlentities = false)
{
if($text != "" && $element == 0)
$this->contentData .= "<div id=" . $id . " class=\"" . $class . "\">" . nl2br(($htmlentities ? htmlentities($text) : $text)) . "</div>\n";
@@ -683,7 +683,7 @@
* @param string $text
*/
public function title($text){
- $this->pageTitle = htmlentities($text);
+ $this->pageTitle = $text;
}
/**
Modified: trunk/webinterface/core/Vserver.class.php
===================================================================
--- trunk/webinterface/core/Vserver.class.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/Vserver.class.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -231,7 +231,7 @@
public function addIpByDB($id, $dev, $alias) {
$ipInfo = $this->DB->select($this->DB->table_network, NULL, NULL, array('id' => $id));
$ipInfo = $ipInfo[0];
- $this->addIp($ipInfo['ip'], $dev, $ipInfo['mask'], $alias, $ipInfo['bcast'], ($dev == 'nodev' ? 'nodev' : ''));
+ $this->addIp($ipInfo['ip'], $dev, $ipInfo['netmask'], $alias, $ipInfo['broadcast'], ($dev == 'nodev' ? 'nodev' : ''));
$this->DB->update($this->DB->table_network, array('vserverid' => $this->vserverinfo['id'], 'used' => 'y'), array('id' => $id));
}
@@ -444,8 +444,18 @@
*/
public function controlStart()
{
- if($this->isDisabled(true))
- return "error vserver is disabled";
+ if($this->isDisabled(true))
+ {
+ $state[0] = "error vserver is disabled";
+ return $state;
+ }
+ if($this->vserverinfo['lock'] > 0)
+ {
+ $state[0] = "vserver is locked";
+ return $state;
+
+ }
+
$request = $this->XML->newRequestObject("vserver.start");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
@@ -458,8 +468,18 @@
*/
public function controlStop()
{
- if($this->isDisabled(true))
- return "error vserver is disabled";
+ if($this->isDisabled(true))
+ {
+ $state[0] = "error vserver is disabled";
+ return $state;
+ }
+ if($this->vserverinfo['lock'] > 0)
+ {
+ $state[0] = "vserver is locked";
+ return $state;
+
+ }
+
$request = $this->XML->newRequestObject("vserver.stop");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
@@ -732,6 +752,10 @@
public function controlSetupImage($imagename) {
if($this->isDisabled(true))
return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
+ $this->DB->update($this->DB->table_vservers, array('lock' => (1)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 1;
$hostname = $this->getHostname();
$request = $this->XML->newRequestObject("setup.vserver_image");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
@@ -739,6 +763,8 @@
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
$reinstallstate = $this->XML->getValues($response, "boolean");
$this->setHostname($hostname);
+ $this->DB->update($this->DB->table_vservers, array('lock' => (0)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 0;
return $reinstallstate[0];
}
@@ -750,6 +776,8 @@
public function controlSetupPassword($password) {
if($this->isDisabled(true))
return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
$request = $this->XML->newRequestObject("vserver.set_rootpw");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$this->XML->addValue($request, "string", $password);
@@ -829,9 +857,15 @@
public function setRescue() {
if($this->isDisabled(true))
return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
+ $this->DB->update($this->DB->table_vservers, array('lock' => (2)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 2;
$request = $this->XML->newRequestObject("vserver.rescue");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
+ $this->DB->update($this->DB->table_vservers, array('lock' => (0)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 0;
return $this->XML->getValues($response, "string");
}
@@ -877,38 +911,96 @@
/**
* get the current backups
+ *
+ * @return array
*/
public function getBackups() {
$request = $this->XML->newRequestObject("vserver.get_userbackups");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
- $backups = $this->XML->getValues($response, "string");
+ while(($backup = $this->XML->getNextStruct($response)) != NULL) {
+ $backups[] = $backup;
+ }
return $backups;
}
+ /**
+ * checks whether an backup of a vserver exists
+ */
+ public function isBackupOfVserver($backupname) {
+ $backups = $this->getBackups();
+ foreach($backups as $backup) {
+ if(array_search($backupname, $backup))
+ return true;
+ }
+ return false;
+ }
/**
* create a new backup
*/
public function createBackup() {
+ if($this->isDisabled(true))
+ return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
+ $this->DB->update($this->DB->table_vservers, array('lock' => (3)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 3;
$request = $this->XML->newRequestObject("vserver.create_userbackups");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
$backupname = $this->XML->getValues($response, "string");
+ $this->DB->update($this->DB->table_vservers, array('lock' => (0)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 0;
return $backupname[0];
}
/**
+ * refresh a backup
+ *
+ * @param string $backupname
+ */
+ public function refreshBackup($backupname) {
+ if($this->isDisabled(true))
+ return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
+ if(!$this->isBackupOfVserver($backupname))
+ return _('no backup selected');
+ $this->DB->update($this->DB->table_vservers, array('lock' => (4)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 4;
+ $request = $this->XML->newRequestObject("vserver.refresh_userbackups");
+ $this->XML->addValue($request, "string", $this->vserverinfo['name']);
+ $this->XML->addValue($request, "string", $backupname);
+ $response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
+ $backupname = $this->XML->getValues($response, "string");
+ $this->DB->update($this->DB->table_vservers, array('lock' => (0)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 0;
+ return $backupname[0];
+ }
+
+
+ /**
* restore a backup
*
* @param string $backupname
*/
public function restoreBackup($backupname) {
+ if($this->isDisabled(true))
+ return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
+ if(!$this->isBackupOfVserver($backupname))
+ return _('no backup selected');
+ $this->DB->update($this->DB->table_vservers, array('lock' => (4)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 4;
$request = $this->XML->newRequestObject("vserver.restore_userbackups");
$this->XML->addValue($request, "string", $this->vserverinfo['name']);
$this->XML->addValue($request, "string", $backupname);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
$backupname = $this->XML->getValues($response, "string");
+ $this->DB->update($this->DB->table_vservers, array('lock' => (0)), array('id' => $this->vserverinfo['id']));
+ $this->vserverinfo['lock'] = 0;
return $backupname[0];
}
@@ -918,13 +1010,50 @@
* @param string $backupname
*/
public function deleteBackup($backupname) {
+ if($this->isDisabled(true))
+ return "error vserver is disabled";
+ if($this->vserverinfo['lock'] > 0)
+ return "vserver is locked";
+ if(!$this->isBackupOfVserver($backupname))
+ return _('no backup selected');
$request = $this->XML->newRequestObject("vserver.delete_userbackups");
$this->XML->addValue($request, "string", $backupname);
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
$backupname = $this->XML->getValues($response, "string");
return $backupname[0];
}
+
/**
+ * get max backups per vserver
+ */
+ public function getBackupLimit() {
+ return $this->vserverinfo['backup_count'];
+ }
+
+ /**
+ * set max backups per vserver
+ */
+ public function setBackupLimit($limit) {
+ $this->vserverinfo['backup_count'] = $limit;
+ $this->DB->update($this->DB->table_vservers, array('backup_count' => ($limit)), array('id' => $this->vserverinfo['id']));
+ }
+
+ /**
+ * get lock state
+ */
+ public function getLockState() {
+ return $this->vserverinfo['lock'];
+ }
+
+ /**
+ * get lock state
+ */
+ public function removeLock() {
+ $this->vserverinfo['lock'] = 0;
+ $this->DB->update($this->DB->table_vservers, array('lock' => (0)), array('id' => $this->vserverinfo['id']));
+ }
+
+ /**
* creates a new VServer and returns the newly created vserver
*
* @param string $vservername
@@ -932,7 +1061,7 @@
* @param Admin $admin
* @param Customer $customer
*/
- static public function createNewVServer($vservername, Node $node, Admin $admin, Customer $customer) {
+ static public function createNewVServer($vservername, Node $node, Admin $admin, Customer $customer, $backup_count) {
$XML = OpenVCP::call('XML', 'getReference');
$SOCKET = OpenVCP::call('Socket', 'getReference');
$DB = OpenVCP::call('DB', 'getReference');
@@ -948,7 +1077,7 @@
$xid = $XML->getValues($response, "int");
//inserting vServer into DB
- $vsId = $DB->insert($DB->table_vservers, array('', $vservername, $xid[0], $node->getId(), $admin->getId(), $customer->getId(), 'n'));
+ $vsId = $DB->insert($DB->table_vservers, array('', $vservername, $xid[0], $node->getId(), $admin->getId(), $customer->getId(), 'n', $backup_count , '0'));
if($admin->getSetting("vserver_prefix").$admin->getSetting("vserver_prefix_last") == $vservername)
{
$oldValue = $admin->getSetting("vserver_prefix_last");
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -1,360 +1,97 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-12 19:04+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../../../mods/user/control/main.php:42
-#: ../../../../mods/user/control/main.php:47
-msgid "control"
-msgstr "Control"
-
-#: ../../../../mods/user/control/main.php:48
-msgid "rescue"
-msgstr "Rettungssystem"
-
-#: ../../../../mods/user/control/main.php:49
-#: ../../../../mods/user/control/main.php:400
-msgid "reinstall"
-msgstr "Neuinstallation"
-
-#: ../../../../mods/user/control/main.php:50
-msgid "hostname"
-msgstr "Hostname"
-
-#: ../../../../mods/user/control/main.php:51
-msgid "root password"
-msgstr "Root Passwort"
-
-#: ../../../../mods/user/control/main.php:64
-#: ../../../../mods/user/control/main.php:169
-#: ../../../../mods/user/control/main.php:259
-#: ../../../../mods/user/control/main.php:415
-#: ../../../../mods/user/control/main.php:449
-msgid "sorry this vserver is disabled"
-msgstr "Dieser VServer ist deaktiviert"
-
-#: ../../../../mods/user/control/main.php:74
-msgid "restarted vserver"
-msgstr "VServer neugestartet"
-
-#: ../../../../mods/user/control/main.php:76
-#: ../../../../mods/user/control/main.php:295
-msgid "stopping vserver"
-msgstr "Stoppe VServer"
-
-#: ../../../../mods/user/control/main.php:81
-#: ../../../../mods/user/control/main.php:108
-#: ../../../../mods/user/control/main.php:183
-#: ../../../../mods/user/control/main.php:200
-#: ../../../../mods/user/control/main.php:202
-#: ../../../../mods/user/control/main.php:209
-#: ../../../../mods/user/control/main.php:304
-#: ../../../../mods/user/control/main.php:330
-#: ../../../../mods/user/control/main.php:340
-#: ../../../../mods/user/control/main.php:346
-msgid "ok"
-msgstr "OK"
-
-#: ../../../../mods/user/control/main.php:84
-#: ../../../../mods/user/control/main.php:119
-#: ../../../../mods/user/control/main.php:136
-#: ../../../../mods/user/control/main.php:183
-#: ../../../../mods/user/control/main.php:200
-#: ../../../../mods/user/control/main.php:202
-#: ../../../../mods/user/control/main.php:209
-#: ../../../../mods/user/control/main.php:311
-#: ../../../../mods/user/control/main.php:352
-#: ../../../../mods/user/control/main.php:362
-msgid "failed"
-msgstr "fehlgeschlagen"
-
-#: ../../../../mods/user/control/main.php:89
-#: ../../../../mods/user/control/main.php:109
-#: ../../../../mods/user/control/main.php:120
-msgid "output"
-msgstr "Ausgabe"
-
-#: ../../../../mods/user/control/main.php:96
-msgid "started vserver"
-msgstr "VServer gestartet"
-
-#: ../../../../mods/user/control/main.php:101
-msgid "starting vserver"
-msgstr "Starte Vserver"
-
-#: ../../../../mods/user/control/main.php:114
-#: ../../../../mods/user/control/main.php:147
-#: ../../../../mods/user/control/main.php:153
-#: ../../../../mods/user/control/main.php:347
-#: ../../../../mods/user/control/main.php:481
-msgid "vserver"
-msgstr "VServer"
-
-#: ../../../../mods/user/control/main.php:114
-msgid "sucessfully started"
-msgstr "erfolgreich gestartet"
-
-#: ../../../../mods/user/control/main.php:125
-#: ../../../../mods/user/control/main.php:312
-#: ../../../../mods/user/control/main.php:353
-msgid "error starting vserver"
-msgstr "Fehler beim Starten des VServers"
-
-#: ../../../../mods/user/control/main.php:126
-#: ../../../../mods/user/control/main.php:138
-#: ../../../../mods/user/control/main.php:162
-#: ../../../../mods/user/control/main.php:313
-#: ../../../../mods/user/control/main.php:354
-#: ../../../../mods/user/control/main.php:364
-#: ../../../../mods/user/control/main.php:371
-#: ../../../../mods/user/control/main.php:406
-msgid "please contact support"
-msgstr "Bitte kontaktieren Sie den Support"
-
-#: ../../../../mods/user/control/main.php:129
-msgid "restart of vserver failed: vserver doesn't start after stop'"
-msgstr "Neustart des VServers ist fehlgeschlagen: Der VServer startete nicht mehr"
-
-#: ../../../../mods/user/control/main.php:131
-msgid "start of vserver failed: vserver doesn't start'"
-msgstr "VServer ist nicht gestartet"
-
-#: ../../../../mods/user/control/main.php:137
-msgid "error stopping vserver"
-msgstr "Fehler beim stoppen des VServers"
-
-#: ../../../../mods/user/control/main.php:139
-#: ../../../../mods/user/control/main.php:317
-msgid "reinstall of vserver failed: vserver didn't stop"
-msgstr "Neuinstallation des VServers fehlgeschlagen: VServer stoppte nicht"
-
-#: ../../../../mods/user/control/main.php:145
-msgid "control vserver"
-msgstr "VServer Steuerung"
-
-#: ../../../../mods/user/control/main.php:147
-msgid "is online"
-msgstr "ist online"
-
-#: ../../../../mods/user/control/main.php:148
-msgid "should this veserver be restarted"
-msgstr "Soll dieser VServer neu gestartet werden"
-
-#: ../../../../mods/user/control/main.php:150
-msgid "restart"
-msgstr "Neustart"
-
-#: ../../../../mods/user/control/main.php:153
-msgid "is offline"
-msgstr "ist offline"
-
-#: ../../../../mods/user/control/main.php:154
-msgid "should this veserver be started"
-msgstr "Soll dieser VServer gestartet werden"
-
-#: ../../../../mods/user/control/main.php:156
-msgid "start"
-msgstr "start"
-
-#: ../../../../mods/user/control/main.php:161
-#: ../../../../mods/user/control/main.php:370
-#: ../../../../mods/user/control/main.php:404
-msgid "sorry your request could not be performed"
-msgstr "Ihre Anfrage konnte nicht bearbeitet werden"
-
-#: ../../../../mods/user/control/main.php:178
-msgid "stopping"
-msgstr "stoppe"
-
-#: ../../../../mods/user/control/main.php:194
-msgid "switching to normal system"
-msgstr "Schalte auf normalen Modus um"
-
-#: ../../../../mods/user/control/main.php:196
-msgid "switching to rescue system"
-msgstr "Schalte auf rescue Modus um: VServer"
-
-#: ../../../../mods/user/control/main.php:205
-msgid "starting"
-msgstr "starte"
-
-#: ../../../../mods/user/control/main.php:221
-msgid "rescue root password for ssh is"
-msgstr "Rettungssystem root Passwort für SSH lautet"
-
-#: ../../../../mods/user/control/main.php:222
-msgid "system is booted into rescue mode"
-msgstr "Das System ist in das Rettungssystem gestartet"
-
-#: ../../../../mods/user/control/main.php:223
-msgid "your vserver can be found in /vserver"
-msgstr "Ihr VServer findet sich unter /vserver im Rettungssystem"
-
-#: ../../../../mods/user/control/main.php:226
-msgid "system is booted into normal mode"
-msgstr "Das System ist in den normalen Modus gestartet"
-
-#: ../../../../mods/user/control/main.php:231
-msgid "rescue mode"
-msgstr "Rettungssystem"
-
-#: ../../../../mods/user/control/main.php:234
-msgid "vserver is in rescue mode"
-msgstr "Der VServer ist im Rettungssystem"
-
-#: ../../../../mods/user/control/main.php:237
-#: ../../../../mods/user/control/main.php:246
-#: ../../../../mods/user/control/main.php:398
-#: ../../../../mods/user/control/main.php:442
-#: ../../../../mods/user/control/main.php:475
-msgid "current login pass"
-msgstr "OpenVCP Login Passwort"
-
-#: ../../../../mods/user/control/main.php:240
-msgid "boot into normal mode"
-msgstr "Boote ins normale System"
-
-#: ../../../../mods/user/control/main.php:243
-msgid "vserver is in normal mode"
-msgstr "VServer ist im Normalbetrieb"
-
-#: ../../../../mods/user/control/main.php:249
-msgid "boot into rescue mode"
-msgstr "Boote ins Rettungssystem"
-
-#: ../../../../mods/user/control/main.php:286
-msgid "reinstalled vserver"
-msgstr "VServer wurde neuinstalliert"
-
-#: ../../../../mods/user/control/main.php:286
-msgid "with image"
-msgstr "mit dem Image"
-
-#: ../../../../mods/user/control/main.php:323
-#: ../../../../mods/user/control/main.php:378
-msgid "reinstall vserver"
-msgstr "neuinstallieren"
-
-#: ../../../../mods/user/control/main.php:343
-msgid "setting rootpassword"
-msgstr "Setze das Rootpassword"
-
-#: ../../../../mods/user/control/main.php:347
-msgid "sucessfully reinstalled"
-msgstr "Erfolgreich Neuinstalliert"
-
-#: ../../../../mods/user/control/main.php:348
-msgid "new root password is"
-msgstr "Das neue Rootpasswort lautet"
-
-#: ../../../../mods/user/control/main.php:356
-msgid "restart of vserver failed: vserver doesn't start after reinstall'"
-msgstr "Neustart des VServers ist fehlgeschlagen: der Vserver ist nach der Installation nicht mehr gestartet"
-
-#: ../../../../mods/user/control/main.php:363
-msgid "error reinstalling vserver"
-msgstr "Fehler bei der Neuinstallation"
-
-#: ../../../../mods/user/control/main.php:382
-msgid "available images"
-msgstr "Verfügbare Images"
-
-#: ../../../../mods/user/control/main.php:405
-msgid "did you insert your password"
-msgstr "Haben Sie Ihr OpenVCP Passwort eingegeben"
-
-#: ../../../../mods/user/control/main.php:419
-msgid "changing root password of"
-msgstr "Ändere das Rootpasswort von VServer"
-
-#: ../../../../mods/user/control/main.php:426
-msgid "password successfully changed"
-msgstr "Das Passwort wurde erfolgreich geändert"
-
-#: ../../../../mods/user/control/main.php:427
-msgid "chanched root password of vserver"
-msgstr "Rootpasswort geändert"
-
-#: ../../../../mods/user/control/main.php:431
-#: ../../../../mods/user/control/main.php:465
-msgid "current login pass doesn't match"
-msgstr "Das OpenVCP Passwort ist falsch"
-
-#: ../../../../mods/user/control/main.php:435
-msgid "change root password"
-msgstr "Ändere das Rootpasswort"
-
-#: ../../../../mods/user/control/main.php:439
-msgid "new root password"
-msgstr "Neues Rootpasswort"
-
-#: ../../../../mods/user/control/main.php:444
-#: ../../../../mods/user/control/main.php:477
-msgid "set"
-msgstr "setzen"
-
-#: ../../../../mods/user/control/main.php:453
-msgid "change hostname of"
-msgstr "Hostnamen ändern von "
-
-#: ../../../../mods/user/control/main.php:459
-msgid "hostname successfully changed"
-msgstr "Hostname wurde erfolgreich geändert"
-
-#: ../../../../mods/user/control/main.php:460
-msgid "you have to restart your vserver in order to complete the change"
-msgstr "Sie müssen Ihren VServer neustarten, damit die Änderungen übernommen werden"
-
-#: ../../../../mods/user/control/main.php:461
-msgid "chanched hostname of vserver"
-msgstr "Hostname geändert von VServer"
-
-#: ../../../../mods/user/control/main.php:468
-msgid "change hostname"
-msgstr "Hostnamen ändern"
-
-#: ../../../../mods/user/control/main.php:472
-msgid "current hostname"
-msgstr "Momentaner Hostname"
-
-#: ../../../../mods/user/control/main.php:485
-msgid "name"
-msgstr "Name"
-
-#: ../../../../mods/user/control/main.php:486
-msgid "state"
-msgstr "Status"
-
-#: ../../../../mods/user/control/main.php:487
-msgid "load"
-msgstr "Last"
-
-#: ../../../../mods/user/control/main.php:488
-msgid "uptime"
-msgstr "Uptime"
-
-#: ../../../../mods/user/control/main.php:495
-msgid "online"
-msgstr "online"
-
-#: ../../../../mods/user/control/main.php:495
-msgid "offline"
-msgstr "offline"
-
-msgid "trafficlimit"
-msgstr "Traffic Limit"
-
-
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../mods/user/control/main.php:42 ../mods/user/control/main.php:47
+msgid "control"
+msgstr "Control"
+
+#: ../mods/user/control/main.php:48
+msgid "rescue"
+msgstr "Rettungssystem"
+
+#: ../mods/user/control/main.php:49
+msgid "reinstall"
+msgstr "Neuinstallation"
+
+#: ../mods/user/control/main.php:50
+msgid "hostname"
+msgstr "Hostname"
+
+#: ../mods/user/control/main.php:51
+msgid "root password"
+msgstr "Root-Passwort"
+
+#: ../mods/user/control/main.php:52
+msgid "trafficlimit"
+msgstr "Traffic-Limit"
+
+#: ../mods/user/control/main.php:54
+msgid "backups"
+msgstr "Backups"
+
+#: ../mods/user/control/main.php:61
+msgid "vserver"
+msgstr "vServer"
+
+#: ../mods/user/control/main.php:65
+msgid "name"
+msgstr "Name"
+
+#: ../mods/user/control/main.php:66
+msgid "state"
+msgstr "Status"
+
+#: ../mods/user/control/main.php:67
+msgid "action"
+msgstr "Aktion"
+
+#: ../mods/user/control/main.php:68
+msgid "load"
+msgstr "Load"
+
+#: ../mods/user/control/main.php:69
+msgid "uptime"
+msgstr "Uptime"
+
+#: ../mods/user/control/main.php:75
+msgid "online"
+msgstr "online"
+
+#: ../mods/user/control/main.php:75
+msgid "offline"
+msgstr "offline"
+
+#: ../mods/user/control/main.php:79
+msgid "image setup"
+msgstr "Image-Setup"
+
+#: ../mods/user/control/main.php:82
+msgid "set rescue"
+msgstr "setze Rettungssystem"
+
+#: ../mods/user/control/main.php:85
+msgid "create backup"
+msgstr "erstelle Backup"
+
+#: ../mods/user/control/main.php:88
+msgid "restore rescue"
+msgstr ""
+
+#: ../mods/user/control/main.php:91
+msgid "nothing"
+msgstr ""
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -22,13 +22,13 @@
#: ../../../../mods/user/firewall/main.php:47
msgid "overview"
-msgstr "Übersicht"
+msgstr "Übersicht"
#: ../../../../mods/user/firewall/main.php:48
#: ../../../../mods/user/firewall/main.php:68
#: ../../../../mods/user/firewall/main.php:128
msgid "add rule"
-msgstr "Regel hinzufügen"
+msgstr "Regel hinzufügen"
#: ../../../../mods/user/firewall/main.php:66
msgid "select direction"
@@ -36,11 +36,11 @@
#: ../../../../mods/user/firewall/main.php:73
msgid "add new"
-msgstr "Neue Regel für VServer"
+msgstr "Neue Regel für VServer"
#: ../../../../mods/user/firewall/main.php:73
msgid "rule for vserver"
-msgstr "hinzufügen"
+msgstr "hinzufügen"
#: ../../../../mods/user/firewall/main.php:77
msgid "select protocol"
@@ -52,11 +52,11 @@
#: ../../../../mods/user/firewall/main.php:109
msgid "select match"
-msgstr "Übereinstimmung"
+msgstr "Übereinstimmung"
#: ../../../../mods/user/firewall/main.php:112
msgid "select match value"
-msgstr "Wert für die Übereinstimmung"
+msgstr "Wert für die Übereinstimmung"
#: ../../../../mods/user/firewall/main.php:114
msgid "states"
@@ -72,7 +72,7 @@
#: ../../../../mods/user/firewall/main.php:164
msgid "firewall rules for vserver"
-msgstr "Firewallregeln für VServer"
+msgstr "Firewallregeln für VServer"
#: ../../../../mods/user/firewall/main.php:166
msgid "default policy is allow"
@@ -108,7 +108,7 @@
#: ../../../../mods/user/firewall/main.php:190
msgid "match"
-msgstr "Übereinstimmung"
+msgstr "Übereinstimmung"
#: ../../../../mods/user/firewall/main.php:191
msgid "match value"
@@ -121,4 +121,4 @@
#: ../../../../mods/user/firewall/main.php:208
msgid "delete rules"
-msgstr "Regeln löschen"
+msgstr "Regeln löschen"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -18,7 +18,7 @@
#: ../../../../mods/user/main.php:33
msgid "overview"
-msgstr "Übersicht"
+msgstr "Übersicht"
#: ../../../../mods/user/main.php:34
msgid "logout"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -22,11 +22,11 @@
#: ../../../../mods/user/options/main.php:33
msgid "change password"
-msgstr "Passwort ändern"
+msgstr "Passwort ändern"
#: ../../../../mods/user/options/main.php:34
msgid "change settings"
-msgstr "Einstellungen Ändern"
+msgstr "Einstellungen Ändern"
#: ../../../../mods/user/options/main.php:52
msgid "your settings were saved"
@@ -34,11 +34,11 @@
#: ../../../../mods/user/options/main.php:59
msgid "password has been changed"
-msgstr "Passwort wurde geändert"
+msgstr "Passwort wurde geändert"
#: ../../../../mods/user/options/main.php:63
msgid "password's do not match"
-msgstr "Die Passwörter stimmen nicht über ein"
+msgstr "Die Passwörter stimmen nicht über ein"
#: ../../../../mods/user/options/main.php:64
msgid "plaese try again"
@@ -60,7 +60,7 @@
#: ../../../../mods/user/options/main.php:117
msgid "change your password"
-msgstr "Passwort Ändern"
+msgstr "Passwort Ändern"
#: ../../../../mods/user/options/main.php:119
msgid "new password"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -36,7 +36,7 @@
#: ../../../../mods/user/stats/main.php:82
#: ../../../../mods/user/stats/main.php:149
msgid "traffic for"
-msgstr "Datentransferstatistik für"
+msgstr "Datentransferstatistik für"
#: ../../../../mods/user/stats/main.php:86
msgid "hour"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/auth_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/auth_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/auth_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_add.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_add.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_add.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_admin.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_admin.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_admin.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_delete.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_delete.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_delete.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_images.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_images.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_images.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/admins/images.php:62 ../mods/super/admins/images.php:100
+#: ../mods/super/admins/images.php:62 ../mods/super/admins/images.php:99
msgid "successfully updated"
msgstr ""
@@ -40,27 +40,27 @@
msgid "description"
msgstr ""
-#: ../mods/super/admins/images.php:83 ../mods/super/admins/images.php:138
+#: ../mods/super/admins/images.php:83 ../mods/super/admins/images.php:137
msgid "save settings"
msgstr ""
-#: ../mods/super/admins/images.php:101
+#: ../mods/super/admins/images.php:100
msgid "updated images for admins"
msgstr ""
-#: ../mods/super/admins/images.php:105
+#: ../mods/super/admins/images.php:104
msgid "this feature requires, that on all nodes exist the same images"
msgstr ""
-#: ../mods/super/admins/images.php:110
+#: ../mods/super/admins/images.php:109
msgid "image name"
msgstr ""
-#: ../mods/super/admins/images.php:137
+#: ../mods/super/admins/images.php:136
msgid "update imagelist"
msgstr ""
-#: ../mods/super/admins/images.php:140
+#: ../mods/super/admins/images.php:139
msgid ""
"all customers of a admin can only see the images which the admin can see"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_navi.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_navi.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_navi.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,26 +16,26 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/admins/navi.php:27
+#: ../mods/super/admins/navi.php:29
msgid "Admins"
msgstr ""
-#: ../mods/super/admins/navi.php:28
+#: ../mods/super/admins/navi.php:30
msgid "overview"
msgstr ""
-#: ../mods/super/admins/navi.php:29
+#: ../mods/super/admins/navi.php:31
msgid "add admin"
msgstr ""
-#: ../mods/super/admins/navi.php:32
+#: ../mods/super/admins/navi.php:34
msgid "Options"
msgstr ""
-#: ../mods/super/admins/navi.php:35
+#: ../mods/super/admins/navi.php:37
msgid "permissions"
msgstr ""
-#: ../mods/super/admins/navi.php:39
+#: ../mods/super/admins/navi.php:41
msgid "images"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_nodes.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_nodes.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_admins_nodes.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_add.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_add.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_add.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_delete.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_delete.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_delete.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_edit.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_edit.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_edit.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,142 +16,158 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/customers/main.php:47 ../mods/super/customers/main.php:95
+#: ../mods/super/customers/main.php:48 ../mods/super/customers/main.php:127
msgid "customer"
msgstr ""
-#: ../mods/super/customers/main.php:63
+#: ../mods/super/customers/main.php:71
+msgid "send mail to "
+msgstr ""
+
+#: ../mods/super/customers/main.php:71
+msgid "sucessfully !"
+msgstr ""
+
+#: ../mods/super/customers/main.php:91
msgid "send mail to user"
msgstr ""
-#: ../mods/super/customers/main.php:67
+#: ../mods/super/customers/main.php:95
msgid "subject"
msgstr ""
-#: ../mods/super/customers/main.php:70
+#: ../mods/super/customers/main.php:98
msgid "mailtext"
msgstr ""
-#: ../mods/super/customers/main.php:73
+#: ../mods/super/customers/main.php:101
msgid "include signature"
msgstr ""
-#: ../mods/super/customers/main.php:77
+#: ../mods/super/customers/main.php:105
msgid "send_mail"
msgstr ""
-#: ../mods/super/customers/main.php:78
+#: ../mods/super/customers/main.php:106
msgid "please enter text into the marked fields"
msgstr ""
-#: ../mods/super/customers/main.php:82
+#: ../mods/super/customers/main.php:111
msgid "sending mail to"
msgstr ""
-#: ../mods/super/customers/main.php:85
+#: ../mods/super/customers/main.php:117
msgid "ok"
msgstr ""
-#: ../mods/super/customers/main.php:97
+#: ../mods/super/customers/main.php:129
msgid "company"
msgstr ""
-#: ../mods/super/customers/main.php:100 ../mods/super/customers/main.php:182
+#: ../mods/super/customers/main.php:132 ../mods/super/customers/main.php:218
msgid "firstname"
msgstr ""
-#: ../mods/super/customers/main.php:103 ../mods/super/customers/main.php:182
+#: ../mods/super/customers/main.php:135 ../mods/super/customers/main.php:218
msgid "lastname"
msgstr ""
-#: ../mods/super/customers/main.php:106
+#: ../mods/super/customers/main.php:138
msgid "street"
msgstr ""
-#: ../mods/super/customers/main.php:109
+#: ../mods/super/customers/main.php:141
msgid "postcode"
msgstr ""
-#: ../mods/super/customers/main.php:112
+#: ../mods/super/customers/main.php:144
msgid "city"
msgstr ""
-#: ../mods/super/customers/main.php:115
+#: ../mods/super/customers/main.php:147
msgid "phone"
msgstr ""
-#: ../mods/super/customers/main.php:118
+#: ../mods/super/customers/main.php:150
msgid "fax"
msgstr ""
-#: ../mods/super/customers/main.php:121
+#: ../mods/super/customers/main.php:153
msgid "country"
msgstr ""
-#: ../mods/super/customers/main.php:124
+#: ../mods/super/customers/main.php:156
msgid "emailaddress"
msgstr ""
-#: ../mods/super/customers/main.php:128 ../mods/super/customers/main.php:183
+#: ../mods/super/customers/main.php:160 ../mods/super/customers/main.php:219
msgid "vservers"
msgstr ""
-#: ../mods/super/customers/main.php:149
+#: ../mods/super/customers/main.php:181
msgid "mail to user"
msgstr ""
-#: ../mods/super/customers/main.php:165
+#: ../mods/super/customers/main.php:185
+msgid "send new login information"
+msgstr ""
+
+#: ../mods/super/customers/main.php:185
+msgid "Do you really want to reset the password of this customer ?"
+msgstr ""
+
+#: ../mods/super/customers/main.php:201
msgid "disabled useraccount"
msgstr ""
-#: ../mods/super/customers/main.php:166
+#: ../mods/super/customers/main.php:202
msgid "useraccount has been disabled"
msgstr ""
-#: ../mods/super/customers/main.php:172
+#: ../mods/super/customers/main.php:208
msgid "enabled useraccount"
msgstr ""
-#: ../mods/super/customers/main.php:173
+#: ../mods/super/customers/main.php:209
msgid "useraccount has been enabled"
msgstr ""
-#: ../mods/super/customers/main.php:175
+#: ../mods/super/customers/main.php:211
msgid "customer overview"
msgstr ""
-#: ../mods/super/customers/main.php:181
+#: ../mods/super/customers/main.php:217
msgid "loginname"
msgstr ""
-#: ../mods/super/customers/main.php:184
+#: ../mods/super/customers/main.php:220
msgid "admin"
msgstr ""
-#: ../mods/super/customers/main.php:185
+#: ../mods/super/customers/main.php:221
msgid "last login"
msgstr ""
-#: ../mods/super/customers/main.php:193
+#: ../mods/super/customers/main.php:229
msgid "disable"
msgstr ""
-#: ../mods/super/customers/main.php:197
+#: ../mods/super/customers/main.php:233
msgid "enable"
msgstr ""
-#: ../mods/super/customers/main.php:205
+#: ../mods/super/customers/main.php:241
msgid "never"
msgstr ""
-#: ../mods/super/customers/main.php:207
+#: ../mods/super/customers/main.php:243
msgid "show"
msgstr ""
-#: ../mods/super/customers/main.php:209
+#: ../mods/super/customers/main.php:245
msgid "delete"
msgstr ""
-#: ../mods/super/customers/main.php:211
+#: ../mods/super/customers/main.php:247
msgid "edit"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_navi.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_navi.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_navi.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,30 +16,30 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/customers/navi.php:3
+#: ../mods/super/customers/navi.php:6
msgid "Customers"
msgstr ""
-#: ../mods/super/customers/navi.php:4
+#: ../mods/super/customers/navi.php:7
msgid "customer overview"
msgstr ""
-#: ../mods/super/customers/navi.php:5
+#: ../mods/super/customers/navi.php:8
msgid "add customer"
msgstr ""
-#: ../mods/super/customers/navi.php:9
+#: ../mods/super/customers/navi.php:12
msgid "Template"
msgstr ""
-#: ../mods/super/customers/navi.php:10 ../mods/super/customers/navi.php:16
+#: ../mods/super/customers/navi.php:13 ../mods/super/customers/navi.php:19
msgid "overview"
msgstr ""
-#: ../mods/super/customers/navi.php:11
+#: ../mods/super/customers/navi.php:14
msgid "add template"
msgstr ""
-#: ../mods/super/customers/navi.php:17
+#: ../mods/super/customers/navi.php:20
msgid "edit"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_template.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_template.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_customers_template.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_log_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_log_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_log_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/log/main.php:40
+#: ../mods/super/log/main.php:48
msgid "all"
msgstr ""
@@ -32,22 +32,22 @@
msgid "error"
msgstr ""
-#: ../mods/super/log/main.php:59
+#: ../mods/super/log/main.php:65
msgid "type"
msgstr ""
-#: ../mods/super/log/main.php:60
+#: ../mods/super/log/main.php:66
msgid "level"
msgstr ""
-#: ../mods/super/log/main.php:61
+#: ../mods/super/log/main.php:67
msgid "date"
msgstr ""
-#: ../mods/super/log/main.php:62
+#: ../mods/super/log/main.php:68
msgid "user"
msgstr ""
-#: ../mods/super/log/main.php:63
+#: ../mods/super/log/main.php:69
msgid "message"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,180 +16,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/main.php:32
-msgid "Home"
-msgstr ""
-
-#: ../mods/super/main.php:33
-msgid "overview"
-msgstr ""
-
-#: ../mods/super/main.php:34
-msgid "logout"
-msgstr ""
-
-#: ../mods/super/main.php:36
-msgid "quick links"
-msgstr ""
-
-#: ../mods/super/main.php:37
-msgid "add admin"
-msgstr ""
-
-#: ../mods/super/main.php:38
-msgid "add customer"
-msgstr ""
-
-#: ../mods/super/main.php:39
-msgid "add node"
-msgstr ""
-
-#: ../mods/super/main.php:40
-msgid "add vserver"
-msgstr ""
-
-#: ../mods/super/main.php:50
+#: ../mods/super/main.php:44
msgid "Access denied"
msgstr ""
-#: ../mods/super/main.php:51
+#: ../mods/super/main.php:45
msgid "Missing Privilege: "
msgstr ""
-#: ../mods/super/main.php:63
+#: ../mods/super/main.php:52
msgid "welcome"
msgstr ""
-#: ../mods/super/main.php:65 ../mods/super/main.php:144
-#: ../mods/super/main.php:171
+#: ../mods/super/main.php:54
msgid "firstname"
msgstr ""
-#: ../mods/super/main.php:68 ../mods/super/main.php:145
-#: ../mods/super/main.php:172
+#: ../mods/super/main.php:57
msgid "lastname"
msgstr ""
-#: ../mods/super/main.php:71
+#: ../mods/super/main.php:60
msgid "nodes"
msgstr ""
-#: ../mods/super/main.php:79
+#: ../mods/super/main.php:68
msgid "admins"
msgstr ""
-#: ../mods/super/main.php:83
+#: ../mods/super/main.php:72
msgid "users"
msgstr ""
-#: ../mods/super/main.php:87
+#: ../mods/super/main.php:76
msgid "vservers"
msgstr ""
-#: ../mods/super/main.php:94
+#: ../mods/super/main.php:83
msgid "last login fail"
msgstr ""
-#: ../mods/super/main.php:103
+#: ../mods/super/main.php:89
msgid "system"
msgstr ""
-#: ../mods/super/main.php:105
+#: ../mods/super/main.php:91
msgid "openvcp version"
msgstr ""
-#: ../mods/super/main.php:108
+#: ../mods/super/main.php:94
msgid "php tls support"
msgstr ""
-#: ../mods/super/main.php:109
+#: ../mods/super/main.php:95 ../mods/super/main.php:98
msgid "yes"
msgstr ""
-#: ../mods/super/main.php:109
+#: ../mods/super/main.php:95 ../mods/super/main.php:98
msgid "no"
msgstr ""
-#: ../mods/super/main.php:116 ../mods/super/main.php:131
-msgid "search"
+#: ../mods/super/main.php:97
+msgid "php gd support"
msgstr ""
-
-#: ../mods/super/main.php:119 ../mods/super/main.php:173
-msgid "admin"
-msgstr ""
-
-#: ../mods/super/main.php:120 ../mods/super/main.php:230
-msgid "customer"
-msgstr ""
-
-#: ../mods/super/main.php:121 ../mods/super/main.php:229
-msgid "node"
-msgstr ""
-
-#: ../mods/super/main.php:122
-msgid "vserver"
-msgstr ""
-
-#: ../mods/super/main.php:137
-msgid "search results for admins"
-msgstr ""
-
-#: ../mods/super/main.php:142 ../mods/super/main.php:169
-msgid "loginname"
-msgstr ""
-
-#: ../mods/super/main.php:143 ../mods/super/main.php:170
-msgid "company"
-msgstr ""
-
-#: ../mods/super/main.php:156
-msgid "no admins found"
-msgstr ""
-
-#: ../mods/super/main.php:164
-msgid "search results for customers"
-msgstr ""
-
-#: ../mods/super/main.php:186
-msgid "no customers found"
-msgstr ""
-
-#: ../mods/super/main.php:193
-msgid "search results for nodes"
-msgstr ""
-
-#: ../mods/super/main.php:198 ../mods/super/main.php:228
-msgid "name"
-msgstr ""
-
-#: ../mods/super/main.php:199
-msgid "ip"
-msgstr ""
-
-#: ../mods/super/main.php:200 ../mods/super/main.php:231
-msgid "state"
-msgstr ""
-
-#: ../mods/super/main.php:201
-msgid "vserver count"
-msgstr ""
-
-#: ../mods/super/main.php:208 ../mods/super/main.php:239
-msgid "online"
-msgstr ""
-
-#: ../mods/super/main.php:208 ../mods/super/main.php:239
-msgid "offline"
-msgstr ""
-
-#: ../mods/super/main.php:214
-msgid "no nodes found"
-msgstr ""
-
-#: ../mods/super/main.php:223
-msgid "search results for vservers"
-msgstr ""
-
-#: ../mods/super/main.php:243
-msgid "no vservers found"
-msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_add.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_add.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_add.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_control.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_control.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_control.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,42 +20,42 @@
msgid "Control node"
msgstr ""
-#: ../mods/super/nodes/control.php:52
+#: ../mods/super/nodes/control.php:54
msgid "Control node "
msgstr ""
-#: ../mods/super/nodes/control.php:54 ../mods/super/nodes/control.php:74
+#: ../mods/super/nodes/control.php:56 ../mods/super/nodes/control.php:76
msgid "reboot"
msgstr ""
-#: ../mods/super/nodes/control.php:55 ../mods/super/nodes/control.php:74
+#: ../mods/super/nodes/control.php:57 ../mods/super/nodes/control.php:76
msgid "shutdown"
msgstr ""
-#: ../mods/super/nodes/control.php:61
+#: ../mods/super/nodes/control.php:63
msgid "going to "
msgstr ""
-#: ../mods/super/nodes/control.php:64
+#: ../mods/super/nodes/control.php:66
msgid "stopped node"
msgstr ""
-#: ../mods/super/nodes/control.php:64
+#: ../mods/super/nodes/control.php:66
msgid "restarted node"
msgstr ""
-#: ../mods/super/nodes/control.php:74
+#: ../mods/super/nodes/control.php:76
msgid "Are you really sure that you want to "
msgstr ""
-#: ../mods/super/nodes/control.php:74
+#: ../mods/super/nodes/control.php:76
msgid " the node"
msgstr ""
-#: ../mods/super/nodes/control.php:77
+#: ../mods/super/nodes/control.php:79
msgid "cancel"
msgstr ""
-#: ../mods/super/nodes/control.php:78
+#: ../mods/super/nodes/control.php:80
msgid "yes I'm sure'"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_delete.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_delete.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_delete.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_edit.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_edit.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_edit.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,50 +16,50 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/nodes/edit.php:43
+#: ../mods/super/nodes/edit.php:44
msgid "Edit node"
msgstr ""
-#: ../mods/super/nodes/edit.php:49
+#: ../mods/super/nodes/edit.php:50
msgid "edited node"
msgstr ""
-#: ../mods/super/nodes/edit.php:56
+#: ../mods/super/nodes/edit.php:57
msgid "Edit node "
msgstr ""
-#: ../mods/super/nodes/edit.php:60
+#: ../mods/super/nodes/edit.php:61
msgid "nodename"
msgstr ""
-#: ../mods/super/nodes/edit.php:63
+#: ../mods/super/nodes/edit.php:64
msgid "ip"
msgstr ""
-#: ../mods/super/nodes/edit.php:66
+#: ../mods/super/nodes/edit.php:67
msgid "port"
msgstr ""
-#: ../mods/super/nodes/edit.php:69
+#: ../mods/super/nodes/edit.php:70
msgid "username"
msgstr ""
-#: ../mods/super/nodes/edit.php:72
+#: ../mods/super/nodes/edit.php:73
msgid "password"
msgstr ""
-#: ../mods/super/nodes/edit.php:75
+#: ../mods/super/nodes/edit.php:76
msgid "tls"
msgstr ""
-#: ../mods/super/nodes/edit.php:76
+#: ../mods/super/nodes/edit.php:77
msgid "yes"
msgstr ""
-#: ../mods/super/nodes/edit.php:76
+#: ../mods/super/nodes/edit.php:77
msgid "no"
msgstr ""
-#: ../mods/super/nodes/edit.php:77
+#: ../mods/super/nodes/edit.php:78
msgid "submit"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,62 +16,74 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/nodes/main.php:44
+#: ../mods/super/nodes/main.php:44 ../mods/super/nodes/main.php:46
msgid "overview"
msgstr ""
-#: ../mods/super/nodes/main.php:52
+#: ../mods/super/nodes/main.php:51
msgid "node"
msgstr ""
-#: ../mods/super/nodes/main.php:55
+#: ../mods/super/nodes/main.php:54
msgid "IP Adress"
msgstr ""
-#: ../mods/super/nodes/main.php:56
+#: ../mods/super/nodes/main.php:55
msgid "Traffic"
msgstr ""
-#: ../mods/super/nodes/main.php:57
+#: ../mods/super/nodes/main.php:56
msgid "State"
msgstr ""
-#: ../mods/super/nodes/main.php:58
+#: ../mods/super/nodes/main.php:57
msgid "load"
msgstr ""
-#: ../mods/super/nodes/main.php:59
+#: ../mods/super/nodes/main.php:58
msgid "uptime"
msgstr ""
-#: ../mods/super/nodes/main.php:60
-msgid "vserver"
+#: ../mods/super/nodes/main.php:59
+msgid "vservers"
msgstr ""
-#: ../mods/super/nodes/main.php:61
+#: ../mods/super/nodes/main.php:59
+msgid "sum"
+msgstr ""
+
+#: ../mods/super/nodes/main.php:59
+msgid "on"
+msgstr ""
+
+#: ../mods/super/nodes/main.php:59
+msgid "off"
+msgstr ""
+
+#: ../mods/super/nodes/main.php:60
msgid "TLS"
msgstr ""
-#: ../mods/super/nodes/main.php:62
+#: ../mods/super/nodes/main.php:61
msgid "Version"
msgstr ""
-#: ../mods/super/nodes/main.php:85
+#: ../mods/super/nodes/main.php:81
msgid "online"
msgstr ""
-#: ../mods/super/nodes/main.php:92
+#: ../mods/super/nodes/main.php:88
msgid "offline"
msgstr ""
-#: ../mods/super/nodes/main.php:99
-msgid "control"
+#: ../mods/super/nodes/main.php:96
+msgid "details"
msgstr ""
-#: ../mods/super/nodes/main.php:100
+#: ../mods/super/nodes/main.php:98
msgid "edit"
msgstr ""
-#: ../mods/super/nodes/main.php:101
+#: ../mods/super/nodes/main.php:100
msgid "delete"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_navi.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_navi.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_navi.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,42 +16,46 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/nodes/navi.php:25
+#: ../mods/super/nodes/navi.php:28
msgid "Nodes"
msgstr ""
-#: ../mods/super/nodes/navi.php:26
+#: ../mods/super/nodes/navi.php:29
msgid "overview"
msgstr ""
-#: ../mods/super/nodes/navi.php:30
+#: ../mods/super/nodes/navi.php:33
msgid "add node"
msgstr ""
-#: ../mods/super/nodes/navi.php:35
+#: ../mods/super/nodes/navi.php:38
msgid "Node"
msgstr ""
-#: ../mods/super/nodes/navi.php:48
+#: ../mods/super/nodes/navi.php:51
msgid "Node options"
msgstr ""
-#: ../mods/super/nodes/navi.php:49
+#: ../mods/super/nodes/navi.php:52
msgid "manage ip's"
msgstr ""
-#: ../mods/super/nodes/navi.php:50
+#: ../mods/super/nodes/navi.php:53
msgid "add ip's'"
msgstr ""
-#: ../mods/super/nodes/navi.php:51
+#: ../mods/super/nodes/navi.php:54
+msgid "control node"
+msgstr ""
+
+#: ../mods/super/nodes/navi.php:55
msgid "edit node"
msgstr ""
-#: ../mods/super/nodes/navi.php:62
+#: ../mods/super/nodes/navi.php:65
msgid "Misc"
msgstr ""
-#: ../mods/super/nodes/navi.php:63
+#: ../mods/super/nodes/navi.php:66
msgid "update vserver list"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_node.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_node.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_node.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,101 +16,101 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/nodes/node.php:53 ../mods/super/nodes/node.php:66
-#: ../mods/super/nodes/node.php:71 ../mods/super/nodes/node.php:227
+#: ../mods/super/nodes/node.php:53 ../mods/super/nodes/node.php:63
+#: ../mods/super/nodes/node.php:68 ../mods/super/nodes/node.php:229
msgid "node"
msgstr ""
-#: ../mods/super/nodes/node.php:67
+#: ../mods/super/nodes/node.php:64
msgid "overview"
msgstr ""
-#: ../mods/super/nodes/node.php:72 ../mods/super/nodes/node.php:135
+#: ../mods/super/nodes/node.php:69 ../mods/super/nodes/node.php:136
msgid "IP Adress"
msgstr ""
-#: ../mods/super/nodes/node.php:73 ../mods/super/nodes/node.php:74
-#: ../mods/super/nodes/node.php:136 ../mods/super/nodes/node.php:137
+#: ../mods/super/nodes/node.php:70 ../mods/super/nodes/node.php:71
+#: ../mods/super/nodes/node.php:137 ../mods/super/nodes/node.php:138
msgid "traffic [GB]"
msgstr ""
-#: ../mods/super/nodes/node.php:75 ../mods/super/nodes/node.php:138
+#: ../mods/super/nodes/node.php:72 ../mods/super/nodes/node.php:139
msgid "state"
msgstr ""
-#: ../mods/super/nodes/node.php:76 ../mods/super/nodes/node.php:139
+#: ../mods/super/nodes/node.php:73 ../mods/super/nodes/node.php:140
msgid "load"
msgstr ""
-#: ../mods/super/nodes/node.php:77 ../mods/super/nodes/node.php:140
+#: ../mods/super/nodes/node.php:74 ../mods/super/nodes/node.php:141
msgid "uptime"
msgstr ""
-#: ../mods/super/nodes/node.php:84 ../mods/super/nodes/node.php:159
+#: ../mods/super/nodes/node.php:83 ../mods/super/nodes/node.php:162
msgid "online"
msgstr ""
-#: ../mods/super/nodes/node.php:90
+#: ../mods/super/nodes/node.php:91
msgid "memory"
msgstr ""
-#: ../mods/super/nodes/node.php:95
+#: ../mods/super/nodes/node.php:96
msgid "memory total"
msgstr ""
-#: ../mods/super/nodes/node.php:97
+#: ../mods/super/nodes/node.php:98
msgid "memory used"
msgstr ""
-#: ../mods/super/nodes/node.php:99
+#: ../mods/super/nodes/node.php:100
msgid "memory free"
msgstr ""
-#: ../mods/super/nodes/node.php:101
+#: ../mods/super/nodes/node.php:102
msgid "buffered"
msgstr ""
-#: ../mods/super/nodes/node.php:104
+#: ../mods/super/nodes/node.php:105
msgid "swap total"
msgstr ""
-#: ../mods/super/nodes/node.php:106
+#: ../mods/super/nodes/node.php:107
msgid "swap used"
msgstr ""
-#: ../mods/super/nodes/node.php:108
+#: ../mods/super/nodes/node.php:109
msgid "swap free"
msgstr ""
-#: ../mods/super/nodes/node.php:110
+#: ../mods/super/nodes/node.php:111
msgid "cached"
msgstr ""
-#: ../mods/super/nodes/node.php:116
+#: ../mods/super/nodes/node.php:117
msgid "space on /vservers"
msgstr ""
-#: ../mods/super/nodes/node.php:119
+#: ../mods/super/nodes/node.php:120
msgid "space total"
msgstr ""
-#: ../mods/super/nodes/node.php:121
+#: ../mods/super/nodes/node.php:122
msgid "space used"
msgstr ""
-#: ../mods/super/nodes/node.php:123
+#: ../mods/super/nodes/node.php:124
msgid "space free"
msgstr ""
-#: ../mods/super/nodes/node.php:128 ../mods/super/nodes/node.php:226
+#: ../mods/super/nodes/node.php:129 ../mods/super/nodes/node.php:228
msgid "vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:133
+#: ../mods/super/nodes/node.php:134
msgid "active"
msgstr ""
-#: ../mods/super/nodes/node.php:134
+#: ../mods/super/nodes/node.php:135
msgid "name"
msgstr ""
@@ -122,215 +122,215 @@
msgid "enabled"
msgstr ""
-#: ../mods/super/nodes/node.php:159
+#: ../mods/super/nodes/node.php:162
msgid "offline"
msgstr ""
-#: ../mods/super/nodes/node.php:166
+#: ../mods/super/nodes/node.php:168
msgid "start"
msgstr ""
-#: ../mods/super/nodes/node.php:167
+#: ../mods/super/nodes/node.php:169
msgid "restart"
msgstr ""
-#: ../mods/super/nodes/node.php:168
+#: ../mods/super/nodes/node.php:170
msgid "stop"
msgstr ""
-#: ../mods/super/nodes/node.php:169 ../mods/super/nodes/node.php:247
-#: ../mods/super/nodes/node.php:521
+#: ../mods/super/nodes/node.php:171 ../mods/super/nodes/node.php:249
+#: ../mods/super/nodes/node.php:523
msgid "delete"
msgstr ""
-#: ../mods/super/nodes/node.php:177
+#: ../mods/super/nodes/node.php:179
msgid "Update reservation"
msgstr ""
-#: ../mods/super/nodes/node.php:182
+#: ../mods/super/nodes/node.php:184
msgid "reservations successfully updated"
msgstr ""
-#: ../mods/super/nodes/node.php:187
+#: ../mods/super/nodes/node.php:189
msgid "Delete network"
msgstr ""
-#: ../mods/super/nodes/node.php:194
+#: ../mods/super/nodes/node.php:196
msgid "ip's successfully deleted"
msgstr ""
-#: ../mods/super/nodes/node.php:199 ../mods/super/nodes/node.php:373
+#: ../mods/super/nodes/node.php:201 ../mods/super/nodes/node.php:375
msgid "Update network"
msgstr ""
-#: ../mods/super/nodes/node.php:206 ../mods/super/nodes/node.php:380
+#: ../mods/super/nodes/node.php:208 ../mods/super/nodes/node.php:382
msgid "ip's successfully updated'"
msgstr ""
-#: ../mods/super/nodes/node.php:211
+#: ../mods/super/nodes/node.php:213
msgid "Network overview"
msgstr ""
-#: ../mods/super/nodes/node.php:225
+#: ../mods/super/nodes/node.php:227
msgid "ip"
msgstr ""
-#: ../mods/super/nodes/node.php:228
+#: ../mods/super/nodes/node.php:230
msgid "used"
msgstr ""
-#: ../mods/super/nodes/node.php:229 ../mods/super/nodes/node.php:402
+#: ../mods/super/nodes/node.php:231 ../mods/super/nodes/node.php:404
msgid "netmask"
msgstr ""
-#: ../mods/super/nodes/node.php:230 ../mods/super/nodes/node.php:405
+#: ../mods/super/nodes/node.php:232 ../mods/super/nodes/node.php:407
msgid "broadcast"
msgstr ""
-#: ../mods/super/nodes/node.php:231
+#: ../mods/super/nodes/node.php:233
msgid "reservation"
msgstr ""
-#: ../mods/super/nodes/node.php:246
+#: ../mods/super/nodes/node.php:248
msgid "update reservation"
msgstr ""
-#: ../mods/super/nodes/node.php:248
+#: ../mods/super/nodes/node.php:250
msgid "set unsed"
msgstr ""
-#: ../mods/super/nodes/node.php:249
+#: ../mods/super/nodes/node.php:251
msgid "select all"
msgstr ""
-#: ../mods/super/nodes/node.php:249
+#: ../mods/super/nodes/node.php:251
msgid "deselect all"
msgstr ""
-#: ../mods/super/nodes/node.php:256 ../mods/super/nodes/node.php:382
+#: ../mods/super/nodes/node.php:258 ../mods/super/nodes/node.php:384
msgid "Add network"
msgstr ""
-#: ../mods/super/nodes/node.php:306
+#: ../mods/super/nodes/node.php:308
msgid "ip's or netmask invalid"
msgstr ""
-#: ../mods/super/nodes/node.php:360
+#: ../mods/super/nodes/node.php:362
msgid "not a valid ipv6 adress"
msgstr ""
-#: ../mods/super/nodes/node.php:366
+#: ../mods/super/nodes/node.php:368
msgid "ip's successfully inserted"
msgstr ""
-#: ../mods/super/nodes/node.php:384
+#: ../mods/super/nodes/node.php:386
msgid "check your ip's! startip must be smaller then endip'"
msgstr ""
-#: ../mods/super/nodes/node.php:387
+#: ../mods/super/nodes/node.php:389
msgid "check your broadcast! Broadcast doens't matching expected broadcast:"
msgstr ""
-#: ../mods/super/nodes/node.php:388
+#: ../mods/super/nodes/node.php:390
msgid "got"
msgstr ""
-#: ../mods/super/nodes/node.php:388
+#: ../mods/super/nodes/node.php:390
msgid "expected"
msgstr ""
-#: ../mods/super/nodes/node.php:396
+#: ../mods/super/nodes/node.php:398
msgid "startip"
msgstr ""
-#: ../mods/super/nodes/node.php:399
+#: ../mods/super/nodes/node.php:401
msgid "endip"
msgstr ""
-#: ../mods/super/nodes/node.php:408
+#: ../mods/super/nodes/node.php:410
msgid "add ip"
msgstr ""
-#: ../mods/super/nodes/node.php:415 ../mods/super/nodes/node.php:498
+#: ../mods/super/nodes/node.php:417 ../mods/super/nodes/node.php:500
msgid "Delete vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:418
+#: ../mods/super/nodes/node.php:420
msgid "Shall i delete following vservers?"
msgstr ""
-#: ../mods/super/nodes/node.php:422
+#: ../mods/super/nodes/node.php:424
msgid "Performing actions"
msgstr ""
-#: ../mods/super/nodes/node.php:431
+#: ../mods/super/nodes/node.php:433
msgid "Start vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:434
+#: ../mods/super/nodes/node.php:436
msgid "starting"
msgstr ""
-#: ../mods/super/nodes/node.php:438 ../mods/super/nodes/node.php:460
-#: ../mods/super/nodes/node.php:483 ../mods/super/nodes/node.php:515
-#: ../mods/super/nodes/node.php:524
+#: ../mods/super/nodes/node.php:440 ../mods/super/nodes/node.php:462
+#: ../mods/super/nodes/node.php:485 ../mods/super/nodes/node.php:517
+#: ../mods/super/nodes/node.php:526
msgid "ok"
msgstr ""
-#: ../mods/super/nodes/node.php:438 ../mods/super/nodes/node.php:460
-#: ../mods/super/nodes/node.php:483 ../mods/super/nodes/node.php:491
-#: ../mods/super/nodes/node.php:515 ../mods/super/nodes/node.php:524
+#: ../mods/super/nodes/node.php:440 ../mods/super/nodes/node.php:462
+#: ../mods/super/nodes/node.php:485 ../mods/super/nodes/node.php:493
+#: ../mods/super/nodes/node.php:517 ../mods/super/nodes/node.php:526
msgid "failed"
msgstr ""
-#: ../mods/super/nodes/node.php:441
+#: ../mods/super/nodes/node.php:443
msgid "started vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:446
+#: ../mods/super/nodes/node.php:448
msgid "already started"
msgstr ""
-#: ../mods/super/nodes/node.php:453
+#: ../mods/super/nodes/node.php:455
msgid "Stop vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:456 ../mods/super/nodes/node.php:510
+#: ../mods/super/nodes/node.php:458 ../mods/super/nodes/node.php:512
msgid "stopping"
msgstr ""
-#: ../mods/super/nodes/node.php:463
+#: ../mods/super/nodes/node.php:465
msgid "stopped vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:468
+#: ../mods/super/nodes/node.php:470
msgid "already stopped"
msgstr ""
-#: ../mods/super/nodes/node.php:475
+#: ../mods/super/nodes/node.php:477
msgid "Restart vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:478
+#: ../mods/super/nodes/node.php:480
msgid "restarting"
msgstr ""
-#: ../mods/super/nodes/node.php:486
+#: ../mods/super/nodes/node.php:488
msgid "restarted vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:490
+#: ../mods/super/nodes/node.php:492
msgid "not started"
msgstr ""
-#: ../mods/super/nodes/node.php:527
+#: ../mods/super/nodes/node.php:529
msgid "deleted vserver"
msgstr ""
-#: ../mods/super/nodes/node.php:543
+#: ../mods/super/nodes/node.php:545
msgid "yes"
msgstr ""
-#: ../mods/super/nodes/node.php:546
+#: ../mods/super/nodes/node.php:548
msgid "all actions done"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_update.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_update.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_nodes_update.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_mail.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_mail.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_mail.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,66 +16,73 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/settings/main.php:47 ../mods/super/settings/main.php:113
-#: ../mods/super/settings/main.php:199
+#: ../mods/super/settings/main.php:47 ../mods/super/settings/main.php:112
+#: ../mods/super/settings/main.php:197
msgid "settings have been updated"
msgstr ""
-#: ../mods/super/settings/main.php:54 ../mods/super/settings/main.php:119
-#: ../mods/super/settings/main.php:207
-msgid "name"
+#: ../mods/super/settings/main.php:54
+msgid "global"
msgstr ""
-#: ../mods/super/settings/main.php:55 ../mods/super/settings/main.php:120
-#: ../mods/super/settings/main.php:208
-msgid "value"
+#: ../mods/super/settings/main.php:54 ../mods/super/settings/main.php:118
+#: ../mods/super/settings/main.php:205
+msgid "settings"
msgstr ""
-#: ../mods/super/settings/main.php:102 ../mods/super/settings/main.php:164
-#: ../mods/super/settings/main.php:255 ../mods/super/settings/main.php:287
+#: ../mods/super/settings/main.php:101 ../mods/super/settings/main.php:162
+#: ../mods/super/settings/main.php:252 ../mods/super/settings/main.php:284
msgid "save"
msgstr ""
-#: ../mods/super/settings/main.php:167
+#: ../mods/super/settings/main.php:118
+msgid "of"
+msgstr ""
+
+#: ../mods/super/settings/main.php:165
msgid "admin"
msgstr ""
-#: ../mods/super/settings/main.php:167
+#: ../mods/super/settings/main.php:165
msgid "has no own settings"
msgstr ""
-#: ../mods/super/settings/main.php:179
+#: ../mods/super/settings/main.php:177
msgid "settings have been deleted"
msgstr ""
-#: ../mods/super/settings/main.php:264
+#: ../mods/super/settings/main.php:205
+msgid "own"
+msgstr ""
+
+#: ../mods/super/settings/main.php:261
msgid "password has been changed"
msgstr ""
-#: ../mods/super/settings/main.php:268
+#: ../mods/super/settings/main.php:265
msgid "password's do not match"
msgstr ""
-#: ../mods/super/settings/main.php:269
+#: ../mods/super/settings/main.php:266
msgid "plaese try again"
msgstr ""
-#: ../mods/super/settings/main.php:276
+#: ../mods/super/settings/main.php:273
msgid "change your password"
msgstr ""
-#: ../mods/super/settings/main.php:278
+#: ../mods/super/settings/main.php:275
msgid "new password"
msgstr ""
-#: ../mods/super/settings/main.php:281
+#: ../mods/super/settings/main.php:278
msgid "retype password"
msgstr ""
-#: ../mods/super/settings/main.php:284
+#: ../mods/super/settings/main.php:281
msgid "old password"
msgstr ""
-#: ../mods/super/settings/main.php:286
+#: ../mods/super/settings/main.php:283
msgid "reset"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_navi.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_navi.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_settings_navi.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,38 +16,38 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/settings/navi.php:25
-msgid "settings"
+#: ../mods/super/settings/navi.php:27
+msgid "preferences"
msgstr ""
-#: ../mods/super/settings/navi.php:29
+#: ../mods/super/settings/navi.php:31
msgid "global"
msgstr ""
-#: ../mods/super/settings/navi.php:30 ../mods/super/settings/navi.php:45
+#: ../mods/super/settings/navi.php:32 ../mods/super/settings/navi.php:36
msgid "view"
msgstr ""
-#: ../mods/super/settings/navi.php:36
-msgid "other's"
+#: ../mods/super/settings/navi.php:35
+msgid "own"
msgstr ""
-#: ../mods/super/settings/navi.php:40
-msgid "edit"
+#: ../mods/super/settings/navi.php:37
+msgid "change password"
msgstr ""
-#: ../mods/super/settings/navi.php:44
-msgid "own"
+#: ../mods/super/settings/navi.php:42
+msgid "other's"
msgstr ""
-#: ../mods/super/settings/navi.php:46
-msgid "change password"
+#: ../mods/super/settings/navi.php:47
+msgid "edit"
msgstr ""
-#: ../mods/super/settings/navi.php:49 ../mods/super/settings/navi.php:50
+#: ../mods/super/settings/navi.php:52 ../mods/super/settings/navi.php:53
msgid "mail templates"
msgstr ""
-#: ../mods/super/settings/navi.php:51
+#: ../mods/super/settings/navi.php:54
msgid "add template"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_add.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_add.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_add.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,325 +50,313 @@
"node"
msgstr ""
-#: ../mods/super/vservers/add.php:233
+#: ../mods/super/vservers/add.php:236
msgid "you have to add at least one ip"
msgstr ""
-#: ../mods/super/vservers/add.php:237
+#: ../mods/super/vservers/add.php:240
msgid "you have to select a os"
msgstr ""
-#: ../mods/super/vservers/add.php:250 ../mods/super/vservers/add.php:972
+#: ../mods/super/vservers/add.php:253 ../mods/super/vservers/add.php:843
msgid "no template"
msgstr ""
-#: ../mods/super/vservers/add.php:287
+#: ../mods/super/vservers/add.php:290
msgid "base setup"
msgstr ""
-#: ../mods/super/vservers/add.php:294 ../mods/super/vservers/add.php:332
-#: ../mods/super/vservers/add.php:344 ../mods/super/vservers/add.php:414
-#: ../mods/super/vservers/add.php:427 ../mods/super/vservers/add.php:444
-#: ../mods/super/vservers/add.php:463
+#: ../mods/super/vservers/add.php:296 ../mods/super/vservers/add.php:311
+#: ../mods/super/vservers/add.php:320 ../mods/super/vservers/add.php:367
+#: ../mods/super/vservers/add.php:376 ../mods/super/vservers/add.php:386
+#: ../mods/super/vservers/add.php:404
msgid "ok"
msgstr ""
-#: ../mods/super/vservers/add.php:314
+#: ../mods/super/vservers/add.php:301
msgid "add ips"
msgstr ""
-#: ../mods/super/vservers/add.php:337
+#: ../mods/super/vservers/add.php:316
msgid "set hostname"
msgstr ""
-#: ../mods/super/vservers/add.php:349
+#: ../mods/super/vservers/add.php:325
msgid "set limits"
msgstr ""
-#: ../mods/super/vservers/add.php:419
+#: ../mods/super/vservers/add.php:372
msgid "installing image"
msgstr ""
-#: ../mods/super/vservers/add.php:432
+#: ../mods/super/vservers/add.php:381
msgid "starting vserver"
msgstr ""
-#: ../mods/super/vservers/add.php:444
+#: ../mods/super/vservers/add.php:386 ../mods/super/vservers/add.php:404
msgid "failed"
msgstr ""
-#: ../mods/super/vservers/add.php:452
+#: ../mods/super/vservers/add.php:388
+msgid "output"
+msgstr ""
+
+#: ../mods/super/vservers/add.php:396
msgid "setting root password"
msgstr ""
-#: ../mods/super/vservers/add.php:467
+#: ../mods/super/vservers/add.php:409
msgid "all actions performed"
msgstr ""
-#: ../mods/super/vservers/add.php:469
+#: ../mods/super/vservers/add.php:411
msgid "User account"
msgstr ""
-#: ../mods/super/vservers/add.php:470
+#: ../mods/super/vservers/add.php:412
msgid "User password"
msgstr ""
-#: ../mods/super/vservers/add.php:471
+#: ../mods/super/vservers/add.php:413
msgid "Root password"
msgstr ""
-#: ../mods/super/vservers/add.php:481
+#: ../mods/super/vservers/add.php:424
msgid "send mail to user"
msgstr ""
-#: ../mods/super/vservers/add.php:518
+#: ../mods/super/vservers/add.php:461
msgid "mail successfully send"
msgstr ""
-#: ../mods/super/vservers/add.php:530
+#: ../mods/super/vservers/add.php:473
msgid "use exsting user"
msgstr ""
-#: ../mods/super/vservers/add.php:532
+#: ../mods/super/vservers/add.php:475
msgid "user"
msgstr ""
-#: ../mods/super/vservers/add.php:533
+#: ../mods/super/vservers/add.php:476
msgid "create new user"
msgstr ""
-#: ../mods/super/vservers/add.php:535
+#: ../mods/super/vservers/add.php:478
msgid "or create new user"
msgstr ""
-#: ../mods/super/vservers/add.php:537
+#: ../mods/super/vservers/add.php:480
msgid "loginname"
msgstr ""
-#: ../mods/super/vservers/add.php:540
+#: ../mods/super/vservers/add.php:483
msgid "password"
msgstr ""
-#: ../mods/super/vservers/add.php:543
+#: ../mods/super/vservers/add.php:486
msgid "emailaddress"
msgstr ""
-#: ../mods/super/vservers/add.php:546
+#: ../mods/super/vservers/add.php:489
msgid "company"
msgstr ""
-#: ../mods/super/vservers/add.php:549
+#: ../mods/super/vservers/add.php:492
msgid "firstname"
msgstr ""
-#: ../mods/super/vservers/add.php:552
+#: ../mods/super/vservers/add.php:495
msgid "lastname"
msgstr ""
-#: ../mods/super/vservers/add.php:555
+#: ../mods/super/vservers/add.php:498
msgid "street"
msgstr ""
-#: ../mods/super/vservers/add.php:558
+#: ../mods/super/vservers/add.php:501
msgid "postcode"
msgstr ""
-#: ../mods/super/vservers/add.php:561
+#: ../mods/super/vservers/add.php:504
msgid "city"
msgstr ""
-#: ../mods/super/vservers/add.php:564
+#: ../mods/super/vservers/add.php:507
msgid "phone"
msgstr ""
-#: ../mods/super/vservers/add.php:567
+#: ../mods/super/vservers/add.php:510
msgid "fax"
msgstr ""
-#: ../mods/super/vservers/add.php:570
+#: ../mods/super/vservers/add.php:513
msgid "country"
msgstr ""
-#: ../mods/super/vservers/add.php:573
+#: ../mods/super/vservers/add.php:516
msgid "permission template"
msgstr ""
-#: ../mods/super/vservers/add.php:576
+#: ../mods/super/vservers/add.php:519
msgid "admin"
msgstr ""
-#: ../mods/super/vservers/add.php:582
+#: ../mods/super/vservers/add.php:525
msgid " reset "
msgstr ""
-#: ../mods/super/vservers/add.php:583
+#: ../mods/super/vservers/add.php:526
msgid "next step"
msgstr ""
-#: ../mods/super/vservers/add.php:584
+#: ../mods/super/vservers/add.php:527
msgid "Leave blank for autogeneration"
msgstr ""
-#: ../mods/super/vservers/add.php:585
+#: ../mods/super/vservers/add.php:528
msgid "Field's marked with * are necessary fields!"
msgstr ""
-#: ../mods/super/vservers/add.php:586
+#: ../mods/super/vservers/add.php:529
msgid "You can use either company or fistname and lastname!"
msgstr ""
-#: ../mods/super/vservers/add.php:591
+#: ../mods/super/vservers/add.php:534
msgid "create new vserver for user"
msgstr ""
-#: ../mods/super/vservers/add.php:617
+#: ../mods/super/vservers/add.php:562
msgid "basic settings"
msgstr ""
-#: ../mods/super/vservers/add.php:620
+#: ../mods/super/vservers/add.php:565
msgid "node"
msgstr ""
-#: ../mods/super/vservers/add.php:642
+#: ../mods/super/vservers/add.php:587
msgid "name"
msgstr ""
-#: ../mods/super/vservers/add.php:655
+#: ../mods/super/vservers/add.php:600
msgid "hostname"
msgstr ""
-#: ../mods/super/vservers/add.php:673
+#: ../mods/super/vservers/add.php:619
msgid "operationsystem"
msgstr ""
-#: ../mods/super/vservers/add.php:676
+#: ../mods/super/vservers/add.php:622
msgid "operating system"
msgstr ""
-#: ../mods/super/vservers/add.php:712
+#: ../mods/super/vservers/add.php:651
msgid "ip's"
msgstr ""
-#: ../mods/super/vservers/add.php:716
+#: ../mods/super/vservers/add.php:655
msgid "device"
msgstr ""
-#: ../mods/super/vservers/add.php:717
+#: ../mods/super/vservers/add.php:656
msgid "alias"
msgstr ""
-#: ../mods/super/vservers/add.php:718
+#: ../mods/super/vservers/add.php:657
msgid "ip"
msgstr ""
-#: ../mods/super/vservers/add.php:719
+#: ../mods/super/vservers/add.php:658
msgid "netmask"
msgstr ""
-#: ../mods/super/vservers/add.php:720
+#: ../mods/super/vservers/add.php:659
msgid "broadcast"
msgstr ""
-#: ../mods/super/vservers/add.php:755
+#: ../mods/super/vservers/add.php:694
msgid "delete ip"
msgstr ""
-#: ../mods/super/vservers/add.php:784
+#: ../mods/super/vservers/add.php:724
msgid "ip address"
msgstr ""
-#: ../mods/super/vservers/add.php:788
+#: ../mods/super/vservers/add.php:728
msgid "add ip"
msgstr ""
-#: ../mods/super/vservers/add.php:796
+#: ../mods/super/vservers/add.php:736
msgid "flags"
msgstr ""
-#: ../mods/super/vservers/add.php:809
+#: ../mods/super/vservers/add.php:749
msgid "no"
msgstr ""
-#: ../mods/super/vservers/add.php:809
+#: ../mods/super/vservers/add.php:749
msgid "yes"
msgstr ""
-#: ../mods/super/vservers/add.php:814
+#: ../mods/super/vservers/add.php:754
msgid "scheduling"
msgstr ""
-#: ../mods/super/vservers/add.php:817
+#: ../mods/super/vservers/add.php:757
msgid "cpu time limit"
msgstr ""
-#: ../mods/super/vservers/add.php:829
+#: ../mods/super/vservers/add.php:769
msgid "space"
msgstr ""
-#: ../mods/super/vservers/add.php:833
+#: ../mods/super/vservers/add.php:773
msgid "space total"
msgstr ""
-#: ../mods/super/vservers/add.php:834
+#: ../mods/super/vservers/add.php:774
msgid "inodes total"
msgstr ""
-#: ../mods/super/vservers/add.php:835
+#: ../mods/super/vservers/add.php:775
msgid "reserved total"
msgstr ""
-#: ../mods/super/vservers/add.php:854
+#: ../mods/super/vservers/add.php:794
msgid "ressource limits"
msgstr ""
-#: ../mods/super/vservers/add.php:858
+#: ../mods/super/vservers/add.php:798
msgid "limit"
msgstr ""
-#: ../mods/super/vservers/add.php:859
+#: ../mods/super/vservers/add.php:799
msgid "minimum"
msgstr ""
-#: ../mods/super/vservers/add.php:860
+#: ../mods/super/vservers/add.php:800
msgid "soft"
msgstr ""
-#: ../mods/super/vservers/add.php:861
+#: ../mods/super/vservers/add.php:801
msgid "hard"
msgstr ""
-#: ../mods/super/vservers/add.php:863
-msgid "rss"
+#: ../mods/super/vservers/add.php:826
+msgid "Backuplimit"
msgstr ""
-#: ../mods/super/vservers/add.php:880
-msgid "nproc"
+#: ../mods/super/vservers/add.php:829
+msgid "current backup limit"
msgstr ""
-#: ../mods/super/vservers/add.php:897
-msgid "nofile"
-msgstr ""
-
-#: ../mods/super/vservers/add.php:914
-msgid "memlock"
-msgstr ""
-
-#: ../mods/super/vservers/add.php:931
-msgid "as"
-msgstr ""
-
-#: ../mods/super/vservers/add.php:948
-msgid "locks"
-msgstr ""
-
-#: ../mods/super/vservers/add.php:968 ../mods/super/vservers/add.php:971
+#: ../mods/super/vservers/add.php:839 ../mods/super/vservers/add.php:842
msgid "templates"
msgstr ""
-#: ../mods/super/vservers/add.php:979
+#: ../mods/super/vservers/add.php:850
msgid "create new vServer"
msgstr ""
-#: ../mods/super/vservers/add.php:983
+#: ../mods/super/vservers/add.php:854
msgid "next"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_bandwidth.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_bandwidth.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_bandwidth.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,34 +16,34 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/bandwidth.php:48
+#: ../mods/super/vservers/bandwidth.php:47
msgid "bandwidth"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:54
+#: ../mods/super/vservers/bandwidth.php:53
msgid "Direction"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:57
+#: ../mods/super/vservers/bandwidth.php:56
msgid "Rate"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:59
+#: ../mods/super/vservers/bandwidth.php:58
msgid "add"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:69
+#: ../mods/super/vservers/bandwidth.php:68
msgid "please note: bandwidth limits are deleted on the node once a hour"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:76
+#: ../mods/super/vservers/bandwidth.php:75
msgid "direction"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:77
+#: ../mods/super/vservers/bandwidth.php:76
msgid "rate"
msgstr ""
-#: ../mods/super/vservers/bandwidth.php:86
+#: ../mods/super/vservers/bandwidth.php:85
msgid "delete"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_control.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_control.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_control.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,77 +16,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/control.php:46
+#: ../mods/super/vservers/control.php:45
msgid "Stop vserver"
msgstr ""
-#: ../mods/super/vservers/control.php:49
-#: ../mods/super/vservers/control.php:103
+#: ../mods/super/vservers/control.php:48
+#: ../mods/super/vservers/control.php:102
msgid "stopping"
msgstr ""
-#: ../mods/super/vservers/control.php:54 ../mods/super/vservers/control.php:81
-#: ../mods/super/vservers/control.php:107
-#: ../mods/super/vservers/control.php:121
+#: ../mods/super/vservers/control.php:53 ../mods/super/vservers/control.php:80
+#: ../mods/super/vservers/control.php:106
+#: ../mods/super/vservers/control.php:120
msgid "ok"
msgstr ""
-#: ../mods/super/vservers/control.php:54 ../mods/super/vservers/control.php:81
-#: ../mods/super/vservers/control.php:121
+#: ../mods/super/vservers/control.php:53 ../mods/super/vservers/control.php:80
+#: ../mods/super/vservers/control.php:120
msgid "failed"
msgstr ""
-#: ../mods/super/vservers/control.php:55 ../mods/super/vservers/control.php:82
-#: ../mods/super/vservers/control.php:108
-#: ../mods/super/vservers/control.php:122
+#: ../mods/super/vservers/control.php:54 ../mods/super/vservers/control.php:81
+#: ../mods/super/vservers/control.php:107
+#: ../mods/super/vservers/control.php:121
msgid "output"
msgstr ""
-#: ../mods/super/vservers/control.php:66
+#: ../mods/super/vservers/control.php:65
msgid "already stopped"
msgstr ""
-#: ../mods/super/vservers/control.php:73
+#: ../mods/super/vservers/control.php:72
msgid "Start vserver"
msgstr ""
-#: ../mods/super/vservers/control.php:76
-#: ../mods/super/vservers/control.php:115
+#: ../mods/super/vservers/control.php:75
+#: ../mods/super/vservers/control.php:114
msgid "starting"
msgstr ""
-#: ../mods/super/vservers/control.php:93
+#: ../mods/super/vservers/control.php:92
msgid "already started"
msgstr ""
-#: ../mods/super/vservers/control.php:100
+#: ../mods/super/vservers/control.php:99
msgid "Restart vserver"
msgstr ""
-#: ../mods/super/vservers/control.php:133
+#: ../mods/super/vservers/control.php:132
msgid "not started"
msgstr ""
-#: ../mods/super/vservers/control.php:140
+#: ../mods/super/vservers/control.php:139
msgid "Options of vserver"
msgstr ""
-#: ../mods/super/vservers/control.php:146
+#: ../mods/super/vservers/control.php:145
msgid "vserver is online"
msgstr ""
-#: ../mods/super/vservers/control.php:147
+#: ../mods/super/vservers/control.php:146
msgid "stop"
msgstr ""
-#: ../mods/super/vservers/control.php:148
+#: ../mods/super/vservers/control.php:147
msgid "restart"
msgstr ""
-#: ../mods/super/vservers/control.php:152
+#: ../mods/super/vservers/control.php:151
msgid "vserver is offline"
msgstr ""
-#: ../mods/super/vservers/control.php:153
+#: ../mods/super/vservers/control.php:152
msgid "start"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_flags.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_flags.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_flags.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,36 +16,36 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/flags.php:42
+#: ../mods/super/vservers/flags.php:41
msgid "Options of vserver"
msgstr ""
-#: ../mods/super/vservers/flags.php:58
+#: ../mods/super/vservers/flags.php:57
msgid ""
"Flags succesfully set. Make sure to restart the vserver before the changes "
"take affect."
msgstr ""
-#: ../mods/super/vservers/flags.php:61
+#: ../mods/super/vservers/flags.php:60
msgid "flags"
msgstr ""
-#: ../mods/super/vservers/flags.php:62
+#: ../mods/super/vservers/flags.php:61
msgid "edit flags"
msgstr ""
-#: ../mods/super/vservers/flags.php:69
+#: ../mods/super/vservers/flags.php:68
msgid "autostart"
msgstr ""
-#: ../mods/super/vservers/flags.php:70 ../mods/super/vservers/flags.php:77
+#: ../mods/super/vservers/flags.php:69 ../mods/super/vservers/flags.php:76
msgid "no"
msgstr ""
-#: ../mods/super/vservers/flags.php:70 ../mods/super/vservers/flags.php:77
+#: ../mods/super/vservers/flags.php:69 ../mods/super/vservers/flags.php:76
msgid "yes"
msgstr ""
-#: ../mods/super/vservers/flags.php:79
+#: ../mods/super/vservers/flags.php:78
msgid "save"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_graph.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_graph.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_graph.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,14 +16,14 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/graph.php:228
+#: ../mods/super/vservers/graph.php:227
msgid "incoming"
msgstr ""
-#: ../mods/super/vservers/graph.php:229
+#: ../mods/super/vservers/graph.php:228
msgid "outgoing"
msgstr ""
-#: ../mods/super/vservers/graph.php:230
+#: ../mods/super/vservers/graph.php:229
msgid "total"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_info.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_info.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_info.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,46 +16,86 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/info.php:49
+#: ../mods/super/vservers/info.php:53
msgid "update successfully"
msgstr ""
-#: ../mods/super/vservers/info.php:57
+#: ../mods/super/vservers/info.php:64
msgid "vservername"
msgstr ""
-#: ../mods/super/vservers/info.php:60
+#: ../mods/super/vservers/info.php:67
msgid "customername"
msgstr ""
-#: ../mods/super/vservers/info.php:63
+#: ../mods/super/vservers/info.php:70
msgid "node"
msgstr ""
-#: ../mods/super/vservers/info.php:66
+#: ../mods/super/vservers/info.php:73
msgid "adminname"
msgstr ""
-#: ../mods/super/vservers/info.php:70
+#: ../mods/super/vservers/info.php:76
msgid "hostname"
msgstr ""
-#: ../mods/super/vservers/info.php:75
+#: ../mods/super/vservers/info.php:80
+msgid "enabled"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:81
+msgid "yes"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:81
+msgid "no"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:85
msgid "state"
msgstr ""
-#: ../mods/super/vservers/info.php:79
+#: ../mods/super/vservers/info.php:89
msgid "online"
msgstr ""
-#: ../mods/super/vservers/info.php:81
+#: ../mods/super/vservers/info.php:91
msgid "offline"
msgstr ""
-#: ../mods/super/vservers/info.php:84
+#: ../mods/super/vservers/info.php:94
+msgid "lock state"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:97
+msgid "image setup"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:99
+msgid "set rescue"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:101
+msgid "create backup"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:103
+msgid "restore backup"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:105
+msgid "no lock on vserver"
+msgstr ""
+
+#: ../mods/super/vservers/info.php:109
msgid "load"
msgstr ""
-#: ../mods/super/vservers/info.php:88
+#: ../mods/super/vservers/info.php:112
msgid "submit"
msgstr ""
+
+#: ../mods/super/vservers/info.php:113
+msgid "remove lock"
+msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_ips.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_ips.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_ips.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,66 +16,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/ips.php:43
+#: ../mods/super/vservers/ips.php:44
msgid "Options of vserver"
msgstr ""
-#: ../mods/super/vservers/ips.php:85
+#: ../mods/super/vservers/ips.php:98
msgid ""
"ip successfully added. Make sure to restart the vserver before the changes "
"take affect."
msgstr ""
-#: ../mods/super/vservers/ips.php:96
+#: ../mods/super/vservers/ips.php:109
msgid ""
"ip successfully deleted. Make sure to restart the vserver before the changes "
"take affect."
msgstr ""
-#: ../mods/super/vservers/ips.php:99
+#: ../mods/super/vservers/ips.php:112
msgid "manage ip's"
msgstr ""
-#: ../mods/super/vservers/ips.php:100
+#: ../mods/super/vservers/ips.php:113
msgid "ip overview"
msgstr ""
-#: ../mods/super/vservers/ips.php:105
+#: ../mods/super/vservers/ips.php:118
msgid "device"
msgstr ""
-#: ../mods/super/vservers/ips.php:106
+#: ../mods/super/vservers/ips.php:119
msgid "alias"
msgstr ""
-#: ../mods/super/vservers/ips.php:107
+#: ../mods/super/vservers/ips.php:120
msgid "ip"
msgstr ""
-#: ../mods/super/vservers/ips.php:108 ../mods/super/vservers/ips.php:163
+#: ../mods/super/vservers/ips.php:121 ../mods/super/vservers/ips.php:179
msgid "netmask"
msgstr ""
-#: ../mods/super/vservers/ips.php:109 ../mods/super/vservers/ips.php:166
+#: ../mods/super/vservers/ips.php:122 ../mods/super/vservers/ips.php:182
msgid "broadcast"
msgstr ""
-#: ../mods/super/vservers/ips.php:134
+#: ../mods/super/vservers/ips.php:147
msgid "delete ip"
msgstr ""
-#: ../mods/super/vservers/ips.php:138 ../mods/super/vservers/ips.php:171
+#: ../mods/super/vservers/ips.php:151 ../mods/super/vservers/ips.php:187
msgid "add ip"
msgstr ""
-#: ../mods/super/vservers/ips.php:142
+#: ../mods/super/vservers/ips.php:155
msgid "ip address"
msgstr ""
-#: ../mods/super/vservers/ips.php:158
+#: ../mods/super/vservers/ips.php:174
msgid "custom ip"
msgstr ""
-#: ../mods/super/vservers/ips.php:169
+#: ../mods/super/vservers/ips.php:185
msgid "custom alias"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_iptables.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_iptables.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_iptables.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,100 +16,100 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/iptables.php:50
+#: ../mods/super/vservers/iptables.php:49
msgid "select direction"
msgstr ""
-#: ../mods/super/vservers/iptables.php:52
-#: ../mods/super/vservers/iptables.php:112
+#: ../mods/super/vservers/iptables.php:51
+#: ../mods/super/vservers/iptables.php:111
msgid "add rule"
msgstr ""
-#: ../mods/super/vservers/iptables.php:57
+#: ../mods/super/vservers/iptables.php:56
msgid "add new"
msgstr ""
-#: ../mods/super/vservers/iptables.php:57
+#: ../mods/super/vservers/iptables.php:56
msgid "rule"
msgstr ""
-#: ../mods/super/vservers/iptables.php:61
+#: ../mods/super/vservers/iptables.php:60
msgid "select protocol"
msgstr ""
-#: ../mods/super/vservers/iptables.php:90
+#: ../mods/super/vservers/iptables.php:89
msgid "select policy"
msgstr ""
-#: ../mods/super/vservers/iptables.php:93
+#: ../mods/super/vservers/iptables.php:92
msgid "select match"
msgstr ""
-#: ../mods/super/vservers/iptables.php:96
+#: ../mods/super/vservers/iptables.php:95
msgid "select match value"
msgstr ""
-#: ../mods/super/vservers/iptables.php:98
+#: ../mods/super/vservers/iptables.php:97
msgid "states"
msgstr ""
-#: ../mods/super/vservers/iptables.php:106
+#: ../mods/super/vservers/iptables.php:105
msgid "limit"
msgstr ""
-#: ../mods/super/vservers/iptables.php:109
+#: ../mods/super/vservers/iptables.php:108
msgid "icmp_type"
msgstr ""
-#: ../mods/super/vservers/iptables.php:153
+#: ../mods/super/vservers/iptables.php:152
msgid "firewall rules for vserver"
msgstr ""
-#: ../mods/super/vservers/iptables.php:155
+#: ../mods/super/vservers/iptables.php:154
msgid "default policy is allow"
msgstr ""
-#: ../mods/super/vservers/iptables.php:163
+#: ../mods/super/vservers/iptables.php:162
msgid "direction"
msgstr ""
-#: ../mods/super/vservers/iptables.php:164
+#: ../mods/super/vservers/iptables.php:163
msgid "protocol"
msgstr ""
-#: ../mods/super/vservers/iptables.php:165
+#: ../mods/super/vservers/iptables.php:164
msgid "source ip"
msgstr ""
-#: ../mods/super/vservers/iptables.php:166
+#: ../mods/super/vservers/iptables.php:165
msgid "source port"
msgstr ""
-#: ../mods/super/vservers/iptables.php:167
+#: ../mods/super/vservers/iptables.php:166
msgid "destination ip"
msgstr ""
-#: ../mods/super/vservers/iptables.php:168
+#: ../mods/super/vservers/iptables.php:167
msgid "destination port"
msgstr ""
-#: ../mods/super/vservers/iptables.php:169
+#: ../mods/super/vservers/iptables.php:168
msgid "target"
msgstr ""
-#: ../mods/super/vservers/iptables.php:170
+#: ../mods/super/vservers/iptables.php:169
msgid "match"
msgstr ""
-#: ../mods/super/vservers/iptables.php:171
+#: ../mods/super/vservers/iptables.php:170
msgid "match value"
msgstr ""
+#: ../mods/super/vservers/iptables.php:178
#: ../mods/super/vservers/iptables.php:179
-#: ../mods/super/vservers/iptables.php:180
msgid "any"
msgstr ""
-#: ../mods/super/vservers/iptables.php:188
+#: ../mods/super/vservers/iptables.php:187
msgid "delete rules"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_limits.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_limits.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_limits.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,80 +16,96 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/limits.php:45
+#: ../mods/super/vservers/limits.php:42
msgid "Options of vserver"
msgstr ""
-#: ../mods/super/vservers/limits.php:104
+#: ../mods/super/vservers/limits.php:91
msgid ""
"limits succesfully set. Make sure to restart the vserver before the changes "
"take affect."
msgstr ""
-#: ../mods/super/vservers/limits.php:108
+#: ../mods/super/vservers/limits.php:97
msgid "scheduling"
msgstr ""
-#: ../mods/super/vservers/limits.php:125
+#: ../mods/super/vservers/limits.php:118
+msgid "idle_time"
+msgstr ""
+
+#: ../mods/super/vservers/limits.php:123
msgid "cpu time limit"
msgstr ""
-#: ../mods/super/vservers/limits.php:136
+#: ../mods/super/vservers/limits.php:125
+msgid "expert"
+msgstr ""
+
+#: ../mods/super/vservers/limits.php:134
msgid "space"
msgstr ""
-#: ../mods/super/vservers/limits.php:140
+#: ../mods/super/vservers/limits.php:138
msgid "space total"
msgstr ""
-#: ../mods/super/vservers/limits.php:141
+#: ../mods/super/vservers/limits.php:139
msgid "space used"
msgstr ""
-#: ../mods/super/vservers/limits.php:142
+#: ../mods/super/vservers/limits.php:140
msgid "inodes total"
msgstr ""
-#: ../mods/super/vservers/limits.php:143
+#: ../mods/super/vservers/limits.php:141
msgid "inodes used"
msgstr ""
-#: ../mods/super/vservers/limits.php:144
+#: ../mods/super/vservers/limits.php:142
msgid "reserved total"
msgstr ""
-#: ../mods/super/vservers/limits.php:158
+#: ../mods/super/vservers/limits.php:156
msgid "rlimits"
msgstr ""
-#: ../mods/super/vservers/limits.php:162 ../mods/super/vservers/limits.php:188
+#: ../mods/super/vservers/limits.php:160 ../mods/super/vservers/limits.php:186
msgid "limit"
msgstr ""
-#: ../mods/super/vservers/limits.php:163
+#: ../mods/super/vservers/limits.php:161
msgid "minimum"
msgstr ""
-#: ../mods/super/vservers/limits.php:164 ../mods/super/vservers/limits.php:191
+#: ../mods/super/vservers/limits.php:162 ../mods/super/vservers/limits.php:189
msgid "soft"
msgstr ""
-#: ../mods/super/vservers/limits.php:165 ../mods/super/vservers/limits.php:195
+#: ../mods/super/vservers/limits.php:163 ../mods/super/vservers/limits.php:193
msgid "hard"
msgstr ""
-#: ../mods/super/vservers/limits.php:183
+#: ../mods/super/vservers/limits.php:181
msgid "hard traffic limits"
msgstr ""
-#: ../mods/super/vservers/limits.php:187
+#: ../mods/super/vservers/limits.php:185
msgid "type"
msgstr ""
-#: ../mods/super/vservers/limits.php:189
+#: ../mods/super/vservers/limits.php:187
msgid "email for notification"
msgstr ""
-#: ../mods/super/vservers/limits.php:203
+#: ../mods/super/vservers/limits.php:202
+msgid "Backuplimit"
+msgstr ""
+
+#: ../mods/super/vservers/limits.php:205
+msgid "current backup limit"
+msgstr ""
+
+#: ../mods/super/vservers/limits.php:209
msgid "save"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,46 +16,46 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/main.php:51
+#: ../mods/super/vservers/main.php:50
msgid "enabled vserver"
msgstr ""
-#: ../mods/super/vservers/main.php:55
+#: ../mods/super/vservers/main.php:54
msgid "disabled vserver"
msgstr ""
-#: ../mods/super/vservers/main.php:63
+#: ../mods/super/vservers/main.php:62
msgid "vserver overview"
msgstr ""
-#: ../mods/super/vservers/main.php:67
+#: ../mods/super/vservers/main.php:66
msgid "active"
msgstr ""
-#: ../mods/super/vservers/main.php:68
+#: ../mods/super/vservers/main.php:67
msgid "name"
msgstr ""
-#: ../mods/super/vservers/main.php:69
+#: ../mods/super/vservers/main.php:68
msgid "admin"
msgstr ""
-#: ../mods/super/vservers/main.php:70
+#: ../mods/super/vservers/main.php:69
msgid "customer"
msgstr ""
-#: ../mods/super/vservers/main.php:71
+#: ../mods/super/vservers/main.php:70
msgid "node"
msgstr ""
-#: ../mods/super/vservers/main.php:79
+#: ../mods/super/vservers/main.php:78
msgid "disabled"
msgstr ""
-#: ../mods/super/vservers/main.php:79
+#: ../mods/super/vservers/main.php:78
msgid "enabled"
msgstr ""
-#: ../mods/super/vservers/main.php:81 ../mods/super/vservers/main.php:82
+#: ../mods/super/vservers/main.php:80 ../mods/super/vservers/main.php:81
msgid "not set"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_navi.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_navi.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_navi.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,26 +16,22 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/navi.php:25
+#: ../mods/super/vservers/navi.php:27
msgid "VServer"
msgstr ""
-#: ../mods/super/vservers/navi.php:26
+#: ../mods/super/vservers/navi.php:28 ../mods/super/vservers/navi.php:36
msgid "overview"
msgstr ""
-#: ../mods/super/vservers/navi.php:27
+#: ../mods/super/vservers/navi.php:29
msgid "add vserver"
msgstr ""
-#: ../mods/super/vservers/navi.php:33
+#: ../mods/super/vservers/navi.php:35
msgid "Template"
msgstr ""
-#: ../mods/super/vservers/navi.php:34
-msgid "vserver templates"
+#: ../mods/super/vservers/navi.php:38
+msgid "add template"
msgstr ""
-
-#: ../mods/super/vservers/navi.php:36
-msgid "add"
-msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_reinstall.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_reinstall.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_reinstall.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_rescue.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_rescue.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_rescue.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,13 +20,13 @@
msgid "stopping"
msgstr ""
-#: ../mods/super/vservers/rescue.php:55 ../mods/super/vservers/rescue.php:72
-#: ../mods/super/vservers/rescue.php:74 ../mods/super/vservers/rescue.php:81
+#: ../mods/super/vservers/rescue.php:55 ../mods/super/vservers/rescue.php:73
+#: ../mods/super/vservers/rescue.php:75 ../mods/super/vservers/rescue.php:82
msgid "ok"
msgstr ""
-#: ../mods/super/vservers/rescue.php:55 ../mods/super/vservers/rescue.php:72
-#: ../mods/super/vservers/rescue.php:74 ../mods/super/vservers/rescue.php:81
+#: ../mods/super/vservers/rescue.php:55 ../mods/super/vservers/rescue.php:73
+#: ../mods/super/vservers/rescue.php:75 ../mods/super/vservers/rescue.php:82
msgid "failed"
msgstr ""
@@ -38,38 +38,38 @@
msgid "switching to rescue system"
msgstr ""
-#: ../mods/super/vservers/rescue.php:77
+#: ../mods/super/vservers/rescue.php:78
msgid "starting"
msgstr ""
-#: ../mods/super/vservers/rescue.php:93
+#: ../mods/super/vservers/rescue.php:94
msgid "rescue root password for ssh is"
msgstr ""
-#: ../mods/super/vservers/rescue.php:94
+#: ../mods/super/vservers/rescue.php:95
msgid "system is booted into rescue mode"
msgstr ""
-#: ../mods/super/vservers/rescue.php:97
+#: ../mods/super/vservers/rescue.php:98
msgid "system is booted into normal mode"
msgstr ""
-#: ../mods/super/vservers/rescue.php:102
+#: ../mods/super/vservers/rescue.php:103
msgid "rescue mode"
msgstr ""
-#: ../mods/super/vservers/rescue.php:105
+#: ../mods/super/vservers/rescue.php:106
msgid "vserver is in rescue mode"
msgstr ""
-#: ../mods/super/vservers/rescue.php:107
+#: ../mods/super/vservers/rescue.php:108
msgid "boot into normal mode"
msgstr ""
-#: ../mods/super/vservers/rescue.php:110
+#: ../mods/super/vservers/rescue.php:111
msgid "vserver is in normal mode"
msgstr ""
-#: ../mods/super/vservers/rescue.php:112
+#: ../mods/super/vservers/rescue.php:113
msgid "boot into rescue mode"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_stats.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_stats.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_stats.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,99 +16,99 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/stats.php:75 ../mods/super/vservers/stats.php:77
-#: ../mods/super/vservers/stats.php:145
+#: ../mods/super/vservers/stats.php:74 ../mods/super/vservers/stats.php:76
+#: ../mods/super/vservers/stats.php:144
msgid "traffic for"
msgstr ""
-#: ../mods/super/vservers/stats.php:82 ../mods/super/vservers/stats.php:215
+#: ../mods/super/vservers/stats.php:81 ../mods/super/vservers/stats.php:213
msgid "hour"
msgstr ""
-#: ../mods/super/vservers/stats.php:82
+#: ../mods/super/vservers/stats.php:81
msgid "day"
msgstr ""
-#: ../mods/super/vservers/stats.php:83
+#: ../mods/super/vservers/stats.php:82
msgid "ip"
msgstr ""
-#: ../mods/super/vservers/stats.php:84 ../mods/super/vservers/stats.php:150
+#: ../mods/super/vservers/stats.php:83 ../mods/super/vservers/stats.php:149
msgid "traffic incoming"
msgstr ""
-#: ../mods/super/vservers/stats.php:85 ../mods/super/vservers/stats.php:151
+#: ../mods/super/vservers/stats.php:84 ../mods/super/vservers/stats.php:150
msgid "traffic outgoing"
msgstr ""
-#: ../mods/super/vservers/stats.php:86 ../mods/super/vservers/stats.php:152
+#: ../mods/super/vservers/stats.php:85 ../mods/super/vservers/stats.php:151
msgid "traffic total"
msgstr ""
-#: ../mods/super/vservers/stats.php:113 ../mods/super/vservers/stats.php:183
+#: ../mods/super/vservers/stats.php:112 ../mods/super/vservers/stats.php:182
msgid "sum"
msgstr ""
-#: ../mods/super/vservers/stats.php:139 ../mods/super/vservers/stats.php:195
+#: ../mods/super/vservers/stats.php:138 ../mods/super/vservers/stats.php:194
msgid "go"
msgstr ""
-#: ../mods/super/vservers/stats.php:149
+#: ../mods/super/vservers/stats.php:148
msgid "month"
msgstr ""
-#: ../mods/super/vservers/stats.php:211
+#: ../mods/super/vservers/stats.php:209
msgid "ressources for"
msgstr ""
-#: ../mods/super/vservers/stats.php:232
+#: ../mods/super/vservers/stats.php:230
msgid "show resources"
msgstr ""
-#: ../mods/super/vservers/stats.php:233
+#: ../mods/super/vservers/stats.php:231
msgid "please select resources"
msgstr ""
-#: ../mods/super/vservers/stats.php:237
+#: ../mods/super/vservers/stats.php:235
msgid "number of processes"
msgstr ""
-#: ../mods/super/vservers/stats.php:240
+#: ../mods/super/vservers/stats.php:238
msgid "virtual memory"
msgstr ""
-#: ../mods/super/vservers/stats.php:243
+#: ../mods/super/vservers/stats.php:241
msgid "locked virtual memory"
msgstr ""
-#: ../mods/super/vservers/stats.php:246
+#: ../mods/super/vservers/stats.php:244
msgid "resident set size"
msgstr ""
-#: ../mods/super/vservers/stats.php:249
+#: ../mods/super/vservers/stats.php:247
msgid "anonymous memory size"
msgstr ""
-#: ../mods/super/vservers/stats.php:252
+#: ../mods/super/vservers/stats.php:250
msgid "number of files"
msgstr ""
-#: ../mods/super/vservers/stats.php:255
+#: ../mods/super/vservers/stats.php:253
msgid "number of open file descriptors"
msgstr ""
-#: ../mods/super/vservers/stats.php:258
+#: ../mods/super/vservers/stats.php:256
msgid "file locks held"
msgstr ""
-#: ../mods/super/vservers/stats.php:261
+#: ../mods/super/vservers/stats.php:259
msgid "number of open sockets"
msgstr ""
-#: ../mods/super/vservers/stats.php:264
+#: ../mods/super/vservers/stats.php:262
msgid "bytes in POSIX mqueues"
msgstr ""
-#: ../mods/super/vservers/stats.php:267
+#: ../mods/super/vservers/stats.php:265
msgid "shared memory size"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_template.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_template.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_template.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -146,6 +146,14 @@
msgid "locks"
msgstr ""
-#: ../mods/super/vservers/template.php:211
+#: ../mods/super/vservers/template.php:213
+msgid "Backuplimit"
+msgstr ""
+
+#: ../mods/super/vservers/template.php:216
+msgid "current backup limit"
+msgstr ""
+
+#: ../mods/super/vservers/template.php:219
msgid "save"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_vsnavi.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_vsnavi.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/super_vservers_vsnavi.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,74 +16,82 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/super/vservers/vsnavi.php:27
+#: ../mods/super/vservers/vsnavi.php:31
msgid "info"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:29
+#: ../mods/super/vservers/vsnavi.php:33
msgid "customer"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:30
+#: ../mods/super/vservers/vsnavi.php:34
msgid "node"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:31
+#: ../mods/super/vservers/vsnavi.php:35
msgid "Options"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:32
+#: ../mods/super/vservers/vsnavi.php:36
msgid "control"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:33
+#: ../mods/super/vservers/vsnavi.php:37
msgid "rescue"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:34
+#: ../mods/super/vservers/vsnavi.php:38
msgid "reinstall"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:35
+#: ../mods/super/vservers/vsnavi.php:39
+msgid "backup"
+msgstr ""
+
+#: ../mods/super/vservers/vsnavi.php:42
+msgid "add backup"
+msgstr ""
+
+#: ../mods/super/vservers/vsnavi.php:45
msgid "ips"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:36
+#: ../mods/super/vservers/vsnavi.php:47
msgid "iptables"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:39 ../mods/super/vservers/vsnavi.php:44
+#: ../mods/super/vservers/vsnavi.php:50 ../mods/super/vservers/vsnavi.php:56
msgid "add rule"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:41
+#: ../mods/super/vservers/vsnavi.php:53
msgid "bandwidth"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:46
+#: ../mods/super/vservers/vsnavi.php:59
msgid "flags"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:47
+#: ../mods/super/vservers/vsnavi.php:60
msgid "limits"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:48
+#: ../mods/super/vservers/vsnavi.php:62
msgid "stats"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:51
+#: ../mods/super/vservers/vsnavi.php:65
msgid "traffic day"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:52
+#: ../mods/super/vservers/vsnavi.php:66
msgid "traffic month"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:53
+#: ../mods/super/vservers/vsnavi.php:67
msgid "traffic year"
msgstr ""
-#: ../mods/super/vservers/vsnavi.php:54
+#: ../mods/super/vservers/vsnavi.php:68
msgid "resources"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_control_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_control_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_control_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,7 +24,7 @@
msgid "rescue"
msgstr ""
-#: ../mods/user/control/main.php:49 ../mods/user/control/main.php:410
+#: ../mods/user/control/main.php:49
msgid "reinstall"
msgstr ""
@@ -40,349 +40,58 @@
msgid "trafficlimit"
msgstr ""
-#: ../mods/user/control/main.php:65 ../mods/user/control/main.php:175
-#: ../mods/user/control/main.php:269 ../mods/user/control/main.php:422
-#: ../mods/user/control/main.php:492 ../mods/user/control/main.php:526
-msgid "sorry this vserver is disabled"
+#: ../mods/user/control/main.php:54
+msgid "backups"
msgstr ""
-#: ../mods/user/control/main.php:75
-msgid "restarted vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:77 ../mods/user/control/main.php:305
-msgid "stopping vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:82 ../mods/user/control/main.php:111
-#: ../mods/user/control/main.php:189 ../mods/user/control/main.php:208
-#: ../mods/user/control/main.php:210 ../mods/user/control/main.php:217
-#: ../mods/user/control/main.php:314 ../mods/user/control/main.php:340
-#: ../mods/user/control/main.php:350 ../mods/user/control/main.php:356
-msgid "ok"
-msgstr ""
-
-#: ../mods/user/control/main.php:85 ../mods/user/control/main.php:122
-#: ../mods/user/control/main.php:139 ../mods/user/control/main.php:189
-#: ../mods/user/control/main.php:208 ../mods/user/control/main.php:210
-#: ../mods/user/control/main.php:217 ../mods/user/control/main.php:321
-#: ../mods/user/control/main.php:362 ../mods/user/control/main.php:372
-msgid "failed"
-msgstr ""
-
-#: ../mods/user/control/main.php:90 ../mods/user/control/main.php:112
-#: ../mods/user/control/main.php:123 ../mods/user/control/main.php:190
-#: ../mods/user/control/main.php:218
-msgid "output"
-msgstr ""
-
-#: ../mods/user/control/main.php:97
-msgid "started vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:104
-msgid "starting vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:117 ../mods/user/control/main.php:152
-#: ../mods/user/control/main.php:159 ../mods/user/control/main.php:357
-#: ../mods/user/control/main.php:558
+#: ../mods/user/control/main.php:61
msgid "vserver"
msgstr ""
-#: ../mods/user/control/main.php:117
-msgid "sucessfully started"
+#: ../mods/user/control/main.php:65
+msgid "name"
msgstr ""
-#: ../mods/user/control/main.php:128 ../mods/user/control/main.php:322
-#: ../mods/user/control/main.php:363
-msgid "error starting vserver"
+#: ../mods/user/control/main.php:66
+msgid "state"
msgstr ""
-#: ../mods/user/control/main.php:129 ../mods/user/control/main.php:141
-#: ../mods/user/control/main.php:168 ../mods/user/control/main.php:323
-#: ../mods/user/control/main.php:364 ../mods/user/control/main.php:374
-#: ../mods/user/control/main.php:381 ../mods/user/control/main.php:416
-msgid "please contact support"
+#: ../mods/user/control/main.php:67
+msgid "action"
msgstr ""
-#: ../mods/user/control/main.php:132
-msgid "restart of vserver failed: vserver doesn't start after stop'"
+#: ../mods/user/control/main.php:68
+msgid "load"
msgstr ""
-#: ../mods/user/control/main.php:134
-msgid "start of vserver failed: vserver doesn't start'"
+#: ../mods/user/control/main.php:69
+msgid "uptime"
msgstr ""
-#: ../mods/user/control/main.php:140
-msgid "error stopping vserver"
+#: ../mods/user/control/main.php:75
+msgid "online"
msgstr ""
-#: ../mods/user/control/main.php:142 ../mods/user/control/main.php:327
-msgid "reinstall of vserver failed: vserver didn't stop"
+#: ../mods/user/control/main.php:75
+msgid "offline"
msgstr ""
-#: ../mods/user/control/main.php:149
-msgid "control vserver"
+#: ../mods/user/control/main.php:79
+msgid "image setup"
msgstr ""
-#: ../mods/user/control/main.php:152
-msgid "is online"
+#: ../mods/user/control/main.php:82
+msgid "set rescue"
msgstr ""
-#: ../mods/user/control/main.php:153
-msgid "should this veserver be restarted"
+#: ../mods/user/control/main.php:85
+msgid "create backup"
msgstr ""
-#: ../mods/user/control/main.php:154
-msgid "restart"
+#: ../mods/user/control/main.php:88
+msgid "restore rescue"
msgstr ""
-#: ../mods/user/control/main.php:155
-msgid "should this veserver be stoped"
+#: ../mods/user/control/main.php:91
+msgid "nothing"
msgstr ""
-
-#: ../mods/user/control/main.php:156
-msgid "stop"
-msgstr ""
-
-#: ../mods/user/control/main.php:159
-msgid "is offline"
-msgstr ""
-
-#: ../mods/user/control/main.php:160
-msgid "should this veserver be started"
-msgstr ""
-
-#: ../mods/user/control/main.php:162
-msgid "start"
-msgstr ""
-
-#: ../mods/user/control/main.php:167 ../mods/user/control/main.php:380
-#: ../mods/user/control/main.php:414
-msgid "sorry your request could not be performed"
-msgstr ""
-
-#: ../mods/user/control/main.php:184
-msgid "stopping"
-msgstr ""
-
-#: ../mods/user/control/main.php:202
-msgid "switching to normal system"
-msgstr ""
-
-#: ../mods/user/control/main.php:204
-msgid "switching to rescue system"
-msgstr ""
-
-#: ../mods/user/control/main.php:213
-msgid "starting"
-msgstr ""
-
-#: ../mods/user/control/main.php:231
-msgid "rescue root password for ssh is"
-msgstr ""
-
-#: ../mods/user/control/main.php:232
-msgid "system is booted into rescue mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:233
-msgid "your vserver can be found in /vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:236
-msgid "system is booted into normal mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:241
-msgid "rescue mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:244
-msgid "vserver is in rescue mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:247 ../mods/user/control/main.php:256
-#: ../mods/user/control/main.php:408 ../mods/user/control/main.php:477
-#: ../mods/user/control/main.php:519 ../mods/user/control/main.php:552
-msgid "current login pass"
-msgstr ""
-
-#: ../mods/user/control/main.php:250
-msgid "boot into normal mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:253
-msgid "vserver is in normal mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:259
-msgid "boot into rescue mode"
-msgstr ""
-
-#: ../mods/user/control/main.php:296
-msgid "reinstalled vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:296
-msgid "with image"
-msgstr ""
-
-#: ../mods/user/control/main.php:333 ../mods/user/control/main.php:388
-msgid "reinstall vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:353
-msgid "setting rootpassword"
-msgstr ""
-
-#: ../mods/user/control/main.php:357
-msgid "sucessfully reinstalled"
-msgstr ""
-
-#: ../mods/user/control/main.php:358
-msgid "new root password is"
-msgstr ""
-
-#: ../mods/user/control/main.php:366
-msgid "restart of vserver failed: vserver doesn't start after reinstall'"
-msgstr ""
-
-#: ../mods/user/control/main.php:373
-msgid "error reinstalling vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:392
-msgid "available images"
-msgstr ""
-
-#: ../mods/user/control/main.php:415
-msgid "did you insert your password"
-msgstr ""
-
-#: ../mods/user/control/main.php:426
-msgid "setting traffliclimits for vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:436
-msgid "trafficlimit set"
-msgstr ""
-
-#: ../mods/user/control/main.php:437 ../mods/user/control/main.php:451
-msgid "changed hard trafficlimit of vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:441 ../mods/user/control/main.php:455
-msgid "current login passwords doesn't match"
-msgstr ""
-
-#: ../mods/user/control/main.php:450
-msgid "trafficlimit deleted"
-msgstr ""
-
-#: ../mods/user/control/main.php:467
-msgid "change hard trafficlimit"
-msgstr ""
-
-#: ../mods/user/control/main.php:471
-msgid "soft limit"
-msgstr ""
-
-#: ../mods/user/control/main.php:474
-msgid "hard limit"
-msgstr ""
-
-#: ../mods/user/control/main.php:479
-msgid "add/change"
-msgstr ""
-
-#: ../mods/user/control/main.php:480
-msgid "delete"
-msgstr ""
-
-#: ../mods/user/control/main.php:482
-msgid ""
-"when the vserver hits the given traffic limit it will be automatically shut "
-"down and you will receive an email"
-msgstr ""
-
-#: ../mods/user/control/main.php:484
-msgid "mails will be sent to"
-msgstr ""
-
-#: ../mods/user/control/main.php:496
-msgid "changing root password of"
-msgstr ""
-
-#: ../mods/user/control/main.php:503
-msgid "password successfully changed"
-msgstr ""
-
-#: ../mods/user/control/main.php:504
-msgid "changed root password of vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:508 ../mods/user/control/main.php:542
-msgid "current login pass doesn't match"
-msgstr ""
-
-#: ../mods/user/control/main.php:512
-msgid "change root password"
-msgstr ""
-
-#: ../mods/user/control/main.php:516
-msgid "new root password"
-msgstr ""
-
-#: ../mods/user/control/main.php:521 ../mods/user/control/main.php:554
-msgid "set"
-msgstr ""
-
-#: ../mods/user/control/main.php:530
-msgid "change hostname of"
-msgstr ""
-
-#: ../mods/user/control/main.php:536
-msgid "hostname successfully changed"
-msgstr ""
-
-#: ../mods/user/control/main.php:537
-msgid "you have to restart your vserver in order to complete the change"
-msgstr ""
-
-#: ../mods/user/control/main.php:538
-msgid "chanched hostname of vserver"
-msgstr ""
-
-#: ../mods/user/control/main.php:545
-msgid "change hostname"
-msgstr ""
-
-#: ../mods/user/control/main.php:549
-msgid "current hostname"
-msgstr ""
-
-#: ../mods/user/control/main.php:562
-msgid "name"
-msgstr ""
-
-#: ../mods/user/control/main.php:563
-msgid "state"
-msgstr ""
-
-#: ../mods/user/control/main.php:564
-msgid "load"
-msgstr ""
-
-#: ../mods/user/control/main.php:565
-msgid "uptime"
-msgstr ""
-
-#: ../mods/user/control/main.php:572
-msgid "online"
-msgstr ""
-
-#: ../mods/user/control/main.php:572
-msgid "offline"
-msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_firewall_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_firewall_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_firewall_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_functions.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_functions.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_functions.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../mods/user/main.php:33
+#: ../mods/user/main.php:33 ../mods/user/main.php:117
msgid "overview"
msgstr ""
@@ -24,99 +24,99 @@
msgid "logout"
msgstr ""
-#: ../mods/user/main.php:37
+#: ../mods/user/main.php:44
msgid "vserver"
msgstr ""
-#: ../mods/user/main.php:47
+#: ../mods/user/main.php:54
msgid "Access denied"
msgstr ""
-#: ../mods/user/main.php:48
+#: ../mods/user/main.php:55
msgid "Missing Privilege: "
msgstr ""
-#: ../mods/user/main.php:59
+#: ../mods/user/main.php:65
msgid "vServer data"
msgstr ""
-#: ../mods/user/main.php:61
+#: ../mods/user/main.php:67
msgid "vserver name"
msgstr ""
-#: ../mods/user/main.php:64
+#: ../mods/user/main.php:70
msgid "state"
msgstr ""
-#: ../mods/user/main.php:73
+#: ../mods/user/main.php:74
msgid "online"
msgstr ""
-#: ../mods/user/main.php:77
+#: ../mods/user/main.php:78
msgid "offline"
msgstr ""
-#: ../mods/user/main.php:88
+#: ../mods/user/main.php:82
msgid "uptime"
msgstr ""
-#: ../mods/user/main.php:96
+#: ../mods/user/main.php:85
msgid "current load"
msgstr ""
-#: ../mods/user/main.php:103
+#: ../mods/user/main.php:90
msgid "ip's"
msgstr ""
-#: ../mods/user/main.php:118
+#: ../mods/user/main.php:99
msgid "traffic"
msgstr ""
-#: ../mods/user/main.php:126
+#: ../mods/user/main.php:105
msgid "space total"
msgstr ""
-#: ../mods/user/main.php:127 ../mods/user/main.php:130
-#: ../mods/user/main.php:133
-msgid "unlimited"
+#: ../mods/user/main.php:106 ../mods/user/main.php:109
+#: ../mods/user/main.php:112
+msgid "n/a"
msgstr ""
-#: ../mods/user/main.php:129
+#: ../mods/user/main.php:108
msgid "space used"
msgstr ""
-#: ../mods/user/main.php:132
+#: ../mods/user/main.php:111
msgid "space free"
msgstr ""
-#: ../mods/user/main.php:139
+#: ../mods/user/main.php:119
msgid "customer data"
msgstr ""
-#: ../mods/user/main.php:141
+#: ../mods/user/main.php:121
msgid "company"
msgstr ""
-#: ../mods/user/main.php:144
+#: ../mods/user/main.php:124
msgid "firstname"
msgstr ""
-#: ../mods/user/main.php:147
+#: ../mods/user/main.php:127
msgid "lastname"
msgstr ""
-#: ../mods/user/main.php:150
+#: ../mods/user/main.php:130
msgid "adress"
msgstr ""
-#: ../mods/user/main.php:153
+#: ../mods/user/main.php:133
msgid "postcode"
msgstr ""
-#: ../mods/user/main.php:156
+#: ../mods/user/main.php:136
msgid "city"
msgstr ""
-#: ../mods/user/main.php:159
+#: ../mods/user/main.php:139
msgid "email"
msgstr ""
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_options_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_options_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_options_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_graph.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_graph.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_graph.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_main.po
===================================================================
--- trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_main.po 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/locale/en_US/LC_MESSAGES/user_stats_main.po 2009-07-18 15:44:24 UTC (rev 675)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 19:27+0100\n"
+"POT-Creation-Date: 2009-05-07 16:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/webinterface/core/mysql.sql
===================================================================
--- trunk/webinterface/core/mysql.sql 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/core/mysql.sql 2009-07-18 15:44:24 UTC (rev 675)
@@ -341,3 +341,7 @@
('language', 'en_US'),
('theme', 'default');
+#since r658
+ALTER TABLE `openvcp_vservers` ADD `backup_count` INT( 5 ) NOT NULL DEFAULT '0';
+ALTER TABLE `openvcp_vservers` ADD `lock` TINYINT( 1 ) NOT NULL DEFAULT '0';
+ALTER TABLE `openvcp_vserver_templates` ADD `backup_count` INT( 11 ) NOT NULL;
Modified: trunk/webinterface/mods/ajax/NodeHandler.class.php
===================================================================
--- trunk/webinterface/mods/ajax/NodeHandler.class.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/ajax/NodeHandler.class.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -1,4 +1,26 @@
<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
require_once('NodeFactory.class.php');
Modified: trunk/webinterface/mods/super/vservers/add.php
===================================================================
--- trunk/webinterface/mods/super/vservers/add.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/super/vservers/add.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -292,7 +292,7 @@
$GUI->flushContent();
//basic setup
- $vserver = Vserver::createNewVServer($_POST['vservername'], NodeFactory::getNodeFactory()->getNodeByID($_POST['node']), AdminFactory::getInstance()->getUserByID($_POST['admin']), CustomerFactory::getInstance()->getUserByID($_POST['customer']));
+ $vserver = Vserver::createNewVServer($_POST['vservername'], NodeFactory::getNodeFactory()->getNodeByID($_POST['node']), AdminFactory::getInstance()->getUserByID($_POST['admin']), CustomerFactory::getInstance()->getUserByID($_POST['customer']), $_POST['backup_count']);
$GUI->div(_("ok"), "rightgreen");
$GUI->br();
$GUI->flushContent();
@@ -800,107 +800,38 @@
$GUI->tableAddCol($row, _("soft"));
$GUI->tableAddCol($row, _("hard"));
$row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("rss")." [MB]");
- if($vServer5Ok)
- {
- $GUI->tableAddCol($row, $_POST['rss_min']);
- $GUI->tableAddCol($row, $_POST['rss_soft']);
- $GUI->tableAddCol($row, $_POST['rss_hard']);
- $GUI->formAddInputElement($form, "hidden", "rss_min", $_POST['rss_min']);
- $GUI->formAddInputElement($form, "hidden", "rss_soft", $_POST['rss_soft']);
- $GUI->formAddInputElement($form, "hidden", "rss_hard", $_POST['rss_hard']);
+
+ $limits = array("cpu", "fsize", "data", "stack", "core", "rss", "nproc", "nofile", "memlock", "as", "locks");
+ foreach($limits as $limit) {
+ $row = $GUI->tableAddRow($table);
+ $GUI->tableAddCol($row, $limit);
+ if($vServer5Ok)
+ {
+ $GUI->tableAddCol($row, $_POST[$limit.'_min']);
+ $GUI->tableAddCol($row, $_POST[$limit.'_soft']);
+ $GUI->tableAddCol($row, $_POST[$limit.'_hard']);
+ $GUI->formAddInputElement($form, "hidden", $limit."_min", $_POST[$limit.'_min']);
+ $GUI->formAddInputElement($form, "hidden", $limit."_soft", $_POST[$limit.'_soft']);
+ $GUI->formAddInputElement($form, "hidden", $limit."_hard", $_POST[$limit.'_hard']);
+ }
+ else
+ {
+ $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", $limit."_min", $_POST[$limit.'_min']);
+ $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", $limit."_soft", $_POST[$limit.'_soft']);
+ $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", $limit."_hard", $_POST[$limit.'_hard']);
+ }
}
- else
- {
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "rss_min", $_POST['rss_min']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "rss_soft", $_POST['rss_soft']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "rss_hard", $_POST['rss_hard']);
- }
+
+ $GUI->br($form);
+ $GUI->h(_("Backuplimit"), 2, $form);
+ $table = $GUI->table($form);
$row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("nproc"));
- if($vServer5Ok)
- {
- $GUI->tableAddCol($row, $_POST['nproc_min']);
- $GUI->tableAddCol($row, $_POST['nproc_soft']);
- $GUI->tableAddCol($row, $_POST['nproc_hard']);
- $GUI->formAddInputElement($form, "hidden", "nproc_min", $_POST['nproc_min']);
- $GUI->formAddInputElement($form, "hidden", "nproc_soft", $_POST['nproc_soft']);
- $GUI->formAddInputElement($form, "hidden", "nproc_hard", $_POST['nproc_hard']);
+ $GUI->tableAddCol($row, _("current backup limit").":");
+ if($vServer5Ok) {
+ $GUI->formAddInputElement($GUI->tableAddCol($row, $_POST['backup_count']), "hidden", "backup_count", $_POST['backup_count'], NULL, "", "", "",false);
}
else
- {
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "nproc_min", $_POST['nproc_min']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "nproc_soft", $_POST['nproc_soft']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "nproc_hard", $_POST['nproc_hard']);
- }
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("nofile"));
- if($vServer5Ok)
- {
- $GUI->tableAddCol($row, $_POST['nofile_min']);
- $GUI->tableAddCol($row, $_POST['nofile_soft']);
- $GUI->tableAddCol($row, $_POST['nofile_hard']);
- $GUI->formAddInputElement($form, "hidden", "nofile_min", $_POST['nofile_min']);
- $GUI->formAddInputElement($form, "hidden", "nofile_soft", $_POST['nofile_soft']);
- $GUI->formAddInputElement($form, "hidden", "nofile_hard", $_POST['nofile_hard']);
- }
- else
- {
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "nofile_min", $_POST['nofile_min']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "nofile_soft", $_POST['nofile_soft']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "nofile_hard", $_POST['nofile_hard']);
- }
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("memlock"));
- if($vServer5Ok)
- {
- $GUI->tableAddCol($row, $_POST['memlock_min']);
- $GUI->tableAddCol($row, $_POST['memlock_soft']);
- $GUI->tableAddCol($row, $_POST['memlock_hard']);
- $GUI->formAddInputElement($form, "hidden", "memlock_min", $_POST['memlock_min']);
- $GUI->formAddInputElement($form, "hidden", "memlock_soft", $_POST['memlock_soft']);
- $GUI->formAddInputElement($form, "hidden", "memlock_hard", $_POST['memlock_hard']);
- }
- else
- {
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "memlock_min", $_POST['memlock_min']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "memlock_soft", $_POST['memlock_soft']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "memlock_hard", $_POST['memlock_hard']);
- }
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("as")." [MB]");
- if($vServer5Ok)
- {
- $GUI->tableAddCol($row, $_POST['as_min']);
- $GUI->tableAddCol($row, $_POST['as_soft']);
- $GUI->tableAddCol($row, $_POST['as_hard']);
- $GUI->formAddInputElement($form, "hidden", "as_min", $_POST['as_min']);
- $GUI->formAddInputElement($form, "hidden", "as_soft", $_POST['as_soft']);
- $GUI->formAddInputElement($form, "hidden", "as_hard", $_POST['as_hard']);
- }
- else
- {
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "as_min", $_POST['as_min']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "as_soft", $_POST['as_soft']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "as_hard", $_POST['as_hard']);
- }
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("locks"));
- if($vServer5Ok)
- {
- $GUI->tableAddCol($row, $_POST['locks_min']);
- $GUI->tableAddCol($row, $_POST['locks_soft']);
- $GUI->tableAddCol($row, $_POST['locks_hard']);
- $GUI->formAddInputElement($form, "hidden", "locks_min", $_POST['locks_min']);
- $GUI->formAddInputElement($form, "hidden", "locks_soft", $_POST['locks_soft']);
- $GUI->formAddInputElement($form, "hidden", "locks_hard", $_POST['locks_hard']);
- }
- else
- {
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "locks_min", $_POST['locks_min']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "locks_soft", $_POST['locks_soft']);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "locks_hard", $_POST['locks_hard']);
- }
+ $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "backup_count", $_POST['backup_count'], NULL, "", "", "",false);
}
else
{
Modified: trunk/webinterface/mods/super/vservers/backup.php
===================================================================
--- trunk/webinterface/mods/super/vservers/backup.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/super/vservers/backup.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -133,15 +133,92 @@
}
else if(@$PARAMS[2] == "action") {
if(isset($_POST['delete'])) {
- $backups = $vserver->getBackups();
- $state = $vserver->deleteBackup($backups[$_POST['backups']]);
+ $state = $vserver->deleteBackup($_POST['backups']);
if($state == "Success") {
- $GUI->p(_("image")." ".$backups[$_POST['backups']]." "._("successfully deleted"));
+ $GUI->p(_("image")." ".$_POST['backups']." "._("successfully deleted"));
}
else {
- $GUI->p(_("image")." ".$backups[$_POST['backups']]." "._("not deleted"));
+ $GUI->p(_("image")." ".$_POST['backups']." "._("not deleted"));
+ $GUI->p(_("reason").": ".$state);
}
}
+ if(isset($_POST['refresh'])) {
+ $state = $vserver->getState();
+ $offline = false;
+ if($state == "Online")
+ {
+ $GUI->flushContent();
+ $GUI->div(_("stopping vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStop();
+ $state = $vserver->getState();
+ if($state == "Offline")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("error stopping vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ exit();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->flushContent();
+ }
+
+ $GUI->div(_("refresh backup")." ".$_POST['backups'], "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ sleep(2);
+ $state = $vserver->refreshBackup($_POST['backups']);
+
+ if($state == "Success")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->div(_("starting vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStart();
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $state = $vserver->getState();
+ if($state == "Online")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->p(_("backup refreshed"));
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->p(_("system restored"));
+ $GUI->flushContent();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error refreshing vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+ }
if(isset($_POST['restore'])) {
$state = $vserver->getState();
$offline = false;
@@ -175,11 +252,11 @@
}
$backups = $vserver->getBackups();
- $GUI->div(_("restore backup")." ".$backups[$_POST['backups']], "left");
+ $GUI->div(_("restore backup")." ".$_POST['backups'], "left");
$GUI->flushContent();
$GUI->flushContent();
sleep(2);
- $state = $vserver->restoreBackup($backups[$_POST['backups']]);
+ $state = $vserver->restoreBackup($_POST['backups']);
if($state == "Success")
{
@@ -194,7 +271,7 @@
if($state == "Online")
{
$GUI->div(_("ok"), "rightgreen");
- $GUI->p(_("system restored"));
+ $GUI->p(_("VServer restored"));
$GUI->flushContent();
}
else
@@ -225,25 +302,25 @@
$GUI->content("<script type=\"text/javascript\">function confirmSubmit(form){return confirm(\""._("are you sure?")."\");}</script>");
-$GUI->h("Please do not use heavy development", 1);
-
$f = $GUI->fieldset(_("backup"));
$backups = $vserver->getBackups();
$form = $GUI->form($f, "backups_list", (@$PARAMS[2] != "action" ? $PARAMS[1] . "/action" : "action"), "POST", array('onsubmit' => 'return confirmSubmit(this)'));
$table = $GUI->table($form);
-$row = $GUI->tableAddRow($table);
+$thead = $GUI->tableAddHead($table);
+$row = $GUI->tableAddRow($thead);
$GUI->tableAddCol($row, _("name"));
+$GUI->tableAddCol($row, _("size"));
$GUI->tableAddCol($row, " ");
-$backupkeys=$backups;
-sort($backups);
foreach($backups as $backup)
{
$row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, $backup);
- $GUI->formAddCheckelement($GUI->tableAddCol($row, ""), "radio", "backups", array_search($backup, $backupkeys));
+ $GUI->tableAddCol($row, $backup['name']);
+ $GUI->tableAddCol($row, number_format($backup['size']/1024, 0, ',', '')." MB");
+ $GUI->formAddCheckelement($GUI->tableAddCol($row, ""), "radio", "backups", $backup['name']);
}
+$GUI->formAddInputElement($form, "submit", "refresh", _("refresh"));
$GUI->formAddInputElement($form, "submit", "delete", _("delete"));
$GUI->formAddInputElement($form, "submit", "restore", _("restore"));
?>
Modified: trunk/webinterface/mods/super/vservers/info.php
===================================================================
--- trunk/webinterface/mods/super/vservers/info.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/super/vservers/info.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -39,7 +39,7 @@
require_once("navi.php");
-if(@$PARAMS[2] == "submit" && isset($_POST['hostname']))
+if(@$PARAMS[2] == "submit" && isset($_POST['hostname']) && isset($_POST['submit']))
{
if($_POST['admin'] == "none") $_POST['admin'] = -1;
if($_POST['customer'] == "none") $_POST['customer'] = -1;
@@ -52,6 +52,10 @@
$vserver->updateInfo($_POST['customer'], $_POST['admin']);
$GUI->p(_("update successfully")."!");
}
+else if(isset($_POST['removelock']))
+{
+ $vserver->removeLock();
+}
$form = $GUI->form(0, "vserver_info", (@$PARAMS[2] == "submit" ? "submit" : $PARAMS[1]."/submit"));
$table = $GUI->table($form);
@@ -82,14 +86,29 @@
$col = $GUI->tableAddCol($row, $state." ");
if($state == "Online")
-$GUI->img($col, "green.png", true, _("online"), 15, 15);
+ $GUI->img($col, "green.png", true, _("online"), 15, 15);
else
-$GUI->img($col, "red.png", true, _("offline"), 15, 15);
+ $GUI->img($col, "red.png", true, _("offline"), 15, 15);
$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("lock state"));
+
+if($vserver->getLockState() == 1)
+ $GUI->tableAddCol($row, _("image setup"));
+else if($vserver->getLockState() == 2)
+ $GUI->tableAddCol($row, _("set rescue"));
+else if($vserver->getLockState() == 3)
+ $GUI->tableAddCol($row, _("create backup"));
+else if($vserver->getLockState() == 4)
+ $GUI->tableAddCol($row, _("restore backup"));
+else
+ $GUI->tableAddCol($row, _("no lock on vserver"));
+
+
+$row = $GUI->tableAddRow($table);
$GUI->tableAddCol($row, _("load"));
$GUI->tableAddCol($row, $vserver->getLoad(true));
-
-$GUI->formAddInputElement($form, "submit", _("submit"), _("submit"));
+$GUI->formAddInputElement($form, "submit", "submit", _("submit"));
+$GUI->formAddInputElement($form, "submit", "removelock", _("remove lock"));
?>
Modified: trunk/webinterface/mods/super/vservers/limits.php
===================================================================
--- trunk/webinterface/mods/super/vservers/limits.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/super/vservers/limits.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -48,6 +48,8 @@
$_POST['schedule'] = 32*$_POST['schedule']/100;
$vserver->setSchedule($_POST['schedule']);
}
+
+ $vserver->setBackupLimit($_POST['backup_count']);
foreach($_POST['rlimit'] as $key => $rlimit)
{
@@ -196,5 +198,13 @@
$GUI->formAddInputElement($form, "hidden", "trafficlimit_limit_hard_orig", $hardlimits['total']);
$GUI->formAddInputElement($form, "hidden", "trafficlimit_email_orig", $hardlimits['notify']);
+$GUI->br($form);
+$GUI->h(_("Backuplimit"), 2, $form);
+$table = $GUI->table($form);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("current backup limit").":");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "backup_count", $vserver->getBackupLimit(), NULL, "", "", "",false);
+
+
$GUI->formAddInputElement($form, "submit", "submitlimits", _("save"));
?>
Modified: trunk/webinterface/mods/super/vservers/template.php
===================================================================
--- trunk/webinterface/mods/super/vservers/template.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/super/vservers/template.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -45,7 +45,7 @@
'nproc_soft' => $_POST['nproc_soft'], 'nproc_hard' => $_POST['nproc_hard'], 'nofile_min' => $_POST['nofile_min'],
'nofile_soft' => $_POST['nofile_soft'], 'nofile_hard' => $_POST['nofile_hard'], 'memlock_min' => $_POST['memlock_min'],
'memlock_soft' => $_POST['memlock_soft'], 'memlock_hard' => $_POST['memlock_hard'], 'locks_min' => $_POST['locks_min'],
- 'locks_soft' => $_POST['locks_soft'], 'locks_hard' => $_POST['locks_hard'], 'schedule' => $_POST['schedule']),
+ 'locks_soft' => $_POST['locks_soft'], 'locks_hard' => $_POST['locks_hard'], 'schedule' => $_POST['schedule'], 'backup_count' => $_POST['backup_count']),
array('name' => $_POST['template']));
}
else if(isset($_POST['delete']))
@@ -61,7 +61,7 @@
$_POST['as_min'], $_POST['as_soft'], $_POST['as_hard'], $_POST['space_total'], $_POST['inodes_total'], $_POST['reserved'],
$_POST['nproc_min'], $_POST['nproc_soft'], $_POST['nproc_hard'], $_POST['nofile_min'], $_POST['nofile_soft'], $_POST['nofile_hard'],
$_POST['memlock_min'], $_POST['memlock_soft'], $_POST['memlock_hard'], $_POST['locks_min'], $_POST['locks_soft'], $_POST['locks_hard'],
- $_POST['schedule']));
+ $_POST['schedule'], 'backup_count' => $_POST['backup_count']));
}
}
else
@@ -208,5 +208,13 @@
$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "locks_min", $_POST['locks_min']);
$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "locks_soft", $_POST['locks_soft']);
$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "locks_hard", $_POST['locks_hard']);
+//backup limit
+$GUI->br($form);
+$GUI->h(_("Backuplimit"), 2, $form);
+$table = $GUI->table($form);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("current backup limit").":");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "text", "backup_count", $_POST['backup_count'], NULL, "", "", "",false);
+
$GUI->formAddInputElement($form, "submit", "submit", _("save"));
?>
\ No newline at end of file
Modified: trunk/webinterface/mods/super/vservers/vsnavi.php
===================================================================
--- trunk/webinterface/mods/super/vservers/vsnavi.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/super/vservers/vsnavi.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -41,19 +41,24 @@
{
$GUI->addContentMenuSub("backup/" . $vserver->getNodeObject()->getName()."/".$vserver->getName() . "/add", _("add backup"), 4);
}
-$GUI->addContentMenuSub("ips/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("ips"), 3);
+if($AUTH->getPrivileges('see_admins') == 'y') {
+ $GUI->addContentMenuSub("ips/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("ips"), 3);
+}
$GUI->addContentMenuSub("iptables/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("iptables"), 3);
if(isset($task) && $task == "iptables")
{
$GUI->addContentMenuSub("iptables/" . $vserver->getNodeObject()->getName()."/".$vserver->getName() . "/add", _("add rule"), 4);
}
-$GUI->addContentMenuSub("bandwidth/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("bandwidth"), 3);
-if(isset($task) && $task == "bandwidth")
-{
- $GUI->addContentMenuSub("bandwidth/" . $vserver->getNodeObject()->getName()."/".$vserver->getName() . "/add", _("add rule"), 4);
+if($AUTH->getPrivileges('see_admins') == 'y') {
+ $GUI->addContentMenuSub("bandwidth/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("bandwidth"), 3);
+ if(isset($task) && $task == "bandwidth")
+ {
+ $GUI->addContentMenuSub("bandwidth/" . $vserver->getNodeObject()->getName()."/".$vserver->getName() . "/add", _("add rule"), 4);
+ }
+
+ $GUI->addContentMenuSub("flags/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("flags"), 3);
+ $GUI->addContentMenuSub("limits/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("limits"), 3);
}
-$GUI->addContentMenuSub("flags/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("flags"), 3);
-$GUI->addContentMenuSub("limits/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("limits"), 3);
$GUI->addContentMenuSub("stats/".$vserver->getNodeObject()->getName()."/".$vserver->getName(), _("stats"), 3);
if(isset($task) && $task == "states")
{
Added: trunk/webinterface/mods/user/control/backups.php
===================================================================
--- trunk/webinterface/mods/user/control/backups.php (rev 0)
+++ trunk/webinterface/mods/user/control/backups.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,452 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+if($AUTH->getPrivileges('can_reinstall') != 'y')
+ OpenVCP::gotoURL("user/denied/can_reinstall");
+
+if($vserver->getBackupLimit() == 0)
+ OpenVCP::gotoURL("user/denied/backup");
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+$state = $vserver->getFullState();
+if($state[1] == "rescue")
+{
+ $GUI->p(_("sorry vserver is in rescue mode backup not supported").".");
+ exit();
+}
+
+if(@$PARAMS[1] == "action") {
+ if(isset($_POST['add'])) {
+ if(count($vserver->getBackups()) >= $vserver->getBackupLimit())
+ {
+ $GUI->p(_("sorry max backups for vserver reached").".");
+ exit();
+ }
+
+ if(@isset($_POST['iamsure']))
+ {
+ //$GUI->p(_("please do not close this window"));
+
+ $state = $vserver->getState();
+ $offline = false;
+ if($state == "Online")
+ {
+ $GUI->flushContent();
+ $GUI->div(_("stopping vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStop();
+ $state = $vserver->getState();
+ if($state == "Offline")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error stopping vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ exit();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->flushContent();
+ }
+
+ $GUI->div(_("create backup..."), "left");
+
+ $GUI->flushContent();
+ $GUI->flushContent();
+
+ $backupname = $vserver->createBackup();
+ if($backupname != "")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->div(_("starting vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStart();
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $state = $vserver->getState();
+ if($state == "Online")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->p(_("new backup name is").": ".$backupname);
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error backuping vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+ }
+ else
+ {
+ $f = $GUI->fieldset(_("take backup of vserver"));
+ $form = $GUI->form($f, "take_backup", "action/submit");
+ $GUI->p(_("do you want to create a backup of the vserver")."?",$form);
+ $GUI->p(_("attention: system will be stopped for backup process"),$form);
+ $GUI->formAddInputElement($form, "hidden", "iamsure", "iamsure");
+ $GUI->formAddInputElement($form, "submit", "add", _("take backup"));
+ }
+ exit(0);
+ }
+ else if(isset($_POST['delete']))
+ {
+
+ if(@isset($_POST['iamsure']))
+ {
+ $GUI->flushContent();
+
+ $backups = $vserver->getBackups();
+
+ $GUI->div(_("deleting image")." ".$_POST['backups']."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+
+ $state = $vserver->deleteBackup($_POST['backups']);
+ if($state == "Success") {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ $GUI->p(_("image")." ".$_POST['backups']." "._("successfully deleted"));
+ }
+ else {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("image")." ".$_POST['backups']." "._("not deleted"));
+ }
+ }
+ else
+ {
+ if(!$vserver->isBackupOfVserver($_POST['backups']))
+ {
+ $GUI->p(_("error: no backup selected"));
+ exit(0);
+ }
+ $f = $GUI->fieldset(_("delete backup"));
+ $form = $GUI->form($f, "delete_backup", "action/submit");
+ $GUI->p(_("do you want to delete backup").$_POST['backups']."?",$form);
+ $GUI->formAddInputElement($form, "hidden", "iamsure", "iamsure");
+ $GUI->formAddInputElement($form, "hidden", "backups", $_POST['backups']);
+ $GUI->formAddInputElement($form, "submit", "delete", _("delete backup"));
+ }
+ exit(0);
+ }
+ if(isset($_POST['refresh'])) {
+
+ if(@isset($_POST['iamsure']))
+ {
+ $state = $vserver->getState();
+ $offline = false;
+ if($state == "Online")
+ {
+ $GUI->flushContent();
+ $GUI->div(_("stopping vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStop();
+ $state = $vserver->getState();
+ if($state == "Offline")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error stopping vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ exit();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->flushContent();
+ }
+
+ $backups = $vserver->getBackups();
+ $GUI->div(_("refresh backup")." ".$_POST['backups'], "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ sleep(2);
+ $state = $vserver->refreshBackup($_POST['backups']);
+
+ if($state == "Success")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->div(_("starting vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStart();
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $state = $vserver->getState();
+ if($state == "Online")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->p(_("backup refreshed"));
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->p(_("system restored"));
+ $GUI->flushContent();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error refreshing vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+ }
+ else
+ {
+ if(!$vserver->isBackupOfVserver($_POST['backups']))
+ {
+ $GUI->p(_("error: no backup selected"));
+ exit(0);
+ }
+ $f = $GUI->fieldset(_("refresh backup"));
+ $form = $GUI->form($f, "refresh_backup", "action/submit");
+ $GUI->p(_("do you want to refresh backup")." ".$_POST['backups']."?",$form);
+ $GUI->p(_("attention: system will be stopped for backup process and the old backup is lost"),$form);
+ $GUI->formAddInputElement($form, "hidden", "iamsure", "iamsure");
+ $GUI->formAddInputElement($form, "hidden", "backups", $_POST['backups']);
+ $GUI->formAddInputElement($form, "submit", "refresh", _("refresh backup"));
+ }
+ exit(0);
+ }
+ if(isset($_POST['restore'])) {
+ if(@isset($_POST['iamsure']))
+ {
+ $state = $vserver->getState();
+ $offline = false;
+ if($state == "Online")
+ {
+ $GUI->flushContent();
+ $GUI->div(_("stopping vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStop();
+ $state = $vserver->getState();
+ if($state == "Offline")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error stopping vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ exit();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->flushContent();
+ }
+
+ $backups = $vserver->getBackups();
+ $GUI->div(_("restore backup")." ".$_POST['backups'], "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ sleep(2);
+ $state = $vserver->restoreBackup($_POST['backups']);
+
+ if($state == "Success")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->div(_("starting vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStart();
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $state = $vserver->getState();
+ if($state == "Online")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->p(_("VServer restored"));
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->p(_("system restored"));
+ $GUI->flushContent();
+ }
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error restoring vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+
+ }
+ else
+ {
+ if(!$vserver->isBackupOfVserver($_POST['backups']))
+ {
+ $GUI->p(_("error: no backup selected"));
+ exit(0);
+ }
+ $f = $GUI->fieldset(_("restore backup"));
+ $form = $GUI->form($f, "restore_backup", "action/submit");
+ $GUI->p(_("do you want to restore backup")." ".$_POST['backups']."?",$form);
+ $GUI->p(_("attention: system will be stopped for restore process and the vserver is replaced by the backup"),$form);
+ $GUI->formAddInputElement($form, "hidden", "iamsure", "iamsure");
+ $GUI->formAddInputElement($form, "hidden", "backups", $_POST['backups']);
+ $GUI->formAddInputElement($form, "submit", "restore", _("restore backup"));
+ }
+ exit(0);
+ }
+}
+
+$GUI->p($vserver->getName());
+
+$f = $GUI->fieldset(_("backup"));
+$backups = $vserver->getBackups();
+$form = $GUI->form($f, "backups_list", (@$PARAMS[1] != "action" ? $vserver->getName() . "/action" : "action"), "POST");
+if(count($backups) > 0) {
+ $table = $GUI->table($form);
+ $thead = $GUI->tableAddHead($table);
+ $row = $GUI->tableAddRow($thead);
+ $GUI->tableAddCol($row, _("name"));
+ $GUI->tableAddCol($row, _("size"));
+ $GUI->tableAddCol($row, " ");
+ foreach($backups as $backup)
+ {
+ $row = $GUI->tableAddRow($table);
+ $GUI->tableAddCol($row, $backup['name']);
+ $GUI->tableAddCol($row, number_format($backup['size']/1024, 0, ',', '')." MB");
+ $GUI->formAddCheckelement($GUI->tableAddCol($row, ""), "radio", "backups", $backup['name']);
+ }
+}
+else
+{
+ $GUI->p(_("no backups created yet"), $form);
+}
+$GUI->formAddInputElement($form, "submit", "add", _("take backup"));
+$GUI->formAddInputElement($form, "submit", "refresh", _("refresh"));
+$GUI->formAddInputElement($form, "submit", "delete", _("delete"));
+$GUI->formAddInputElement($form, "submit", "restore", _("restore"));
+
+?>
Added: trunk/webinterface/mods/user/control/change.php
===================================================================
--- trunk/webinterface/mods/user/control/change.php (rev 0)
+++ trunk/webinterface/mods/user/control/change.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,108 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+
+if($AUTH->getPrivileges('can_reset') != 'y')
+ OpenVCP::gotoURL("user/denied/can_change_admin_pass");
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+if($vserver->getState() != "Online") {
+ $GUI->p(_("sorry vserver is offline"));
+ $GUI->p(_("operation not permitted"));
+ exit();
+}
+
+$GUI->title(_("changing root password of")." ".$vserver->getName());
+if($PARAMS[1] == "submit" && isset($_POST['submit']))
+{
+
+ if(md5($_POST['currentuserpass']) == $USERINFO['password'])
+ {
+ if($vserver->controlSetupPassword($_POST['newrootpass']) == 1) {
+ $GUI->p(_("password successfully changed"));
+ $LOG->logInfo(_("changed root password of vserver")." ".$vserver->getName());
+ }
+ else {
+ $GUI->p(_("error setting new rootpassword"));
+ }
+ }
+ else
+ {
+ $GUI->p(_("current login pass doesn't match"));
+ }
+}
+
+$f = $GUI->fieldset(_("change root password"));
+$form = $GUI->form($f, "change_root_password", ($PARAMS[1] == "submit" ? "submit" : $vserver->getName()."/submit"));
+$table = $GUI->table($form);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("new root password").":");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "newrootpass");
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("current login pass").":");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
+$GUI->formAddInputElement($form, "submit", "submit", _("set"));
+
+?>
\ No newline at end of file
Added: trunk/webinterface/mods/user/control/hostname.php
===================================================================
--- trunk/webinterface/mods/user/control/hostname.php (rev 0)
+++ trunk/webinterface/mods/user/control/hostname.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,93 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+$GUI->title(_("change hostname of")." ".$vserver->getName());
+if($PARAMS[1] == "submit" && isset($_POST['submit']))
+{
+ if(md5($_POST['currentuserpass']) == $USERINFO['password'])
+ {
+ $vserver->setHostname($_POST['hostname']);
+ $GUI->p(_("hostname successfully changed"));
+ $GUI->p(_("you have to restart your vserver in order to complete the change"));
+ $LOG->logInfo(_("chanched hostname of vserver")." ".$vserver->getName());
+ }
+ else
+ {
+ $GUI->p(_("current login pass doesn't match"));
+ }
+}
+$f = $GUI->fieldset(_("change hostname"));
+$form = $GUI->form($f, "change_hostname", ($PARAMS[1] == "submit" ? "submit" : $vserver->getName()."/submit"));
+$table = $GUI->table($form);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("current hostname").":");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "hostname", $vserver->getHostname());
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("current login pass").":");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
+$GUI->formAddInputElement($form, "submit", "submit", _("set"));
+
+?>
\ No newline at end of file
Modified: trunk/webinterface/mods/user/control/main.php
===================================================================
--- trunk/webinterface/mods/user/control/main.php 2009-07-07 21:42:36 UTC (rev 674)
+++ trunk/webinterface/mods/user/control/main.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -23,9 +23,6 @@
*/
$AUTH =& OpenVCP::call('Auth', 'getReference');
$GUI =& OpenVCP::call('GUI' , 'getReference');
-$XML =& OpenVCP::call('XML', 'getReference');
-$SOCKET =& OpenVCP::call('Socket', 'getReference');
-$DB =& OpenVCP::call('DB' , 'getReference');
$LOG =& OpenVCP::call('Log', 'getReference');
$PARAMS =& OpenVCP::getParams();
$USERINFO = $AUTH->user_information;
@@ -44,557 +41,58 @@
foreach($vservers as $vserver)
{
$GUI->addContentMenuHead($vserver->getName(), 3, 1);
- $GUI->addContentMenuSub($vserver->getName()."/control", _("control"), 2);
- $GUI->addContentMenuSub($vserver->getName()."/rescue", _("rescue"), 2);
- $GUI->addContentMenuSub($vserver->getName()."/reinstall", _("reinstall"), 2);
- $GUI->addContentMenuSub($vserver->getName()."/hostname", _("hostname"), 2);
- $GUI->addContentMenuSub($vserver->getName()."/change", _("root password"), 2);
- $GUI->addContentMenuSub($vserver->getName()."/trafficlimit", _("trafficlimit"), 2);
-}
-if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
- $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
-}
-
-if($PARAMS[0] != "" && $PARAMS[1] == "control")
-{
- if($AUTH->getPrivileges('can_reset') != 'y')
- OpenVCP::gotoURL("user/denied/can_restart");
-
- if($vserver->isDisabled()) {
- $GUI->p(_("sorry this vserver is disabled"));
- exit();
- }
-
- $state = $vserver->getState();
-
- if($PARAMS[2] == "submit" && (isset($_POST['restart']) || isset($_POST['start']) || isset($_POST['stop'])) && $vserver != null)
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
{
- $GUI->flushContent();
- if(isset($_POST['restart']) || isset($_POST['stop'])) {
- $LOG->logInfo(_("restarted vserver")." ".$PARAMS[0]);
- do {
- $GUI->div(_("stopping vserver")." ".$PARAMS[0]."...", "left");
- $GUI->flushContent();
- $dmesg = $vserver->controlStop();
- $state = $vserver->getState();
- if($state == "Offline") {
- $GUI->div(_("ok"), "rightgreen");
- }
- else {
- $GUI->div(_("failed"), "rightred");
- }
- $GUI->flushContent();
- } while ($state != "Offline");
-
- $f = $GUI->fieldset(_("output"), "dmesg");
- foreach($dmesg as $msg)
- foreach(explode('<br />', $msg) as $line) {
- $GUI->addToElementID($f, $line."<br />");
- }
- }
- else
- $LOG->logInfo(_("started vserver")." ".$PARAMS[0]);
-
- if(!isset($_POST['stop']))
- {
- if($state == "Offline")
- {
- $GUI->flushContent();
- $GUI->div(_("starting vserver")." ".$PARAMS[0]."...", "left");
- $GUI->flushContent();
- $GUI->flushContent();
- $dmesg = $vserver->controlStart();
- $state = $vserver->getState();
- if($state == "Online")
- {
- $GUI->div(_("ok"), "rightgreen");
- $f = $GUI->fieldset(_("output"), "dmesg");
- foreach($dmesg as $msg)
- foreach(explode('<br />', $msg) as $line) {
- $GUI->addToElementID($f, $line."<br />");
- }
- $GUI->p(_("vserver")." ".$PARAMS[0]." "._("sucessfully started"));
- $GUI->flushContent();
- }
- else
- {
- $GUI->div(_("failed"), "rightred");
- $f = $GUI->fieldset(_("output"), "dmesg");
- foreach($dmesg as $msg)
- foreach(explode('<br />', $msg) as $line) {
- $GUI->addToElementID($f, $line."<br />");
- }
- $GUI->p(_("error starting vserver")." ".$PARAMS[0]."!");
- $GUI->p(_("please contact support")."!");
- $GUI->flushContent();
- if(isset($_POST['restart']))
- $LOG->logError(_("restart of vserver failed: vserver doesn't start after stop'")." ".$PARAMS[0]);
- else
- $LOG->logError(_("start of vserver failed: vserver doesn't start'")." ".$PARAMS[0]);
- }
- }
- else
- {
- $GUI->div(_("failed"), "rightred");
- $GUI->p(_("error stopping vserver")." ".$PARAMS[0]."!");
- $GUI->p(_("please contact support")."!");
- $LOG->logError(_("reinstall of vserver failed: vserver didn't stop")." ".$PARAMS[0]);
- $GUI->flushContent();
- }
- }
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
}
- else if($vserver != null)
- {
- $f = $GUI->fieldset(_("control vserver"));
- if($state == "Online") {
- $form = $GUI->form($f, "restart_vserver", "control/submit");
- $GUI->p(_("vserver")." ".$PARAM[0]." "._("is online")."!", $form);
- $GUI->p(_("should this veserver be restarted")."?", $form);
- $GUI->formAddInputElement($form, "submit", "restart", _("restart"));
- $GUI->p(_("should this veserver be stoped")."?", $form);
- $GUI->formAddInputElement($form, "submit", "stop", _("stop"));
- }
- else {
- $GUI->p(_("vserver")." ".$PARAM[0]." "._("is offline")."!", $f);
- $GUI->p(_("should this veserver be started")."?", $f);
- $form = $GUI->form($f, "start_vserver", "control/submit");
- $GUI->formAddInputElement($form, "submit", "start", _("start"));
- }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
}
- else
- {
- $GUI->p(_("sorry your request could not be performed")."!");
- $GUI->p(_("please contact support")."!");
- }
-
}
-else if($PARAMS[0] != "" && $PARAMS[1] == "rescue")
-{
- if($AUTH->getPrivileges('can_reset') != 'y')
- OpenVCP::gotoURL("user/denied/can_restart");
-
- if($vserver->isDisabled()) {
- $GUI->p(_("sorry this vserver is disabled"));
- exit();
- }
-
- if($PARAMS[2] == "submit" && md5($_POST['currentuserpass']) == $USERINFO['password']) {
-
- $state = $vserver->getFullState();
- if($state[0] == "Online")
- {
- $GUI->div(_("stopping")." ".$vserver->getName()." ....", "left");
- $GUI->flushContent();
- $GUI->flushContent();
- $dmesg = $vserver->controlStop();
- $off = $vserver->getState();
- $off == "Offline" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
- $f = $GUI->fieldset(_("output"), "dmesg");
- foreach($dmesg as $msg)
- foreach(explode('<br />', $msg) as $line) {
- $GUI->addToElementID($f, $line."<br />");
- }
- $GUI->br();
- $GUI->flushContent();
- }
- if($off == "Online")
- exit;
-
- if($state[1] == "rescue")
- $GUI->div(_("switching to normal system")." ".$vserver->getName()." ....", "left");
- else
- $GUI->div(_("switching to rescue system")." ".$vserver->getName()." ....", "left");
- $GUI->flushContent();
- sleep(5);
- $rescue = $vserver->setRescue();
- if($state[1] == "rescue")
- $rescue[0] == "Off" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
- else
- $rescue[0] == "On" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
- $GUI->flushContent();
-
- $GUI->div(_("starting")." ".$vserver->getName()." ....", "left");
- $GUI->flushContent();
- $dmesg = $vserver->controlStart();
- $on = $vserver->getState();
- $on == "Online" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
- $f = $GUI->fieldset(_("output"), "dmesg");
- foreach($dmesg as $msg)
- foreach(explode('<br />', $msg) as $line) {
- $GUI->addToElementID($f, $line."<br />");
- }
- $GUI->br();
- $GUI->flushContent();
-
- $state = $vserver->getFullState();
-
- if($state[1] == "rescue") {
- $password = createPassword(8);
- $vserver->controlSetupPassword($password[0]);
- $GUI->p(_("rescue root password for ssh is").": ".$password[0]);
- $GUI->p(_("system is booted into rescue mode"));
- $GUI->p(_("your vserver can be found in /vserver"));
- }
- else {
- $GUI->p(_("system is booted into normal mode"));
- }
- }
- else {
- $state = $vserver->getFullState();
- $f = $GUI->fieldset(_("rescue mode"));
-
- if($state[1] == "rescue") {
- $GUI->p(_("vserver is in rescue mode"), $f);
- $form = $GUI->form($f, "iptables_list", ($PARAMS[2] != "submit" ? $PARAMS[1] . "/submit" : "submit"));
- $div = $GUI->div("", null, $form);
- $GUI->addToElementID($div, _("current login pass").": ");
- $GUI->formAddInputElement($div, "password", "currentuserpass");
- $GUI->br($form);
- $GUI->formAddInputElement($form, "submit", "submit", _("boot into normal mode"));
- }
- else {
- $GUI->p(_("vserver is in normal mode"), $f);
- $form = $GUI->form($f, "iptables_list", ($PARAMS[2] != "submit" ? $PARAMS[1] . "/submit" : "submit"));
- $div = $GUI->div("", null, $form);
- $GUI->addToElementID($div, _("current login pass").": ");
- $GUI->formAddInputElement($div, "password", "currentuserpass");
- $GUI->br($form);
- $GUI->formAddInputElement($form, "submit", "submit", _("boot into rescue mode"));
- }
- }
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
}
-else if($PARAMS[0] != "" && $PARAMS[1] == "reinstall")
-{
- if($AUTH->getPrivileges('can_reinstall') != 'y')
- OpenVCP::gotoURL("user/denied/can_reinstall");
- if($vserver->isDisabled()) {
- $GUI->p(_("sorry this vserver is disabled"));
- exit();
- }
-
- $state = $vserver->getFullState();
- if($state[1] == "rescue")
- {
- $GUI->p(_("sorry vserver is in rescue mode reinstall not supported").".");
- exit();
- }
+$table = $GUI->table($GUI->fieldset(_("vserver")));
+$thead = $GUI->tableAddHead($table);
+$row = $GUI->tableAddRow($thead);
- if(($oslist = $CUSTOMER->getImages()) == null)
- {
- $osDD = $vserver->getNodeObject()->getImages();
- }
- else
- {
- foreach($oslist as $key=>$os) {
+$GUI->tableAddCol($row, _("name"), 1);
+$GUI->tableAddCol($row, _("state"), 1);
+$GUI->tableAddCol($row, _("action"), 1);
+$GUI->tableAddCol($row, _("load"), 1);
+$GUI->tableAddCol($row, _("uptime"), 1);
- if(is_numeric($key))
- $osDD[$os] = $os;
- else
- $osDD[$key] = $os;
- }
- }
-
- foreach($osDD as $key=>$value) $osDDn[htmlentities($key)] = htmlentities($value);
- $osDD = array_flip($osDDn);
-
- $_POST['image'] = htmlentities($_POST['image']);
-
- if($PARAMS[2] == "submit" && $vserver != null && isset($_POST['submit']) && in_array($_POST['image'], $osDD) && md5($_POST['currentuserpass']) == $USERINFO['password'])
- {
-
- $GUI->flushContent();
- $GUI->flushContent();
- $state = $vserver->getState();
- $offline = false;
- $LOG->logInfo(_("reinstalled vserver")." ".$PARAMS[0]." "._("with image")." ".$osDD[$_POST['image']]);
-
- if($state == "Offline")
- {
- $offline = true;
- }
- if($state == "Online")
- {
- $GUI->flushContent();
- $GUI->div(_("stopping vserver")." ".$PARAMS[0]."...", "left");
- $GUI->flushContent();
- $GUI->flushContent();
- $vserver->controlStop();
- sleep(2);
- $state = $vserver->getState();
-
- if($state == "Offline")
- {
- $GUI->div(_("ok"), "rightgreen");
- $GUI->flushContent();
- $GUI->flushContent();
- $offline = true;
- }
- else
- {
- $GUI->div(_("failed"), "rightred");
- $GUI->p(_("error starting vserver")." ".$PARAMS[0]."!");
- $GUI->p(_("please contact support")."!");
- $GUI->flushContent();
- $GUI->flushContent();
- $offline = false;
- $LOG->logError(_("reinstall of vserver failed: vserver didn't stop")." ".$PARAMS[0]);
- }
- $GUI->flushContent();
- }
- if($offline)
- {
- $GUI->div(_("reinstall vserver")." ".$PARAMS[0]."...", "left");
- $GUI->flushContent();
- $GUI->flushContent();
- sleep(1);
- $result = $vserver->controlSetupImage($_POST['image']);
- if($result == 1)
- {
- $GUI->div(_("ok"), "rightgreen");
- $GUI->div(_("starting vserver")." ".$PARAMS[0]."...", "left");
- $GUI->flushContent();
- $GUI->flushContent();
- $vserver->controlStart();
- $GUI->flushContent();
- $GUI->flushContent();
- $state = $vserver->getState();
- if($state == "Online")
- {
- $GUI->div(_("ok"), "rightgreen");
- $GUI->flushContent();
- $password = createPassword(8);
- $GUI->div(_("setting rootpassword")." ".$PARAMS[0]."...", "left");
- $GUI->flushContent();
- $vserver->controlSetupPassword($password[0]);
- $GUI->div(_("ok"), "rightgreen");
- $GUI->p(_("vserver")." ".$PARAMS[0]." "._("sucessfully reinstalled"));
- $GUI->p(_("new root password is").": ".$password[0]);
- }
- else
- {
- $GUI->div(_("failed"), "rightred");
- $GUI->p(_("error starting vserver")." ".$PARAMS[0]."!");
- $GUI->p(_("please contact support")."!");
- $GUI->flushContent();
- $LOG->logError(_("restart of vserver failed: vserver doesn't start after reinstall'")." ".$PARAMS[0]);
-
- }
- }
- else
- {
- $GUI->div(_("failed"), "rightred");
- $GUI->p(_("error reinstalling vserver")." ".$PARAMS[0]."!");
- $GUI->p(_("please contact support")."!");
- $GUI->flushContent();
- }
- }
- else
- {
- $GUI->p(_("sorry your request could not be performed")."!");
- $GUI->p(_("please contact support")."!");
- $GUI->flushContent();
- }
- }
- else if($vserver != null && !isset($_POST['submit']))
- {
-
- $f = $GUI->fieldset(_("reinstall vserver"));
- $form = $GUI->form($f, "vserver_reinstall", "reinstall/submit");
- $table = $GUI->table($form);
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("available images"),2);
- if($oslist != null) {
- $images = $ADMIN->getImagesExtended();
- foreach($images as $os) {
- $row = $GUI->tableAddRow($table);
- $GUI->formAddCheckElement($GUI->tableAddCol($row, ""), "radio", "image", $os['name']);
- if($os['alias'] != '')
- $GUI->tableAddCol($row, $os['alias']);
- else
- $GUI->tableAddCol($row, $os['name']);
- $GUI->tableAddCol($row, $os['text']);
- }
- }
- else
- $GUI->formAddDropdown($GUI->tableAddCol($row, "", 3), "image", $osDD);
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("current login pass").":", 2);
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
- $GUI->formAddInputElement($form, "submit", "submit", _("reinstall"));
- }
- else
- {
- $GUI->p(_("sorry your request could not be performed")."!");
- $GUI->p(_("did you insert your password")."?");
- $GUI->p(_("please contact support")."!");
- }
-}
-else if($PARAMS[0] != "" && $PARAMS[1] == "trafficlimit")
+foreach($vservers as $vs)
{
- if($vserver->isDisabled()) {
- $GUI->p(_("sorry this vserver is disabled"));
- exit();
- }
-
- $GUI->title(_("setting traffliclimits for vserver")." ".$PARAMS[0]);
- if($PARAMS[2] == "submit" && isset($_POST['submit']))
- {
-
- if(md5($_POST['currentuserpass']) == $USERINFO['password'])
- {
- if($_POST['limit_soft'] != "")
- $vserver->setTrafficLimit($_POST['limit_soft'], $USERINFO['email'], 'soft');
- if($_POST['limit_hard'] != "")
- $vserver->setTrafficLimit($_POST['limit_hard'], $USERINFO['email'], 'hard');
- $GUI->p(_("trafficlimit set"));
- $LOG->logInfo(_("changed hard trafficlimit of vserver")." ".$PARAMS[0]);
- }
- else
- {
- $GUI->p(_("current login passwords doesn't match"));
- }
- }
- if($PARAMS[2] == "submit" && isset($_POST['reset']))
- {
- if(md5($_POST['currentuserpass']) == $USERINFO['password'])
- {
- $vserver->delTrafficLimit('soft');
- $vserver->delTrafficLimit('hard');
- $GUI->p(_("trafficlimit deleted"));
- $LOG->logInfo(_("changed hard trafficlimit of vserver")." ".$PARAMS[0]);
- }
- else
- {
- $GUI->p(_("current login passwords doesn't match"));
- }
- }
-
- $trafficlimits = $vserver->getTrafficLimit();
- while($limit = $XML->getNextStruct($trafficlimits)) {
- if($limit['type'] == 'soft')
- $softlimits = $limit;
- if($limit['type'] == 'hard')
- $hardlimits = $limit;
- }
-
- $f = $GUI->fieldset(_("change hard trafficlimit"));
- $form = $GUI->form($f, "change_hard_trafficlimit", ($PARAMS[2] == "submit" ? "submit" : "trafficlimit/submit"));
- $table = $GUI->table($form);
$row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("soft limit")." [MB]: ");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "limit_soft", $softlimits['total']);
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("hard limit")." [MB]: ");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "limit_hard", $hardlimits['total']);
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("current login pass").": ");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
- $GUI->formAddInputElement($form, "submit", "submit", _("add/change"));
- $GUI->formAddInputElement($form, "submit", "reset", _("delete"));
+ $row = $GUI->tableAddCol($row, $vs->getName());
+ $GUI->img($GUI->tableAddCol($row, ""), ($vs->getState() == "Online") ? "green.png" : "red.png", true, ($vs->getState() == "Online") ? _("online") : _("offline"), 15, 15);
- $GUI->p(_("when the vserver hits the given traffic limit it will be automatically shut down and you will receive an email"));
-
- $GUI->p(_("mails will be sent to")." ".($softlimits['notify'] != "" ? $softlimits['notify'] : ($hardlimits['notify'] != "" ? $hardlimits['notify'] : $USERINFO['email'])));
-}
-else if($PARAMS[0] != "" && $PARAMS[1] == "change")
-{
- if($AUTH->getPrivileges('can_reset') != 'y')
- OpenVCP::gotoURL("user/denied/can_change_admin_pass");
-
- if($vserver->isDisabled()) {
- $GUI->p(_("sorry this vserver is disabled"));
- exit();
+ switch($vs->getLockState()) {
+ case 1 :
+ $GUI->tableAddCol($row, _("image setup"));
+ break;
+ case 2 :
+ $GUI->tableAddCol($row, _("set rescue"));
+ break;
+ case 3 :
+ $GUI->tableAddCol($row, _("create backup"));
+ break;
+ case 4 :
+ $GUI->tableAddCol($row, _("restore rescue"));
+ break;
+ default :
+ $GUI->tableAddCol($row, _("nothing"));
}
- if($vserver->getState() != "Online") {
- $GUI->p(_("sorry vserver is offline"));
- $GUI->p(_("operation not permitted"));
- exit();
- }
-
- $GUI->title(_("changing root password of")." ".$PARAMS[0]);
- if($PARAMS[2] == "submit" && isset($_POST['submit']))
- {
-
- if(md5($_POST['currentuserpass']) == $USERINFO['password'])
- {
- if($vserver->controlSetupPassword($_POST['newrootpass']) == 1) {
- $GUI->p(_("password successfully changed"));
- $LOG->logInfo(_("changed root password of vserver")." ".$PARAMS[0]);
- }
- else {
- $GUI->p(_("error setting new rootpassword"));
- }
- }
- else
- {
- $GUI->p(_("current login pass doesn't match"));
- }
- }
-
- $f = $GUI->fieldset(_("change root password"));
- $form = $GUI->form($f, "change_root_password", ($PARAMS[1] == "submit" ? "submit" : "change/submit"));
- $table = $GUI->table($form);
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("new root password").":");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "newrootpass");
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("current login pass").":");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
- $GUI->formAddInputElement($form, "submit", "submit", _("set"));
+ $GUI->tableAddCol($row, $vs->getLoad(true));
+ $GUI->tableAddCol($row, $vs->getUptime(true));
}
-else if($PARAMS[0] != "" && $PARAMS[1] == "hostname")
-{
- if($vserver->isDisabled()) {
- $GUI->p(_("sorry this vserver is disabled"));
- exit();
- }
-
- $GUI->title(_("change hostname of")." ".$PARAMS[0]);
- if($PARAMS[2] == "submit" && isset($_POST['submit']))
- {
- if(md5($_POST['currentuserpass']) == $USERINFO['password'])
- {
- $vserver->setHostname($_POST['hostname']);
- $GUI->p(_("hostname successfully changed"));
- $GUI->p(_("you have to restart your vserver in order to complete the change"));
- $LOG->logInfo(_("chanched hostname of vserver")." ".$PARAMS[0]);
- }
- else
- {
- $GUI->p(_("current login pass doesn't match"));
- }
- }
- $f = $GUI->fieldset(_("change hostname"));
- $form = $GUI->form($f, "change_hostname", ($PARAMS[2] == "submit" ? "submit" : "hostname/submit"));
- $table = $GUI->table($form);
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("current hostname").":");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "hostname", $vserver->getHostname());
- $row = $GUI->tableAddRow($table);
- $GUI->tableAddCol($row, _("current login pass").":");
- $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
- $GUI->formAddInputElement($form, "submit", "submit", _("set"));
-}
-else
-{
- $table = $GUI->table($GUI->fieldset(_("vserver")));
- $thead = $GUI->tableAddHead($table);
- $row = $GUI->tableAddRow($thead);
-
- $GUI->tableAddCol($row, _("name"), 1);
- $GUI->tableAddCol($row, _("state"), 1);
- $GUI->tableAddCol($row, _("load"), 1);
- $GUI->tableAddCol($row, _("uptime"), 1);
-
- foreach($vservers as $vs)
- {
- $row = $GUI->tableAddRow($table);
- $row = $GUI->tableAddCol($row, $vs->getName());
- $GUI->img($GUI->tableAddCol($row, ""), ($vs->getState() == "Online") ? "green.png" : "red.png", true, ($vs->getState() == "Online") ? _("online") : _("offline"), 15, 15);
- $GUI->tableAddCol($row, $vs->getLoad(true));
- $GUI->tableAddCol($row, $vs->getUptime(true));
- }
-}
?>
Added: trunk/webinterface/mods/user/control/power.php
===================================================================
--- trunk/webinterface/mods/user/control/power.php (rev 0)
+++ trunk/webinterface/mods/user/control/power.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,174 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+if($AUTH->getPrivileges('can_reset') != 'y')
+OpenVCP::gotoURL("user/denied/can_restart");
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+$state = $vserver->getState();
+
+if($PARAMS[1] == "submit" && (isset($_POST['restart']) || isset($_POST['start']) || isset($_POST['stop'])) && $vserver != null)
+{
+ $GUI->flushContent();
+ if(isset($_POST['restart']) || isset($_POST['stop'])) {
+ $LOG->logInfo(_("restarted vserver")." ".$vserver->getName());
+ $i = 0;
+ do {
+ $GUI->div(_("stopping vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStop();
+ $state = $vserver->getState();
+ if($state == "Offline") {
+ $GUI->div(_("ok"), "rightgreen");
+ }
+ else {
+ $GUI->div(_("failed"), "rightred");
+ }
+ $GUI->flushContent();
+ $i++;
+ } while ($state != "Offline" && $i < 10);
+
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ }
+ else
+ $LOG->logInfo(_("started vserver")." ".$vserver->getName());
+
+ if(!isset($_POST['stop']))
+ {
+ if($state == "Offline")
+ {
+ $GUI->flushContent();
+ $GUI->div(_("starting vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStart();
+ $state = $vserver->getState();
+ if($state == "Online")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->p(_("vserver")." ".$vserver->getName()." "._("sucessfully started"));
+ $GUI->flushContent();
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ if(isset($_POST['restart']))
+ $LOG->logError(_("restart of vserver failed: vserver doesn't start after stop'")." ".$vserver->getName());
+ else
+ $LOG->logError(_("start of vserver failed: vserver doesn't start'")." ".$vserver->getName());
+ }
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("error stopping vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $LOG->logError(_("reinstall of vserver failed: vserver didn't stop")." ".$vserver->getName());
+ $GUI->flushContent();
+ }
+ }
+}
+else if($vserver != null)
+{
+ $f = $GUI->fieldset(_("control vserver"));
+ $form = $GUI->form($f, "restart_vserver", $vserver->getName()."/submit");
+ if($state == "Online") {
+ $GUI->p(_("vserver")." ".$vserver->getName()." "._("is online")."!", $form);
+ $GUI->p(_("should this veserver be restarted")."?", $form);
+ $GUI->formAddInputElement($form, "submit", "restart", _("restart"));
+ $GUI->p(_("should this veserver be stoped")."?", $form);
+ $GUI->formAddInputElement($form, "submit", "stop", _("stop"));
+ }
+ else {
+ $GUI->p(_("vserver")." ".v." "._("is offline")."!", $f);
+ $GUI->p(_("should this veserver be started")."?", $f);
+ $form = $GUI->form($f, "start_vserver", $vserver->getName()."/submit");
+ $GUI->formAddInputElement($form, "submit", "start", _("start"));
+ }
+}
+else
+{
+ $GUI->p(_("sorry your request could not be performed")."!");
+ $GUI->p(_("please contact support")."!");
+}
+?>
\ No newline at end of file
Added: trunk/webinterface/mods/user/control/reinstall.php
===================================================================
--- trunk/webinterface/mods/user/control/reinstall.php (rev 0)
+++ trunk/webinterface/mods/user/control/reinstall.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,229 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+if($AUTH->getPrivileges('can_reinstall') != 'y')
+ OpenVCP::gotoURL("user/denied/can_reinstall");
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+$state = $vserver->getFullState();
+if($state[1] == "rescue")
+{
+ $GUI->p(_("sorry vserver is in rescue mode reinstall not supported").".");
+ exit();
+}
+
+if(($oslist = $CUSTOMER->getImages()) == null)
+{
+ $osDD = $vserver->getNodeObject()->getImages();
+}
+else
+{
+ foreach($oslist as $key=>$os) {
+
+ if(is_numeric($key))
+ $osDD[$os] = $os;
+ else
+ $osDD[$key] = $os;
+ }
+}
+
+foreach($osDD as $key=>$value) $osDDn[htmlentities($key)] = htmlentities($value);
+$osDD = array_flip($osDDn);
+
+$_POST['image'] = htmlentities($_POST['image']);
+
+if($PARAMS[1] == "submit" && $vserver != null && isset($_POST['submit']) && in_array($_POST['image'], $osDD) && md5($_POST['currentuserpass']) == $USERINFO['password'])
+{
+
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $state = $vserver->getState();
+ $offline = false;
+ $LOG->logInfo(_("reinstalled vserver")." ".$vserver->getName()." "._("with image")." ".$osDD[$_POST['image']]);
+
+ if($state == "Offline")
+ {
+ $offline = true;
+ }
+ if($state == "Online")
+ {
+ $GUI->flushContent();
+ $GUI->div(_("stopping vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $vserver->controlStop();
+ sleep(2);
+ $state = $vserver->getState();
+
+ if($state == "Offline")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $offline = true;
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $offline = false;
+ $LOG->logError(_("reinstall of vserver failed: vserver didn't stop")." ".$vserver->getName());
+ }
+ $GUI->flushContent();
+ }
+ if($offline)
+ {
+ $GUI->div(_("reinstall vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ sleep(1);
+ $result = $vserver->controlSetupImage($_POST['image']);
+ if($result == 1)
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->div(_("starting vserver")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $vserver->controlStart();
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $state = $vserver->getState();
+ if($state == "Online")
+ {
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->flushContent();
+ $password = createPassword(8);
+ $GUI->div(_("setting rootpassword")." ".$vserver->getName()."...", "left");
+ $GUI->flushContent();
+ $vserver->controlSetupPassword($password[0]);
+ $GUI->div(_("ok"), "rightgreen");
+ $GUI->p(_("vserver")." ".$vserver->getName()." "._("sucessfully reinstalled"));
+ $GUI->p(_("new root password is").": ".$password[0]);
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("reason").": ".$state);
+ $GUI->p(_("error starting vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ $LOG->logError(_("restart of vserver failed: vserver doesn't start after reinstall'")." ".$vserver->getName());
+
+ }
+ }
+ else
+ {
+ $GUI->div(_("failed"), "rightred");
+ $GUI->p(_("error reinstalling vserver")." ".$vserver->getName()."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+ }
+ else
+ {
+ $GUI->p(_("sorry your request could not be performed")."!");
+ $GUI->p(_("please contact support")."!");
+ $GUI->flushContent();
+ }
+}
+else if($vserver != null && !isset($_POST['submit']))
+{
+
+ $f = $GUI->fieldset(_("reinstall vserver"));
+ $form = $GUI->form($f, "vserver_reinstall", ($PARAMS[1] != "submit" ? $PARAMS[0] . "/submit" : "submit"));
+ $table = $GUI->table($form);
+ $row = $GUI->tableAddRow($table);
+ $GUI->tableAddCol($row, _("available images"),2);
+ if($oslist != null) {
+ $images = $ADMIN->getImagesExtended();
+ foreach($images as $os) {
+ $row = $GUI->tableAddRow($table);
+ $GUI->formAddCheckElement($GUI->tableAddCol($row, ""), "radio", "image", $os['name']);
+ if($os['alias'] != '')
+ $GUI->tableAddCol($row, $os['alias']);
+ else
+ $GUI->tableAddCol($row, $os['name']);
+ $GUI->tableAddCol($row, $os['text']);
+ }
+ }
+ else
+ $GUI->formAddDropdown($GUI->tableAddCol($row, "", 3), "image", $osDD);
+ $row = $GUI->tableAddRow($table);
+ $GUI->tableAddCol($row, _("current login pass").":", 2);
+ $GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
+ $GUI->formAddInputElement($form, "submit", "submit", _("reinstall"));
+}
+else
+{
+ $GUI->p(_("sorry your request could not be performed")."!");
+ $GUI->p(_("did you insert your password")."?");
+ $GUI->p(_("please contact support")."!");
+}
+
+?>
\ No newline at end of file
Added: trunk/webinterface/mods/user/control/rescue.php
===================================================================
--- trunk/webinterface/mods/user/control/rescue.php (rev 0)
+++ trunk/webinterface/mods/user/control/rescue.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,158 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+if($AUTH->getPrivileges('can_reset') != 'y')
+ OpenVCP::gotoURL("user/denied/can_restart");
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+if($PARAMS[1] == "submit" && md5($_POST['currentuserpass']) == $USERINFO['password']) {
+
+ $state = $vserver->getFullState();
+ if($state[0] == "Online")
+ {
+ $GUI->div(_("stopping")." ".$vserver->getName()." ....", "left");
+ $GUI->flushContent();
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStop();
+ $off = $vserver->getState();
+ $off == "Offline" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->br();
+ $GUI->flushContent();
+ }
+ if($off == "Online")
+ exit;
+
+ if($state[1] == "rescue")
+ $GUI->div(_("switching to normal system")." ".$vserver->getName()." ....", "left");
+ else
+ $GUI->div(_("switching to rescue system")." ".$vserver->getName()." ....", "left");
+ $GUI->flushContent();
+ sleep(5);
+ $rescue = $vserver->setRescue();
+ if($state[1] == "rescue")
+ $rescue[0] == "Off" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
+ else
+ $rescue[0] == "On" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
+ $GUI->flushContent();
+
+ $GUI->div(_("starting")." ".$vserver->getName()." ....", "left");
+ $GUI->flushContent();
+ $dmesg = $vserver->controlStart();
+ $on = $vserver->getState();
+ $on == "Online" ? $GUI->div(_("ok"), "rightgreen") : $GUI->div(_("failed"), "rightred");
+ $f = $GUI->fieldset(_("output"), "dmesg");
+ foreach($dmesg as $msg)
+ foreach(explode('<br />', $msg) as $line) {
+ $GUI->addToElementID($f, $line."<br />");
+ }
+ $GUI->br();
+ $GUI->flushContent();
+
+ $state = $vserver->getFullState();
+
+ if($state[1] == "rescue") {
+ $password = createPassword(8);
+ $vserver->controlSetupPassword($password[0]);
+ $GUI->p(_("rescue root password for ssh is").": ".$password[0]);
+ $GUI->p(_("system is booted into rescue mode"));
+ $GUI->p(_("your vserver can be found in /vserver"));
+ }
+ else {
+ $GUI->p(_("system is booted into normal mode"));
+ }
+}
+else {
+ $state = $vserver->getFullState();
+ $f = $GUI->fieldset(_("rescue mode"));
+ if(isset($_POST['currentuserpass']) && md5($_POST['currentuserpass']) != $USERINFO['password'])
+ {
+ $GUI->p(_("password incorrect"), $f);
+ }
+ if($state[1] == "rescue") {
+ $GUI->p(_("vserver is in rescue mode"), $f);
+ $form = $GUI->form($f, "iptables_list", ($PARAMS[1] != "submit" ? $PARAMS[0] . "/submit" : "submit"));
+ $div = $GUI->div("", null, $form);
+ $GUI->addToElementID($div, _("current login pass").": ");
+ $GUI->formAddInputElement($div, "password", "currentuserpass");
+ $GUI->br($form);
+ $GUI->formAddInputElement($form, "submit", "submit", _("boot into normal mode"));
+ }
+ else {
+ $GUI->p(_("vserver is in normal mode"), $f);
+ $form = $GUI->form($f, "iptables_list", ($PARAMS[1] != "submit" ? $PARAMS[0] . "/submit" : "submit"));
+ $div = $GUI->div("", null, $form);
+ $GUI->addToElementID($div, _("current login pass").": ");
+ $GUI->formAddInputElement($div, "password", "currentuserpass");
+ $GUI->br($form);
+ $GUI->formAddInputElement($form, "submit", "submit", _("boot into rescue mode"));
+ }
+}
+
+?>
\ No newline at end of file
Added: trunk/webinterface/mods/user/control/trafficlimit.php
===================================================================
--- trunk/webinterface/mods/user/control/trafficlimit.php (rev 0)
+++ trunk/webinterface/mods/user/control/trafficlimit.php 2009-07-18 15:44:24 UTC (rev 675)
@@ -0,0 +1,131 @@
+<?php
+/**
+ * OpenVCP Webinterface
+ * Copyright (C) 2006 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 Oliver Werner / OpenVCP Team
+ * @version 0.4.0.1
+ * @package OpenVCP-v0.4
+ */
+$AUTH =& OpenVCP::call('Auth', 'getReference');
+$GUI =& OpenVCP::call('GUI' , 'getReference');
+$LOG =& OpenVCP::call('Log', 'getReference');
+$XML =& OpenVCP::call('XML', 'getReference');
+$PARAMS =& OpenVCP::getParams();
+$USERINFO = $AUTH->user_information;
+$LOG->setUserId($USERINFO['id']);
+$LOG->setLevel('user');
+
+set_include_path(OPENVCP_ROOT_DIR."/core");
+require_once("CustomerFactory.class.php");
+require_once('AdminFactory.class.php');
+require_once('VserverFactory.class.php');
+$CUSTOMER = CustomerFactory::getInstance()->getUserByID($USERINFO['id']);
+$ADMIN = AdminFactory::getInstance()->getUserByID($CUSTOMER->getAdminId());
+
+$GUI->addContentMenuHead(_("control"));
+$vservers = VserverFactory::getInstance()->getVServersOfUser($USERINFO['id']);
+foreach($vservers as $vserver)
+{
+ $GUI->addContentMenuHead($vserver->getName(), 3, 1);
+ if($AUTH->getPrivileges('can_reset') == 'y')
+ $GUI->addContentMenuSub("power/".$vserver->getName(), _("control"), 2);
+ if($AUTH->getPrivileges('can_reinstall') == 'y')
+ {
+ $GUI->addContentMenuSub("rescue/".$vserver->getName(), _("rescue"), 2);
+ $GUI->addContentMenuSub("reinstall/".$vserver->getName(), _("reinstall"), 2);
+ $GUI->addContentMenuSub("hostname/".$vserver->getName(), _("hostname"), 2);
+ $GUI->addContentMenuSub("change/".$vserver->getName(), _("root password"), 2);
+ }
+ $GUI->addContentMenuSub("trafficlimit/".$vserver->getName(), _("trafficlimit"), 2);
+ if($vserver->getBackupLimit() > 0) {
+ $GUI->addContentMenuSub("backups/".$vserver->getName(), _("backups"), 2);
+ }
+}
+if($PARAMS[0] != "debug" && isset($PARAMS[0])) {
+ $vserver = VserverFactory::getInstance()->getVserverByNameAndUser($PARAMS[0], $USERINFO['id']);
+}
+
+
+if($vserver->isDisabled()) {
+ $GUI->p(_("sorry this vserver is disabled"));
+ exit();
+}
+
+$GUI->title(_("setting traffliclimits for vserver")." ".$vserver->getName());
+
+if($PARAMS[1] == "submit" && isset($_POST['submit']))
+{
+
+ if(md5($_POST['currentuserpass']) == $USERINFO['password'])
+ {
+ if($_POST['limit_soft'] != "")
+ $vserver->setTrafficLimit($_POST['limit_soft'], $USERINFO['email'], 'soft');
+ if($_POST['limit_hard'] != "")
+ $vserver->setTrafficLimit($_POST['limit_hard'], $USERINFO['email'], 'hard');
+ $GUI->p(_("trafficlimit set"));
+ $LOG->logInfo(_("changed hard trafficlimit of vserver")." ".$vserver->getName());
+ }
+ else
+ {
+ $GUI->p(_("current login passwords doesn't match"));
+ }
+}
+if($PARAMS[1] == "submit" && isset($_POST['reset']))
+{
+ if(md5($_POST['currentuserpass']) == $USERINFO['password'])
+ {
+ $vserver->delTrafficLimit('soft');
+ $vserver->delTrafficLimit('hard');
+ $GUI->p(_("trafficlimit deleted"));
+ $LOG->logInfo(_("changed hard trafficlimit of vserver")." ".$vserver->getName());
+ }
+ else
+ {
+ $GUI->p(_("current login passwords doesn't match"));
+ }
+}
+
+$trafficlimits = $vserver->getTrafficLimit();
+while($limit = $XML->getNextStruct($trafficlimits)) {
+ if($limit['type'] == 'soft')
+ $softlimits = $limit;
+ if($limit['type'] == 'hard')
+ $hardlimits = $limit;
+}
+
+$f = $GUI->fieldset(_("change hard trafficlimit"));
+$form = $GUI->form($f, "change_hard_trafficlimit", ($PARAMS[1] == "submit" ? "submit" : $vserver->getName()."/submit"));
+$table = $GUI->table($form);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("soft limit")." [MB]: ");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "limit_soft", $softlimits['total']);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("hard limit")." [MB]: ");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "input", "limit_hard", $hardlimits['total']);
+$row = $GUI->tableAddRow($table);
+$GUI->tableAddCol($row, _("current login pass").": ");
+$GUI->formAddInputElement($GUI->tableAddCol($row, ""), "password", "currentuserpass");
+$GUI->formAddInputElement($form, "submit", "submit", _("add/change"));
+$GUI->formAddInputElement($form, "submit", "reset", _("delete"));
+
+$GUI->p(_("when the vserver hits the given traffic limit it will be automatically shut down and you will receive an email"));
+
+$GUI->p(_("mails will be sent to")." ".($softlimits['notify'] != "" ? $softlimits['notify'] : ($hardlimits['notify'] != "" ? $hardlimits['notify'] : $USERINFO['email'])));
+
+
+?>
\ No newline at end of file
More information about the Commits
mailing list