From b610c21baf13a541e49d535908c23cbdeceacf11 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 18 Jul 2011 22:20:07 +0000
Subject: [PATCH] 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


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1081 a1433add-5e2c-0410-b055-b7f2511e0802
---
 edit-active-admin.php  |  5 ++---
 edit-active-domain.php |  5 ++---
 edit-active.php        | 11 +++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/edit-active-admin.php b/edit-active-admin.php
index ba64d7eb..8af2952e 100644
--- a/edit-active-admin.php
+++ b/edit-active-admin.php
@@ -19,7 +19,7 @@
  *
  * Template Variables:
  *
- * tMessage
+ * none
  *
  * Form POST \ GET Variables:
  *
@@ -41,7 +41,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    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 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
       exit;
    }
 }
-$smarty->assign ('tMessage', $tMessage);
 $smarty->assign ('smarty_template', 'message');
 $smarty->display ('index.tpl');
 
diff --git a/edit-active-domain.php b/edit-active-domain.php
index a50d33dc..1873ad38 100644
--- a/edit-active-domain.php
+++ b/edit-active-domain.php
@@ -18,7 +18,7 @@
  *
  * Template Variables:
  *
- * tMessage
+ * none
  *
  * Form POST \ GET Variables:
  *
@@ -40,7 +40,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    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 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    }
 }
 
-$smarty->assign ('tMessage', $tMessage);
 $smarty->assign ('smarty_template', 'message');
 $smarty->display ('index.tpl');
 
diff --git a/edit-active.php b/edit-active.php
index 059dfdc7..4d1f4242 100644
--- a/edit-active.php
+++ b/edit-active.php
@@ -19,7 +19,7 @@
  *
  * Template Variables:
  *
- * tMessage
+ * none
  *
  * Form POST \ GET Variables:
  *
@@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    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 ($_SERVER['REQUEST_METHOD'] == "GET")
          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 ($_SERVER['REQUEST_METHOD'] == "GET")
          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 ($_SERVER['REQUEST_METHOD'] == "GET")
          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 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
    }
 }
 
-$smarty->assign ('tMessage', $tMessage);
 $smarty->assign ('smarty_template', 'message');
 $smarty->display ('index.tpl');