SF.net SVN: postfixadmin:[864] trunk

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

Revision: 864
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=864&view=rev
Author:   christian_boltz
Date:     2010-09-12 18:48:49 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
Several small bugfixes, all of them caused by switching to smarty
(not relevant for the 2.3 branch)

edit-mailbox.php, templates/edit-mailbox.tpl:
- do NOT display the old password (that's insecure - or useless with encrypted
  passwords)

users/edit-alias.php:
- add a TODO note about code cleanup

users/password.php:
- username was not displayed because of a wrong variable name

list-virtual.php:
- don't escape mailbox and alias status flags

templates/users_main.tpl:
- don't display template name

Modified Paths:
--------------
    trunk/edit-mailbox.php
    trunk/list-virtual.php
    trunk/templates/edit-mailbox.tpl
    trunk/templates/users_main.tpl
    trunk/users/edit-alias.php
    trunk/users/password.php

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2010-09-11 22:44:49 UTC (rev 863)
+++ trunk/edit-mailbox.php	2010-09-12 18:48:49 UTC (rev 864)
@@ -176,7 +176,6 @@
 }
 
 $smarty->assign ('fUsername', $fUsername);
-$smarty->assign ('fPassword', $user_details ['password'], false);
 $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);

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2010-09-11 22:44:49 UTC (rev 863)
+++ trunk/list-virtual.php	2010-09-12 18:48:49 UTC (rev 864)
@@ -199,7 +199,7 @@
 $display_mailbox_aliases = boolconf('alias_control_admin');
 
 # build the sql query
-$sql_select = " SELECT $table_mailbox.* ";
+$sql_select = "SELECT $table_mailbox.* ";
 $sql_from   = " FROM $table_mailbox ";
 $sql_join   = "";
 $sql_where  = " WHERE ";
@@ -454,11 +454,11 @@
 	$smarty->assign ('PALANG_pOverview_alias_domain_target', sprintf($PALANG['pOverview_alias_domain_target'], $fDomain));
 }
 $smarty->assign ('tAlias', $tAlias);
-$smarty->assign ('gen_show_status', $gen_show_status);
+$smarty->assign ('gen_show_status', $gen_show_status, false);
 $smarty->assign ('check_alias_owner', $check_alias_owner);
 $smarty->assign ('tCanAddAlias', $tCanAddAlias);
 $smarty->assign ('tMailbox', $tMailbox);
-$smarty->assign ('gen_show_status_mailbox', $gen_show_status_mailbox);
+$smarty->assign ('gen_show_status_mailbox', $gen_show_status_mailbox, false);
 $smarty->assign ('boolconf_used_quotas', boolconf('used_quotas'));
 $smarty->assign ('divide_quota', $divide_quota);
 $smarty->assign ('tCanAddMailbox', $tCanAddMailbox);

Modified: trunk/templates/edit-mailbox.tpl
===================================================================
--- trunk/templates/edit-mailbox.tpl	2010-09-11 22:44:49 UTC (rev 863)
+++ trunk/templates/edit-mailbox.tpl	2010-09-12 18:48:49 UTC (rev 864)
@@ -11,11 +11,6 @@
 		<td>{$pEdit_mailbox_username_text}</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_password_current}:</td>
-		<td>{$fPassword}</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
 		<td>{$PALANG.pEdit_mailbox_password}:</td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 		<td>{$pEdit_mailbox_password_text}</td>
@@ -53,4 +48,4 @@
 	</tr>
 </table>
 </form>
-</div>
\ No newline at end of file
+</div>

Modified: trunk/templates/users_main.tpl
===================================================================
--- trunk/templates/users_main.tpl	2010-09-11 22:44:49 UTC (rev 863)
+++ trunk/templates/users_main.tpl	2010-09-12 18:48:49 UTC (rev 864)
@@ -24,4 +24,3 @@
 	</tr>
 </table>
 </div>
-{$smarty_template}
\ No newline at end of file

Modified: trunk/users/edit-alias.php
===================================================================
--- trunk/users/edit-alias.php	2010-09-11 22:44:49 UTC (rev 863)
+++ trunk/users/edit-alias.php	2010-09-12 18:48:49 UTC (rev 864)
@@ -90,6 +90,11 @@
     if($error === 0) {
         foreach($goto as $address) {
           if ($address != "") { # $goto[] may contain a "" element
+            # TODO - from https://sourceforge.net/tracker/?func=detail&aid=3027375&group_id=191583&atid=937964 
+            # The not-so-good news is that some internals of edit-alias aren't too nice
+            # - for example, $goto[] can contain an element with empty string. I added a
+            # check for that in the 2.3 branch, but we should use a better solution
+            # (avoid empty elements in $goto) in trunk ;-)
             if(!check_email($address)) {
                 $error += 1;
                 $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . " $address</font>";

Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php	2010-09-11 22:44:49 UTC (rev 863)
+++ trunk/users/password.php	2010-09-12 18:48:49 UTC (rev 864)
@@ -73,7 +73,7 @@
     }
 }
 
-$smarty->assign ('USERID_USERNAME', $USERID_USERNAME);
+$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);


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