SF.net SVN: postfixadmin:[1081] trunk

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

Revision: 1081
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1081&view=rev
Author:   christian_boltz
Date:     2011-07-18 22:20:07 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
edit-active-admin.php, edit-active-domain.php, edit-active.php
- replaced $tMessage with flash_error()

edit-active.php:
- removed a </font> added after $PALANG['pEdit_mailbox_domain_error']

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

Modified Paths:
--------------
    trunk/edit-active-admin.php
    trunk/edit-active-domain.php
    trunk/edit-active.php

Modified: trunk/edit-active-admin.php
===================================================================
--- trunk/edit-active-admin.php	2011-07-18 22:13:05 UTC (rev 1080)
+++ trunk/edit-active-admin.php	2011-07-18 22:20:07 UTC (rev 1081)
@@ -19,7 +19,7 @@
  *
  * Template Variables:
  *
- * tMessage
+ * none
  *
  * Form POST \ GET Variables:
  *
@@ -41,7 +41,7 @@
    if ($result['rows'] != 1)
    {
       $error = 1;
-      $tMessage = $PALANG['pAdminEdit_admin_result_error'];
+      flash_error($PALANG['pAdminEdit_admin_result_error']);
    }
    
    if ($error != 1)
@@ -50,7 +50,6 @@
       exit;
    }
 }
-$smarty->assign ('tMessage', $tMessage);
 $smarty->assign ('smarty_template', 'message');
 $smarty->display ('index.tpl');
 

Modified: trunk/edit-active-domain.php
===================================================================
--- trunk/edit-active-domain.php	2011-07-18 22:13:05 UTC (rev 1080)
+++ trunk/edit-active-domain.php	2011-07-18 22:20:07 UTC (rev 1081)
@@ -18,7 +18,7 @@
  *
  * Template Variables:
  *
- * tMessage
+ * none
  *
  * Form POST \ GET Variables:
  *
@@ -40,7 +40,7 @@
    if ($result['rows'] != 1)
    {
       $error = 1;
-      $tMessage = $PALANG['pAdminEdit_domain_result_error'];
+      flash_error($PALANG['pAdminEdit_domain_result_error']);
    }
    
    if ($error != 1)
@@ -50,7 +50,6 @@
    }
 }
 
-$smarty->assign ('tMessage', $tMessage);
 $smarty->assign ('smarty_template', 'message');
 $smarty->display ('index.tpl');
 

Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php	2011-07-18 22:13:05 UTC (rev 1080)
+++ trunk/edit-active.php	2011-07-18 22:20:07 UTC (rev 1081)
@@ -19,7 +19,7 @@
  *
  * Template Variables:
  *
- * tMessage
+ * none
  *
  * Form POST \ GET Variables:
  *
@@ -49,7 +49,7 @@
    if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin') ) )
    {
       $error = 1;
-      $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "<b>$fDomain</b>!</font>";
+      flash_error($PALANG['pEdit_mailbox_domain_error'] . "<b>$fDomain</b>!");
    }
    else
    {
@@ -61,7 +61,7 @@
          if ($result['rows'] != 1)
          {
             $error = 1;
-            $tMessage = $PALANG['pEdit_mailbox_result_error'];
+            flash_error($PALANG['pEdit_mailbox_result_error']);
          }
          else
          {
@@ -74,7 +74,7 @@
          if ($result['rows'] != 1)
          {
             $error = 1;
-            $tMessage = $PALANG['pEdit_mailbox_result_error'];
+            flash_error($PALANG['pEdit_mailbox_result_error']);
          }
          else
          {
@@ -87,7 +87,7 @@
          if ($result['rows'] != 1)
          {
             $error = 1;
-            $tMessage = $PALANG['pEdit_alias_domain_result_error'];
+            flash_error($PALANG['pEdit_alias_domain_result_error']);
          }
          else
          {
@@ -112,7 +112,6 @@
    }
 }
 
-$smarty->assign ('tMessage', $tMessage);
 $smarty->assign ('smarty_template', 'message');
 $smarty->display ('index.tpl');
 


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