- angel system: extend pager modes to 3 types (accept, reject new, reject all)

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4064 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 16 insertions, 10 deletions

diff --git a/include/proto.h b/include/proto.h
index d7fe1111..6cda35fa 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -38,6 +38,13 @@ int make_symbolic_link(const char *bname, int gid);
 int make_symbolic_link_interactively(int gid);
 void merge_dir(const char *dir1, const char *dir2, int isoutter);
 
+/* angel */
+int t_changeangel(void);
+int t_angelmsg(void);
+int angel_reject_me(userinfo_t * uin);
+void angel_toggle_pause();
+void CallAngel(void);
+
 /* announce */
 int a_menu(const char *maintitle, const char *path, int lastlevel, int lastbid, char *trans_buffer);
 void a_copyitem(const char* fpath, const char* title, const char* owner, int mode);
@@ -102,9 +109,7 @@ int brc_initial_board(const char *boardname);
 int brc_unread(int bid, const char *fname, time4_t modified);
 int brc_unread_time(int bid, time4_t ftime,time4_t modified);
 void brc_addlist(const char* fname, time4_t modified);
-
 void brc_update(void);
-
 void brc_toggle_all_read(int bid, int is_all_read);
 
 /* cache */
@@ -658,11 +663,6 @@ int friend_stat(const userinfo_t *me, const userinfo_t * ui);
 int call_in(const userinfo_t *uentp, int fri_stat);
 int make_connection_to_somebody(userinfo_t *uin, int timeout);
 int query_online(const char *userid);
-#ifdef PLAY_ANGEL
-int t_changeangel(void);
-int t_angelmsg(void);
-void CallAngel(void);
-#endif
 
 /* tmpjack */
 int reg_barbq(void);
diff --git a/include/pttstruct.h b/include/pttstruct.h
index d3bc6602..89b4c6b7 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -274,10 +274,8 @@ typedef struct fileheader_t {
 /* values of msgque_t::msgmode */
 #define MSGMODE_TALK      0
 #define MSGMODE_WRITE     1
-#ifdef PLAY_ANGEL
 #define MSGMODE_FROMANGEL 2
 #define MSGMODE_TOANGEL   3
-#endif
 
 typedef struct msgque_t {
     pid_t   pid;
@@ -296,6 +294,13 @@ typedef struct msgque_t {
 // #define ALERT_PWD_POSTS       (0x40)
 #define ALERT_PWD_RELOAD      (0x80) // reload entire pwd
 #define ALERT_PWD (ALERT_PWD_PERM|ALERT_PWD_BADPOST|ALERT_PWD_GOODPOST|ALERT_PWD_JUSTIFY|ALERT_PWD_RELOAD)
+
+// userinfo_t.angelpause values 
+#define ANGELPAUSE_NONE	    (0)	// reject none (accept all)
+#define ANGELPAUSE_REJNEW   (1) // reject only new requests
+#define ANGELPAUSE_REJALL   (2) // reject all requests
+#define ANGELPAUSE_MODES    (3)	// max value, used as (angelpause % ANGELPAUSE_MODES)
+
 /* user data in shm */
 /* use GAP to detect and avoid data overflow and overriding */
 typedef struct userinfo_t {
diff --git a/include/uflags.h b/include/uflags.h
index 8ab31e09..addfa7a4 100644
--- a/include/uflags.h
+++ b/include/uflags.h
@@ -69,7 +69,8 @@
 #define REJECT_OUTTAMAIL (cuser.uflag2 & REJ_OUTTAMAIL)
 
 /* ANGEL [deprecated] */
-// #define REJ_QUESTION    0x00000800 /* true if don't want to be angel for a while */ // deprecated
+#define UF2_ANGEL_PAUSE    0x00000800 /* true if don't want to be angel for a while */ // deprecated
+#define UF2_ANGEL_OLDMASK  0x00003800 // mask of all deprecated stuff
 // #define ANGEL_R_MAEL    0x00001000 /* true if reject male */	    // deprecated
 // #define ANGEL_R_FEMAEL  0x00002000 /* true if reject female */   // deprecated
 // #define ANGEL_MASK      0x00003000