From 589e7887d77084c5808abc56bce39047ed9ef461 Mon Sep 17 00:00:00 2001
From: Erik Groener <erik.groener@aareon.nl>
Date: Tue, 13 Dec 2016 13:33:43 +0000
Subject: [PATCH] HSLE#37086 Extra mailafzender kunnen selecteren.

svn path=/Website/trunk/; revision=31953
---
 APPL/Shared/queuemail.asp | 73 ++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/APPL/Shared/queuemail.asp b/APPL/Shared/queuemail.asp
index 48b6a19f0d..8420f3a4e6 100644
--- a/APPL/Shared/queuemail.asp
+++ b/APPL/Shared/queuemail.asp
@@ -285,8 +285,28 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
 <%
           BLOCK_START("emailInput", subject);
 
-              if (mailfrom && S("replyaddress"))
-              {
+            // Heeft vakgroep een mailadres
+            var mail_disc = null;
+            if (pmodule == "MLD")
+            {
+                var sql_v = "SELECT ins_discipline_email"
+                          + "     , ins_discipline_email"
+                          + "     , 3"
+                          + "  FROM ins_tab_discipline d"
+                          + "     , mld_stdmelding s"
+                          + "     , mld_melding m"
+                          + " WHERE d.ins_discipline_email IS NOT NULL"
+                          + "   AND d.ins_discipline_key = s.mld_ins_discipline_key"
+                          + "   AND s.mld_stdmelding_key = m.mld_stdmelding_key"
+                          + "   AND m.mld_melding_key = " + pkey;
+                var oRs_v = Oracle.Execute(sql_v);
+                if (!oRs_v.eof)
+                    mail_disc = oRs_v("ins_discipline_email").Value;
+                oRs_v.Close();
+            }
+
+            if (mailfrom && (S("replyaddress") || mail_disc))
+            {
                 // <!-- Namens -->
                 var sql = "SELECT prs_perslid_email"
                         + "     , prs_perslid_email"
@@ -294,26 +314,23 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
                         + "  FROM prs_perslid"
                         + " WHERE prs_perslid_key = " + user_key
                         + "   AND prs_perslid_email IS NOT NULL"
-                        + " UNION "
-                        + "SELECT " + safe.quoted_sql(S("replyaddress"))
-                        + "     , " + safe.quoted_sql(S("replyaddress"))
-                        + "     , 2"
-                        + "  FROM DUAL";
-                if (pmodule == "MLD")
-                {
-                  sql += " UNION "
-                        + "SELECT ins_discipline_email"
-                        + "     , ins_discipline_email"
-                        + "     , 3"
-                        + "  FROM ins_tab_discipline d"
-                        + "     , mld_stdmelding s"
-                        + "     , mld_melding m"
-                        + " WHERE d.ins_discipline_email IS NOT NULL"
-                        + "   AND d.ins_discipline_key = s.mld_ins_discipline_key"
-                        + "   AND s.mld_stdmelding_key = m.mld_stdmelding_key"
-                        + "   AND m.mld_melding_key = " + pkey;
-                }
-                sql += " ORDER BY 3";
+                        + ( S("replyaddress")
+                          ?   " UNION "
+                            + "SELECT " + safe.quoted_sql(S("replyaddress"))
+                            + "     , " + safe.quoted_sql(S("replyaddress"))
+                            + "     , 2"
+                            + "  FROM DUAL"
+                          : ""
+                          )
+                        + ( mail_disc
+                          ?   " UNION "
+                            + "SELECT " + safe.quoted_sql(mail_disc)
+                            + "     , " + safe.quoted_sql(mail_disc)
+                            + "     , 3"
+                            + "  FROM DUAL"
+                          : ""
+                          )
+                        + " ORDER BY 3";
 
                 var sql_t = "SELECT COUNT(*) aantal FROM (" + sql +")";
                 var oRs_t = Oracle.Execute(sql_t);
@@ -325,11 +342,11 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
                                 );
                 }
                 oRs_t.Close();
-              }
+            }
 
-              // <!-- Naam -->
-              if (S("show_perslidselector_by_mail"))
-              {
+            // <!-- Naam -->
+            if (S("show_perslidselector_by_mail"))
+            {
                 FCLTpersoonselector("sName_key",
                                     "sgPerson",
                                     { perslidKey: -1,
@@ -341,8 +358,8 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
                                       extraParamField: "emailpersoon",
                                       whenEmpty: L("lcl_search_generic")  // want filter
                                     });
-              }
-                // <!-- Bedrijf -->
+            }
+            // <!-- Bedrijf -->
             if (pshowcompany)
             {
                 FCLTbedrijfselector("sComp_key",