From c986c08cfbda074e9cfe36cb97d54bde76086f3b Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sat, 23 Mar 2013 08:59:20 +0100
Subject: [PATCH] switching users if the user is deactivated lead to a redirect
 to the login-screen with an undefined variable, just showing a message that
 the user is deactivated now

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 admin_customers.php | 3 +++
 lng/english.lng.php | 6 +++---
 lng/german.lng.php  | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/admin_customers.php b/admin_customers.php
index 73102ceb..53b165a6 100644
--- a/admin_customers.php
+++ b/admin_customers.php
@@ -133,6 +133,9 @@ if($page == 'customers'
 
 		if($destination_user != '')
 		{
+			if ($result['deactivated'] == '1') {
+				standard_error("usercurrentlydeactivated", $destination_user);
+			}
 			$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid`='" . (int)$userinfo['userid'] . "' AND `hash`='" . $db->escape($s) . "'");
 			$s = md5(uniqid(microtime(), 1));
 			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$id . "', '" . $db->escape($result['ipaddress']) . "', '" . $db->escape($result['useragent']) . "', '" . time() . "', '" . $db->escape($result['language']) . "', '0')");
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 1c50e40a..82902207 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1921,8 +1921,8 @@ $lng['serversettings']['enablewebfonts']['description'] = 'If enabled, the defin
 $lng['serversettings']['definewebfont']['title'] = 'Define a <a href="http://www.google.com/webfonts" rel="external">google-webfont</a> for the panel';
 $lng['serversettings']['definewebfont']['description'] = 'If enabled, this wefont will be used for the font-display.<br />Note: replace spaces with the "+" sign, e.g. "Open+Sans"';
 
-/*
- * Added in Froxlor 0.9.28-rc2
- */
+// Added in Froxlor 0.9.28-rc2
 $lng['serversettings']['documentroot_use_default_value']['title'] = 'Use domain name as default value for DocumentRoot path';
 $lng['serversettings']['documentroot_use_default_value']['description'] = 'If enabled and DocumentRoot path is empty, default value will be the (sub)domain name.<br /><br />Examples: <br />/var/customers/customer_name/example.com/<br />/var/customers/customer_name/subdomain.example.com/';
+
+$lng['error']['usercurrentlydeactivated'] = 'The user %s is currently deactivated';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index b33dcab5..91ddf760 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1645,3 +1645,9 @@ $lng['serversettings']['enablewebfonts']['title'] = 'Verwende Google Webfonts im
 $lng['serversettings']['enablewebfonts']['description'] = 'Wenn aktiviert, wird die angegebene Google-Schriftart eingebunden und verwendet';
 $lng['serversettings']['definewebfont']['title'] = '<a href="http://www.google.com/webfonts" rel="external">Google Webfont</a> festlegen';
 $lng['serversettings']['definewebfont']['description'] = 'Wenn aktiviert, wird diese Schriftart im Panel verwendet.<br />Hinweis: Leerzeichen bitte mit einem "+" ersetzen, z.B. "Open+Sans"';
+
+// Added in Froxlor 0.9.28-rc2
+$lng['serversettings']['documentroot_use_default_value']['title'] = 'Verwende Domain-Namen im Documentroot';
+$lng['serversettings']['documentroot_use_default_value']['description'] = 'Wenn aktiviert wird dem standard Documentroot zusätzlich der Domain-Name angehängt.<br /><br />Beispiel:<br />/var/customers/customer_name/example.com/<br />/var/customers/customer_name/subdomain.example.com/';
+
+$lng['error']['usercurrentlydeactivated'] = 'Der Benutzer %s ist derzeit deaktiviert';