Only registered user can call angel.

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

4 files changed, 12 insertions, 8 deletions

diff --git a/mbbsd/io.c b/mbbsd/io.c
index aee1d04a..c672e895 100644
--- a/mbbsd/io.c
+++ b/mbbsd/io.c
@@ -394,7 +394,9 @@ igetch()
 
 	case Ctrl('J'):  /* Ptt 把 \n 拿掉 */
 #ifdef PLAY_ANGEL
+	    /* Seams some telnet client still send CR LF when changing lines.
 	    CallAngel();
+	    */
 #endif
 	    continue;
 
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 38a5801f..5a6a5699 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -348,7 +348,7 @@ static commands_t talklist[] = {
     {t_chat, PERM_CHAT,     "CChat          找家茶坊喫茶去"},
     {t_display, 0,          "DDisplay       顯示上幾次熱訊"},
 #ifdef PLAY_ANGEL
-    {t_changeangel, PERM_BASIC, "UAChange Angel 更換小天使"},
+    {t_changeangel, PERM_LOGINOK, "UAChange Angel 更換小天使"},
 #endif
     {NULL, 0, NULL}
 };
diff --git a/mbbsd/stuff.c b/mbbsd/stuff.c
index 9e7e1c5a..fdc5cdc2 100644
--- a/mbbsd/stuff.c
+++ b/mbbsd/stuff.c
@@ -667,10 +667,11 @@ show_help(char *helptext[])
 	    prints("        %s\n", str);
     }
 #ifdef PLAY_ANGEL
-    pressanykey_or_callangel();
-#else
-    pressanykey();
+    if (HAS_PERM(PERM_LOGINOK))
+	pressanykey_or_callangel();
+    else
 #endif
+    pressanykey();
 }
 #endif // _BBS_UTIL_C_
 
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index e5936862..a9c3b831 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1519,10 +1519,11 @@ t_showhelp()
 #endif
     }
 #ifdef PLAY_ANGEL
-    pressanykey_or_callangel();
-#else
-    pressanykey();
+    if (HAS_PERM(PERM_LOGINOK))
+	pressanykey_or_callangel();
+    else
 #endif
+    pressanykey();
 }
 
 /*
@@ -2917,7 +2918,7 @@ CallAngel(){
     screenline_t   *screen0;
     int x, y;
 
-    if (entered)
+    if (!HAS_PERM(PERM_LOGINOK) || entered)
 	return;
     entered = 1;