SF.net SVN: postfixadmin:[1132] trunk

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

Revision: 1132
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1132&view=rev
Author:   christian_boltz
Date:     2011-07-25 23:43:12 +0000 (Mon, 25 Jul 2011)

Log Message:
-----------
create-mailbox.php, variables.inc.php, create-mailbox.tpl
- removed always empty variable $pCreate_mailbox_username_text
- replaced "static" variables $pCreate_mailbox_password_text and
  $pCreate_mailbox_quota_text with their PALANG content in the template

Modified Paths:
--------------
    trunk/create-mailbox.php
    trunk/templates/create-mailbox.tpl
    trunk/variables.inc.php

Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php	2011-07-25 23:30:27 UTC (rev 1131)
+++ trunk/create-mailbox.php	2011-07-25 23:43:12 UTC (rev 1132)
@@ -46,8 +46,6 @@
 }
 
 
-$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text'];
-$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text'];
 $pCreate_mailbox_username_text_error = "";
 $pCreate_mailbox_password_text_error = "";
 $pCreate_mailbox_quota_text_error = "";
@@ -264,13 +262,10 @@
 
 $smarty->assign ('tUsername', $tUsername);
 $smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
-$smarty->assign ('pCreate_mailbox_username_text', $pCreate_mailbox_username_text, false);
 $smarty->assign ('pCreate_mailbox_username_text_error', $pCreate_mailbox_username_text_error, false);
-$smarty->assign ('pCreate_mailbox_password_text', $pCreate_mailbox_password_text, false);
 $smarty->assign ('pCreate_mailbox_password_text_error', $pCreate_mailbox_password_text_error, false);
 $smarty->assign ('tName', $tName, false);
 $smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pCreate_mailbox_quota_text', $pCreate_mailbox_quota_text, false);
 $smarty->assign ('pCreate_mailbox_quota_text_error', $pCreate_mailbox_quota_text_error, false);
 $smarty->assign ('smarty_template', 'create-mailbox');
 $smarty->display ('index.tpl');

Modified: trunk/templates/create-mailbox.tpl
===================================================================
--- trunk/templates/create-mailbox.tpl	2011-07-25 23:30:27 UTC (rev 1131)
+++ trunk/templates/create-mailbox.tpl	2011-07-25 23:43:12 UTC (rev 1132)
@@ -10,14 +10,13 @@
 		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
 		<td>@
 		<select name="fDomain">{$select_options}</select>
-		{$pCreate_mailbox_username_text}
 		</td>
 		<td><span class="error_msg">{$pCreate_mailbox_username_text_error}</span></td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pCreate_mailbox_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pCreate_mailbox_password_text}</td>
+		<td>{$PALANG.pCreate_mailbox_password_text}</td>
 		<td><span class="error_msg">{$pCreate_mailbox_password_text_error}</span></td>
 	</tr>
 	<tr>
@@ -35,7 +34,7 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pCreate_mailbox_quota}:</label></td>
 		<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
-		<td>{$pCreate_mailbox_quota_text}</td>
+		<td>{$PALANG.pCreate_mailbox_quota_text}</td>
 		<td><span class="error_msg">{$pCreate_mailbox_quota_text_error}</span></td>
 	</tr>
 {/if}

Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php	2011-07-25 23:30:27 UTC (rev 1131)
+++ trunk/variables.inc.php	2011-07-25 23:43:12 UTC (rev 1132)
@@ -76,9 +76,6 @@
 $tUsername = "";
 $tTransport = "";
 
-$pCreate_mailbox_password_text = "&nbsp;";
-$pCreate_mailbox_quota_text = "&nbsp;";
-$pCreate_mailbox_username_text = "&nbsp;";
 $pEdit_mailbox_password_text = "&nbsp;";
 $pEdit_mailbox_quota_text = "&nbsp;";
 


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