From: john <john>
Date: Sun, 4 May 2003 23:52:14 +0000 (+0000)
Subject: bug fix...initialize all template variables for the prepare email template
X-Git-Tag: BEFORE_MERGE_1_1~109
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=57fe88526b9908ea77e46f427a564525d8e7d79f;p=mir.git

bug fix...initialize all template variables for the prepare email template
---

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index 4072d740..918dd39d 100755
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -123,7 +123,7 @@ import mircoders.storage.DatabaseTopics;
  *    open-postings to the newswire
  *
  * @author mir-coders group
- * @version $Id: ServletModuleOpenIndy.java,v 1.86 2003/05/04 12:56:33 john Exp $
+ * @version $Id: ServletModuleOpenIndy.java,v 1.87 2003/05/04 23:52:14 john Exp $
  *
  */
 
@@ -591,16 +591,15 @@ public class ServletModuleOpenIndy extends ServletModule
     String mail_language = req.getParameter("mail_language");
 
     Map mergeData = new HashMap();
-
+    mergeData.put("mail_to",to);
+    mergeData.put("mail_from",from);
+    mergeData.put("mail_from_name",from_name);
+    mergeData.put("mail_comment",comment);
+    mergeData.put("mail_aid",aid);
+    mergeData.put("mail_language",mail_language);
+    
+    
     if (to == null || from == null || from_name == null|| to.equals("") || from.equals("") || from_name.equals("") || mail_language == null || mail_language.equals("")){
-
-      for (Enumeration theParams = req.getParameterNames(); theParams.hasMoreElements() ;) {
-        String pName=(String)theParams.nextElement();
-        if (pName.startsWith("mail_")){
-          mergeData.put( pName,req.getParameter(pName) );
-        }
-      }
-
       deliver(req, res, mergeData, null, prepareMailTemplate);
     }
     else {