From: Art Cancro <ajc@citadel.org>
Date: Mon, 26 Sep 2005 21:56:31 +0000 (+0000)
Subject: * Offer the [Move] and [Delete] buttons not only for aide/roomaide, but
X-Git-Tag: v7.86~4605
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=e0e84b4abba84c44ecf07f9b17f8ab34314ea6ad;p=citadel.git

* Offer the [Move] and [Delete] buttons not only for aide/roomaide, but
  also whenever we are in a mailbox room owned by the user.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 33d92f2f0..0340953f3 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 625.25  2005/09/26 21:56:31  ajc
+* Offer the [Move] and [Delete] buttons not only for aide/roomaide, but
+  also whenever we are in a mailbox room owned by the user.
+
 Revision 625.24  2005/09/26 18:00:51  ajc
 * Upgraded TinyMCE to version 2.0RC3.  This fixes a conflict with
   the prototype.js library.
@@ -3066,3 +3070,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
+
diff --git a/webcit/messages.c b/webcit/messages.c
index c53ae7cdf..e3b96f83d 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -735,7 +735,8 @@ void read_message(long msgnum, int printable_view) {
 			wprintf("\">[%s]</a> ", _("Forward"));
 		}
 
-		if (WC->is_room_aide)  {
+		/* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
+		if ( (WC->is_room_aide) || (WC->is_mailbox) ) {
 			/* Move */
 			wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[%s]</a> ",
 				msgnum, _("Move"));
diff --git a/webcit/roomops.c b/webcit/roomops.c
index ccc29e5a3..ea106cc1c 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -602,7 +602,8 @@ int gotoroom(char *gname)
 	WC->room_flags = extract_int(&buf[4], 4);
 	/* highest_msg_read = extract_int(&buf[4],6);
 	   maxmsgnum = extract_int(&buf[4],5);
-	   is_mail = (char) extract_int(&buf[4],7); */
+	 */
+	WC->is_mailbox = extract_int(&buf[4],7);
 	ls = extract_long(&buf[4], 6);
 	WC->wc_floor = extract_int(&buf[4], 10);
 	WC->wc_view = extract_int(&buf[4], 11);
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 3f2668aa6..7aebacb25 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -304,6 +304,7 @@ struct wcsession {
 	size_t burst_len;
 	char *burst;
 	int gzip_ok;			/* Nonzero if Accept-encoding: gzip */
+	int is_mailbox;			/* the current room is a private mailbox */
 };
 
 #define num_parms(source)		num_tokens(source, '|')