mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
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
This commit is contained in:
parent
5c9e2e772a
commit
f8cd54a468
@ -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');
|
||||
|
@ -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> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{$PALANG.pPassword_password_current}</td>
|
||||
|
@ -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> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{$PALANG.pPassword_password_current}:</td>
|
||||
|
@ -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);
|
||||
|
@ -91,9 +91,6 @@ $pCreate_mailbox_username_text = " ";
|
||||
$pEdit_mailbox_password_text = " ";
|
||||
$pEdit_mailbox_quota_text = " ";
|
||||
$pEdit_mailbox_username_text = " ";
|
||||
$pPassword_admin_text = " ";
|
||||
$pPassword_password_current_text = " ";
|
||||
$pPassword_password_text = " ";
|
||||
|
||||
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user