From f8cd54a46857c5bf461e85eaf9ac727c38de5936 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 14 Mar 2011 20:21:13 +0000
Subject: [PATCH] variables.inc.php: - cleanup: move some vars to password.php
 and users/password.php - drop $pPassword_admin_text - was always empty

password.php, users/password.php:
- init $pPassword_password_text and $pPassword_password_current_text
  (previously in variables.inc.php)

templates/password.tpl, templates/users_password.tpl:
- drop $pPassword_admin_text - was always empty

These changes should also fix some undefined variable warnings reported
by makomi on IRC.


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

diff --git a/password.php b/password.php
index f623a60d..03eab9a0 100644
--- a/password.php
+++ b/password.php
@@ -36,6 +36,9 @@ $SESSID_USERNAME = authentication_get_username();
 $smarty->assign ('SESSID_USERNAME', $SESSID_USERNAME);
 $smarty->assign ('smarty_template', 'password');
 
+$pPassword_password_current_text = "";
+$pPassword_password_text = "";
+
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
 	$smarty->display ('index.tpl');
diff --git a/templates/password.tpl b/templates/password.tpl
index 63ff7528..5f1bdde1 100644
--- a/templates/password.tpl
+++ b/templates/password.tpl
@@ -1,4 +1,3 @@
-{* pPassword_admin_text nicht gesetzt *}
 <div id="edit_form">
 <form name="mailbox" method="post" action="">
 <table>
@@ -8,7 +7,7 @@
 	<tr>
 		<td>{$PALANG.pPassword_admin}:</td>
 		<td>{$SESSID_USERNAME}</td>
-		<td>{$pPassword_admin_text}</td>
+		<td>&nbsp;</td>
 	</tr>
 	<tr>
 		<td>{$PALANG.pPassword_password_current}</td>
diff --git a/templates/users_password.tpl b/templates/users_password.tpl
index e1fec8cf..d7773433 100644
--- a/templates/users_password.tpl
+++ b/templates/users_password.tpl
@@ -1,4 +1,3 @@
-{* pPassword_admin_text nicht gesetzt *}
 <div id="edit_form">
 <form name="alias" method="post" action="">
 <table>
@@ -8,7 +7,7 @@
 	<tr>
 		<td>{$PALANG.pPassword_admin}:</td>
 		<td>{$USERID_USERNAME}</td>
-		<td>{$pPassword_admin_text}</td>
+		<td>&nbsp;</td>
 	</tr>
 	<tr>
 		<td>{$PALANG.pPassword_password_current}:</td>
diff --git a/users/password.php b/users/password.php
index ab144d61..3c8eb44e 100644
--- a/users/password.php
+++ b/users/password.php
@@ -32,6 +32,9 @@ require_once('../common.php');
 authentication_require_role('user');
 $username = authentication_get_username();
 
+$pPassword_password_text = "";
+$pPassword_password_current_text = "";
+
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
     if(isset($_POST['fCancel'])) {
@@ -74,7 +77,6 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 }
 
 $smarty->assign ('USERID_USERNAME', $username);
-//$smarty->assign ('pPassword_admin_text', $pPassword_admin_text);
 $smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text, false);
 $smarty->assign ('pPassword_password_text', $pPassword_password_text, false);
 $smarty->assign ('tMessage', $tMessage, false);
diff --git a/variables.inc.php b/variables.inc.php
index 910b24c4..6e39863b 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -91,9 +91,6 @@ $pCreate_mailbox_username_text = "&nbsp;";
 $pEdit_mailbox_password_text = "&nbsp;";
 $pEdit_mailbox_quota_text = "&nbsp;";
 $pEdit_mailbox_username_text = "&nbsp;";
-$pPassword_admin_text = "&nbsp;";
-$pPassword_password_current_text = "&nbsp;";
-$pPassword_password_text = "&nbsp;";
 
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 ?>