fix: admins should not be restricted by pager

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

1 files changed, 14 insertions, 6 deletions

diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c
index 8aaa1a27..f91469b4 100644
--- a/pttbbs/mbbsd/talk.c
+++ b/pttbbs/mbbsd/talk.c
@@ -778,12 +778,20 @@ my_write(pid_t pid, const char *prompt, const char *id, int flag, userinfo_t * p
 	{
 	    case PAGER_DISABLE:
 	    case PAGER_ANTIWB:
-                // users should not bother people
-                if (!HasUserPerm(PERM_SYSOP | PERM_ACCOUNTS | PERM_BOARD) &&
-                    vans("您的呼叫器目前設定為關閉。要打開它嗎[Y/n]? ") == 'n')
-                    return 0;
-                // enable pager
-                currutmp->pager = PAGER_ON;
+                if (HasUserPerm(PERM_SYSOP | PERM_ACCOUNTS | PERM_BOARD)) {
+                    // Admins are free to bother people.
+                    move(1, 0);  clrtoeol();
+                    outs(ANSI_COLOR(1;31)
+                         "你的呼叫器目前不接受別人丟水球，對方可能無法回話。"
+                         ANSI_RESET);
+                } else {
+                    // Normal users should not bother people.
+                    if ('n' == vans("您的呼叫器目前設定為關閉。"
+                                    "要打開它嗎?[Y/n] "))
+                        return 0;
+                    // enable pager
+                    currutmp->pager = PAGER_ON;
+                }
 		break;
 
 	    case PAGER_FRIENDONLY: