summaryrefslogtreecommitdiffstats
path: root/mbbsd/pmore.c
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-01-03 20:54:30 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-01-03 20:54:30 +0800
commit74ceac39794d1f3744a4c14e0e48d787d538b5d0 (patch)
tree8f59926ff410f1efd6476df852e3f2492014cced /mbbsd/pmore.c
parentc910fdb835478291442032bf6523d41949aa68d9 (diff)
downloadpttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.tar
pttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.tar.gz
pttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.tar.bz2
pttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.tar.lz
pttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.tar.xz
pttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.tar.zst
pttbbs-74ceac39794d1f3744a4c14e0e48d787d538b5d0.zip
- re-enable sysop-edit in article list mode
- move sysop-edit log to more instead of pmore body git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3778 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/pmore.c')
-rw-r--r--mbbsd/pmore.c48
1 files changed, 9 insertions, 39 deletions
diff --git a/mbbsd/pmore.c b/mbbsd/pmore.c
index afb07ecd..7cab8cd0 100644
--- a/mbbsd/pmore.c
+++ b/mbbsd/pmore.c
@@ -2073,7 +2073,7 @@ pmore(char *fpath, int promptend)
/* igetch() will do refresh(); */
ch = igetch();
switch (ch) {
- /* ------------------ EXITING KEYS ------------------ */
+ /* -------------- NEW EXITING KEYS ------------------ */
#ifdef RET_DOREPLY
case 'r': case 'R':
case 'Y': case 'y':
@@ -2092,6 +2092,13 @@ pmore(char *fpath, int promptend)
flExit = 1, retval = RET_DOQUERYINFO;
break;
#endif
+#ifdef RET_DOSYSOPEDIT
+ case 'E':
+ flExit = 1, retval = RET_DOSYSOPEDIT;
+ break;
+#endif
+
+ /* ------------------ EXITING KEYS ------------------ */
case 'A':
flExit = 1, retval = AUTHOR_PREV;
break;
@@ -2105,17 +2112,8 @@ pmore(char *fpath, int promptend)
flExit = 1, retval = READ_PREV;
break;
case KEY_LEFT:
- /* because we have other keys to do so,
- * disable now.
- */
- /*
- if(mf.xpos > 0)
- {
- mf.xpos --;
- break;
- }
- */
flExit = 1, retval = FULLUPDATE;
+ break;
case 'q':
flExit = 1, retval = FULLUPDATE;
break;
@@ -2340,34 +2338,6 @@ pmore(char *fpath, int promptend)
MFDISP_DIRTY();
break;
- case 'E':
- // admin edit any files other than ve help file
- // and posts in Security board
- if ( HasUserPerm(PERM_SYSOP) &&
-#ifdef GLOBAL_SECURITY
- strcmp(currboard, GLOBAL_SECURITY) != 0 &&
-#endif // GLOBAL_SECURITY
- strcmp(fpath, "etc/ve.hlp") != 0 &&
- 1)
- {
-#ifdef PMORE_LOG_SYSOP_EDIT
- time4_t t = time4(NULL);
-
- log_filef("log/security", LOG_CREAT,
- "%d %24.24s %d %s admin edit file=%s\n",
- t, ctime4(&t), getpid(), cuser.userid, fpath);
-#endif // PMORE_LOG_SYSOP_EDIT
-
- mf_detach();
- vedit(fpath, NA, NULL);
-
- REENTRANT_RESTORE();
- return 0;
- }
- break;
-
-// uncomment me someday when everyone's faimiliar with new system.
-#define PMORE_NOTIFY_NEWPREF
#ifdef PMORE_NOTIFY_NEWPREF
//let's be backward compatible!
case 'l':