FCLT#77016 Link kennisbankitem werkt niet in meldingsweergave

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

APPL/CHAT/ChatGet.asp

@@ -27,6 +27,11 @@ if (chatdata.messages)
     result.messages = chatdata.messages[fromchannelId];
     delete chatdata.messages[fromchannelId];
     Application(chat_data_name) = JSON.stringify(chatdata);
+    if (result.messages)
+    {
+        var last_index = result.messages.length-1;
+        result.messages[last_index].safe_message = safe.fclthtml(result.messages[last_index].message, {"mldlink": true, "faqlink": true});
+    }
 }
 Application.UnLock();
 

APPL/CHAT/Chatter.asp

@@ -86,6 +86,7 @@
 <script>
     var chatReadchannelId = "<%=safe.jsstring(chatReadchannelId)%>"; // wijzelf
     var chatSendchannelId = "<%=safe.jsstring(chatSendchannelId)%>"; // de ander
+    var chatIncoming = (<%=prs_key%> > 0);
     notify.signal(chatSendchannelId, chatReadchannelId);
 
     function add2chat(messages)
@@ -96,7 +97,8 @@
             extraClass += messages[i].aborted?' aborted' : '';
             extraClass += messages[i].inactive?' inactive' : '';
             extraClass += messages[i].mine?' self' : ' other';
-            $("#chathistory").prepend($('<span>').addClass('chatmsg'+extraClass).text(messages[i].message))
+            var theMessage = (chatIncoming && !messages[i].mine ? messages[i].safe_message : messages[i].message);
+            $("#chathistory").prepend($('<span>').addClass('chatmsg'+extraClass).html(theMessage))
                              .prepend($('<span>').addClass('chatfrom'+extraClass).text(messages[i].fromname))
                              .prepend($('<span>').addClass('chattime').text(messages[i].sincetime));
         }

APPL/FAC/fac.inc

@@ -232,6 +232,10 @@ fac = {  myfunctionssqlstring:
                          + "  FROM fac_faq"
                          + " WHERE fac_faq_key = " + pfaq_key;
                  var oRs = Oracle.Execute(sql);
+                 if (oRs.Eof)
+                 {
+                    shared.record_not_found(L("lcl_faq_kennisbank_nr") + " " + pfaq_key);
+                 }
                  var disc_key = oRs("faq_ins_discipline_key").Value;
                  var pers_key = oRs("prs_perslid_key").Value;
                  var datum = oRs("fac_faq_datum").Value;