webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-12-05 11:22:03 +03:00
Code Activity

create-admin.php

Browse Source 
- renamed $pAdminCreate_admin_username_text to $pAdminCreate_admin_username_text_error
- renamed $pAdminCreate_admin_password_text to $pAdminCreate_admin_password_text_error
- replaced $tMessage with $infoMessage (displayed via flash_info)
- additional change compared to Dale's patch: removed unused variable 
  $pAdminCreate_admin_username_text

variables.inc.php:
- removed now unused variables $pAdminCreate_admin_password_text and
  $pAdminCreate_admin_username_text

templates/admin_create-admin.tpl:
- added 4th column for error messages
- replaced <h3> with <th>
- marked labels with <label>
- align button with input fields
- remove tMessage

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1099 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2011-07-20 23:19:17 +00:00
parent 1786099b17
commit 310d22bb6e
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
create-admin.php
View File

@@ -19,7 +19,6 @@
*
* Template Variables:
*
* tMessage
* tUsername
* tDomains
*
@@ -36,10 +35,11 @@ require_once('common.php');
authentication_require_role('global-admin');
$list_domains = list_domains ();
$tDomains = array();
$pAdminCreate_admin_username_text_error = "";
$pAdminCreate_admin_password_text_error = "";
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
$pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
$tDomains = array ();
}
@@ -50,18 +50,22 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
$fDomains = array();
if (!empty ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
list ($error, $infoMessage, $pAdminCreate_admin_username_text_error, $pAdminCreate_admin_password_text_error) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
if ($error != 0) {
if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
}
if(!empty($infoMessage))
flash_info($infoMessage);
}
$smarty->assign ('tUsername', $tUsername);
$smarty->assign ('pAdminCreate_admin_username_text', $pAdminCreate_admin_username_text, false);
$smarty->assign ('pAdminCreate_admin_password_text', $pAdminCreate_admin_password_text, false);
$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('pAdminCreate_admin_username_text', $PALANG['pAdminCreate_admin_username_text'], false);
$smarty->assign ('pAdminCreate_admin_username_text_error', $pAdminCreate_admin_username_text_error, false);
$smarty->assign ('pAdminCreate_admin_password_text_error', $pAdminCreate_admin_password_text_error, false);
$smarty->assign ('select_options', select_options ($list_domains, $tDomains), false);
$smarty->assign ('smarty_template', 'admin_create-admin');

25
templates/admin_create-admin.tpl
View File

@@ -2,35 +2,36 @@
<form name="create_admin" method="post" action="">
<table>
<tr>
<td colspan="3"><h3>{$PALANG.pAdminCreate_admin_welcome}</h3></td>
<th colspan="4">{$PALANG.pAdminCreate_admin_welcome}</th>
</tr>
<tr>
<td>{$PALANG.pAdminCreate_admin_username}:</td>
<td class="label"><label>{$PALANG.pAdminCreate_admin_username}:</label></td>
<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
<td>{$pAdminCreate_admin_username_text}</td>
<td><span class="error_msg">{$pAdminCreate_admin_username_text_error}</span></td>
</tr>
<tr>
<td>{$PALANG.pAdminCreate_admin_password}:</td>
<td class="label"><label>{$PALANG.pAdminCreate_admin_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
<td>{$pAdminCreate_admin_password_text}</td>
<td>&nbsp;</td>
<td><span class="error_msg">{$pAdminCreate_admin_password_text_error}</span></td>
</tr>
<tr>
<td>{$PALANG.pAdminCreate_admin_password2}:</td>
<td class="label"><label>{$PALANG.pAdminCreate_admin_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" /></td>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td>{$PALANG.pAdminCreate_admin_address}:</td>
<td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
<td>
<select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
</td>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
</tr>
<tr>
<td colspan="3" class="standout">{$tMessage}</td>
<td>&nbsp;</td>
<td><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
<td colspan="2">&nbsp;</td>
</tr>
</table>
</form>

2
variables.inc.php
View File

@@ -77,8 +77,6 @@ $tSubject = "";
$tUsername = "";
$tTransport = "";
$pAdminCreate_admin_password_text = "&nbsp;";
$pAdminCreate_admin_username_text = "&nbsp;";
$pAdminCreate_domain_defaultaliases_text = "&nbsp;";
$pAdminCreate_domain_domain_text = "&nbsp;";
$pCreate_alias_address_text = "&nbsp;";