fix: empty input in view_user_money_log will cause segv.

also refined menu hotkeys.


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

3 files changed, 15 insertions, 11 deletions

diff --git a/pttbbs/common/osdep/memusage.c b/pttbbs/common/osdep/memusage.c
index 5a79e9dd..8c43a895 100644
--- a/pttbbs/common/osdep/memusage.c
+++ b/pttbbs/common/osdep/memusage.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <sys/resource.h>
+#include <unistd.h>
 
 #include "osdep.h"
 
diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index e81fd638..6630fad8 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -3095,8 +3095,18 @@ del_range(int ent, const fileheader_t *fhdr, const char *direct,
     int             num1, num2, num, cdeleted = 0;
     fileheader_t *recs = NULL;
     int ret = 0;
+
+#ifdef SAFE_ARTICLE_DELETE
     int use_safe_delete = 0;
 
+    if (*direct == 'b') {
+        boardheader_t  *bp = getbcache(currbid);
+        if(!(currmode & MODE_DIGEST) &&
+                bp->nuser >= SAFE_ARTICLE_DELETE_NUSER)
+            use_safe_delete = 1;
+    }
+#endif
+
     /* 有三種情況會進這裡, 信件, 看板, 精華區 */
     
     /* rocker.011018: 串接模式下還是不允許刪除比較好 */
@@ -3154,15 +3164,6 @@ del_range(int ent, const fileheader_t *fhdr, const char *direct,
     refresh();
     ret = 0;
 
-#ifdef SAFE_ARTICLE_DELETE
-    if (*direct == 'b') {
-        boardheader_t  *bp = getbcache(currbid);
-        if(!(currmode & MODE_DIGEST) &&
-                bp->nuser >= SAFE_ARTICLE_DELETE_NUSER)
-            use_safe_delete = 1;
-    }
-#endif
-
     do {
         int id = num1, i;
         for (i = 0; ret == 0 && i < num; i++) {
diff --git a/pttbbs/mbbsd/menu.c b/pttbbs/mbbsd/menu.c
index 11186e00..19f07a0a 100644
--- a/pttbbs/mbbsd/menu.c
+++ b/pttbbs/mbbsd/menu.c
@@ -552,6 +552,8 @@ view_user_money_log() {
 
     vs_hdr("檢視使用者交易記錄");
     usercomplete("請輸入要檢視的ID: ", userid);
+    if (!is_validuserid(userid))
+        return 0;
     sethomefile(fpath, userid, FN_RECENTPAY);
     if (more(fpath, YEA) < 0)
         vmsgf("使用者 %s 無最近交易記錄", userid);
@@ -584,8 +586,8 @@ static const commands_t adminlist[] = {
 	PERM_SYSOP|PERM_VIEWSYSOP,	"XXfile         編輯系統檔案"},
     {x_admin_money, PERM_SYSOP|PERM_VIEWSYSOP,
                                         "MMoney         " MONEYNAME "幣相關"},
-    {u_list, PERM_SYSOP,		"UUsers         列出註冊名單"},
-    {m_loginmsg, PERM_SYSOP,		"LLMessage Login 進站水球"},
+    {u_list, PERM_SYSOP,		"LLUsers List     列出註冊名單"},
+    {m_loginmsg, PERM_SYSOP,		"GGMessage Login 進站水球"},
     {NULL, 0, NULL}
 };