From e4c76696de41c4721223fd6b361782f9f68d9c49 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 25 Jul 2011 23:49:58 +0000
Subject: [PATCH] edit-mailbox.php, edit-mailbox.tpl, variables.inc.php -
 removed always empty variable $pEdit_mailbox_password_text - replaced
 "static" variable $pEdit_mailbox_quota_text with its   PALANG content in the
 template

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1133 a1433add-5e2c-0410-b055-b7f2511e0802
---
 edit-mailbox.php           | 3 ---
 templates/edit-mailbox.tpl | 4 ++--
 variables.inc.php          | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/edit-mailbox.php b/edit-mailbox.php
index af9dd615..44b0a338 100644
--- a/edit-mailbox.php
+++ b/edit-mailbox.php
@@ -46,7 +46,6 @@ $fUsername = strtolower ($fUsername);
 if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
 
 $pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
-$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
 $pEdit_mailbox_quota_text_error = "";
 
 if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
@@ -175,12 +174,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 }
 
 $smarty->assign ('fUsername', $fUsername);
-$smarty->assign ('pEdit_mailbox_password_text', $pEdit_mailbox_password_text, false);
 $smarty->assign ('tName', $tName, false);
 $smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text,false);
 $smarty->assign ('tMaxquota', $tMaxquota);
 $smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pEdit_mailbox_quota_text', $pEdit_mailbox_quota_text);
 $smarty->assign ('pEdit_mailbox_quota_text_error', $pEdit_mailbox_quota_text_error);
 if ($tActive)	$smarty->assign ('tActive', ' checked="checked"');
 $smarty->assign ('smarty_template', 'edit-mailbox');
diff --git a/templates/edit-mailbox.tpl b/templates/edit-mailbox.tpl
index d1e6d869..64fd4be0 100644
--- a/templates/edit-mailbox.tpl
+++ b/templates/edit-mailbox.tpl
@@ -14,7 +14,7 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pEdit_mailbox_password_text}</td>
+		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
@@ -33,7 +33,7 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_quota} (max: {$tMaxquota}):</label></td>
 		<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
-		<td>{$pEdit_mailbox_quota_text}</td>
+		<td>{$PALANG.pEdit_mailbox_quota_text}</td>
 		<td>{$pEdit_mailbox_quota_text_error}</td>
 	</tr>
 {/if}
diff --git a/variables.inc.php b/variables.inc.php
index 8364dd69..49b5283f 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -76,8 +76,5 @@ $tSubject = "";
 $tUsername = "";
 $tTransport = "";
 
-$pEdit_mailbox_password_text = "&nbsp;";
-$pEdit_mailbox_quota_text = "&nbsp;";
-
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 ?>