RWSN#36797 FO meldingen in Mobile

svn path=/Website/trunk/; revision=31330

APPL/MLD/mld.inc

@@ -4086,6 +4086,10 @@ __Log(result);
        srtdisc_sql: function (autfunction, params)
        {
            params = params || {};
+           autfunc = ((typeof autfunction == "object" && autfunction instanceof Array)
+                     ? safe.quoted_sql_join(autfunction)
+                     : safe.quoted_sql(autfunction)
+                     );
            var mySRTsql = // All ins_srtdiscipline with any ins_discipline beneath it we have write-rights for
                   "SELECT sd.ins_srtdiscipline_key"
                 + ", "+ lcl.xsqla('sd.ins_srtdiscipline_omschrijving', 'ins_srtdiscipline_key')
@@ -4100,7 +4104,7 @@ __Log(result);
                 + "           SELECT ins_discipline_key"
                 + "             FROM fac_v_webgebruiker g, fac_functie f "
                 + "            WHERE g.fac_functie_key = f.fac_functie_key "
-                + "              AND f.fac_functie_code = " + safe.quoted_sql(autfunction)
+                + "              AND f.fac_functie_code IN (" + autfunc + ")"
                 + "              AND (g.fac_gebruiker_alg_level_write < 9 AND g.fac_gebruiker_prs_level_write < 9)"
                 + "              AND g.prs_perslid_key = " + user_key + ")"
                 + "              AND td.ins_discipline_key IN("

APPL/PDA/melding_new.asp

@@ -45,7 +45,9 @@ var srtdisc_key = getQParamInt("srtdisc", -1);
 // Optioneel
 var ins_key = getQParamInt("ins_key", -1);  // test UWVA:11525 Het kan zijn dat ik vanuit de lijst deze meekrijg om een nieuwe aan te maken
 
-autfunction = (urole=='fe' ? "WEB_MLDUSE" : "WEB_MLDFOF");
+var autfunction = [];
+if (urole == "fo") autfunction.push("WEB_MLDFOF");
+if (user.has("WEB_MLDUSE")) autfunction.push("WEB_MLDUSE"); // voor urole=fe en eventueel ook nog fo.
 
 if (srtdisc_key > 0)
     lcl.set_dialect(srtdisc_key, "MLD_SRTDISCIPLINE_KEY");
@@ -119,11 +121,18 @@ if (srtdisc_key > 0)
     {
         var sql = "SELECT fac_functie_key"
                 + "  FROM fac_functie"
-                + " WHERE fac_functie_code=" + safe.quoted_sql(autfunction);
+                + " WHERE fac_functie_code IN (" + safe.quoted_sql_join(autfunction) + ")";
         var oRs = Oracle.Execute(sql);
         var auth_key = -1;
         if (!oRs.eof)
-          auth_key = oRs("fac_functie_key").value;
+        {
+          auth_key = [];
+          while (!oRs.eof)
+          {
+            auth_key.push(oRs("fac_functie_key").value);
+            oRs.MoveNext();
+          }
+        }
         oRs.Close();
 
         var filt_params = { disc_key: disc_key