SF.net SVN: postfixadmin:[1004] trunk

[<chr...@us...>]

Revision: 1004
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1004&view=rev
Author:   christian_boltz
Date:     2011-03-14 20:21:13 +0000 (Mon, 14 Mar 2011)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/password.php
    trunk/templates/password.tpl
    trunk/templates/users_password.tpl
    trunk/users/password.php
    trunk/variables.inc.php

Modified: trunk/password.php
===================================================================
--- trunk/password.php	2011-03-14 19:31:10 UTC (rev 1003)
+++ trunk/password.php	2011-03-14 20:21:13 UTC (rev 1004)
@@ -36,6 +36,9 @@
 $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');

Modified: trunk/templates/password.tpl
===================================================================
--- trunk/templates/password.tpl	2011-03-14 19:31:10 UTC (rev 1003)
+++ trunk/templates/password.tpl	2011-03-14 20:21:13 UTC (rev 1004)
@@ -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>

Modified: trunk/templates/users_password.tpl
===================================================================
--- trunk/templates/users_password.tpl	2011-03-14 19:31:10 UTC (rev 1003)
+++ trunk/templates/users_password.tpl	2011-03-14 20:21:13 UTC (rev 1004)
@@ -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>

Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php	2011-03-14 19:31:10 UTC (rev 1003)
+++ trunk/users/password.php	2011-03-14 20:21:13 UTC (rev 1004)
@@ -32,6 +32,9 @@
 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 @@
 }
 
 $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);

Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php	2011-03-14 19:31:10 UTC (rev 1003)
+++ trunk/variables.inc.php	2011-03-14 20:21:13 UTC (rev 1004)
@@ -91,9 +91,6 @@
 $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: */
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.