SF.net SVN: postfixadmin:[1133] trunk

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

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

Log Message:
-----------
edit-mailbox.php, edit-mailbox.tpl, variables.inc.php
- removed always empty variable $pEdit_mailbox_password_text
- replaced "static" variable $pEdit_mailbox_quota_text with its
  PALANG content in the template

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

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2011-07-25 23:43:12 UTC (rev 1132)
+++ trunk/edit-mailbox.php	2011-07-25 23:49:58 UTC (rev 1133)
@@ -46,7 +46,6 @@
 if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
 
 $pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
-$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
 $pEdit_mailbox_quota_text_error = "";
 
 if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
@@ -175,12 +174,10 @@
 }
 
 $smarty->assign ('fUsername', $fUsername);
-$smarty->assign ('pEdit_mailbox_password_text', $pEdit_mailbox_password_text, false);
 $smarty->assign ('tName', $tName, false);
 $smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text,false);
 $smarty->assign ('tMaxquota', $tMaxquota);
 $smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pEdit_mailbox_quota_text', $pEdit_mailbox_quota_text);
 $smarty->assign ('pEdit_mailbox_quota_text_error', $pEdit_mailbox_quota_text_error);
 if ($tActive)	$smarty->assign ('tActive', ' checked="checked"');
 $smarty->assign ('smarty_template', 'edit-mailbox');

Modified: trunk/templates/edit-mailbox.tpl
===================================================================
--- trunk/templates/edit-mailbox.tpl	2011-07-25 23:43:12 UTC (rev 1132)
+++ trunk/templates/edit-mailbox.tpl	2011-07-25 23:49:58 UTC (rev 1133)
@@ -14,8 +14,8 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pEdit_mailbox_password_text}</td>
 		<td>&nbsp;</td>
+		<td>&nbsp;</td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_password2}:</label></td>
@@ -33,7 +33,7 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_quota} (max: {$tMaxquota}):</label></td>
 		<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
-		<td>{$pEdit_mailbox_quota_text}</td>
+		<td>{$PALANG.pEdit_mailbox_quota_text}</td>
 		<td>{$pEdit_mailbox_quota_text_error}</td>
 	</tr>
 {/if}

Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php	2011-07-25 23:43:12 UTC (rev 1132)
+++ trunk/variables.inc.php	2011-07-25 23:49:58 UTC (rev 1133)
@@ -76,8 +76,5 @@
 $tUsername = "";
 $tTransport = "";
 
-$pEdit_mailbox_password_text = "&nbsp;";
-$pEdit_mailbox_quota_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.