UWVA#13637

svn path=/Database/trunk/; revision=9661

BEZ/BEZ_TRI.SRC

@@ -1,7 +1,7 @@
 #ifdef  BEZ // 03-11-2000 PF
 
-/*  $Revision: 25 $
- *  $Modtime: 20-12-07 13:54 $
+/*  $Revision: 26 $
+ *  $Modtime: 3-01-08 15:03 $
  */
 
 #include "comsql.h"
@@ -141,8 +141,8 @@ BEGIN
              WHERE bez_afspraak_key = :NEW.bez_afspraak_key;
 
              -- We support substitution of placeholders in the messages
-             -- ##KEY##    = ins_srtdiscipline_prefix+key+/+volgnr
-            -- ##NAAM##    = volledige naam van de afmelder
+             -- ##KEY##    = afspraaknummer
+            -- ##NAAM##    = volledige naam van de bezoeker
             IF INSTR2(soms, '#') > 0
             THEN
                soms :=
@@ -266,12 +266,13 @@ BEGIN
                        );
          END IF;
 
-         IF soms IS NOT NULL
+         -- Prevent sending these messages to self
+         IF soms IS NOT NULL AND lsender != lreceiver
          THEN
             fac.putnotificationsrt (lsender, lreceiver, scode, :NEW.bez_afspraak_key, soms, NULL, NULL, NULL, NULL);
          END IF;
 
-         IF soms2 IS NOT NULL
+         IF soms2 IS NOT NULL AND lsender != lreceiver2
          THEN
             fac.putnotificationsrt (lsender, lreceiver2, scode2, :NEW.bez_afspraak_key, soms2, NULL, NULL, NULL, NULL);
          END IF;