* Deleting a message from the Trash folder now actually deletes it instead

[citadel.git] / webcit / static / wclib.js

diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index e04cc13955ceb91322b920d393d1ceef12e7fb30..8eedfcde19ca5a1167992cc7ad64d924031deb73 100644 (file)
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -7,6 +7,7 @@
 
 
 var browserType;
+var room_is_trash = 0;
 
 if (document.layers) {browserType = "nn4"}
 if (document.all) {browserType = "ie"}
@@ -162,13 +163,24 @@ function CtdlDeleteSelectedMessages(evt) {
                return false;
        }
        for (i=0; i<CtdlNumMsgsSelected; ++i) {
-               new Ajax.Request(
-                       'ajax_servcmd', {
-                               method: 'post',
-                               parameters: 'g_cmd=MOVE ' + CtdlMsgsSelected[i] + '|_TRASH_|0',
-                               onComplete: CtdlClearDeletedMsg(CtdlMsgsSelected[i])
-                       }
-               );
+               if (parseInt(room_is_trash) > 0) {
+                       new Ajax.Request(
+                               'ajax_servcmd', {
+                                       method: 'post',
+                                       parameters: 'g_cmd=DELE ' + CtdlMsgsSelected[i],
+                                       onComplete: CtdlClearDeletedMsg(CtdlMsgsSelected[i])
+                               }
+                       );
+               }
+               else {
+                       new Ajax.Request(
+                               'ajax_servcmd', {
+                                       method: 'post',
+                                       parameters: 'g_cmd=MOVE ' + CtdlMsgsSelected[i] + '|_TRASH_|0',
+                                       onComplete: CtdlClearDeletedMsg(CtdlMsgsSelected[i])
+                               }
+                       );
+               }
        }
        CtdlNumMsgsSelected = 0;