summaryrefslogtreecommitdiffstats
path: root/mbbsd/bbs.c
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2007-12-19 09:56:21 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2007-12-19 09:56:21 +0800
commit3fb733dd415e5f0fd762e5f14272e400b20ca990 (patch)
tree9d847f03d38dad3421449969f47ccd476cd67058 /mbbsd/bbs.c
parent17799f4670364f95b26c99a68a5fb44a5470a721 (diff)
downloadpttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.tar
pttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.tar.gz
pttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.tar.bz2
pttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.tar.lz
pttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.tar.xz
pttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.tar.zst
pttbbs-3fb733dd415e5f0fd762e5f14272e400b20ca990.zip
- exp: edit/upload now enabled for special boards
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3707 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/bbs.c')
-rw-r--r--mbbsd/bbs.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 1d10941d..0baf6de9 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -856,7 +856,7 @@ do_general(int isbid)
char ctype[8][5] = {"問題", "建議", "討論", "心得",
"閒聊", "請益", "公告", "情報"};
boardheader_t *bp;
- int islocal, posttype=-1;
+ int islocal, posttype=-1, edflags = 0;
ifuseanony = 0;
assert(0<=currbid-1 && currbid-1<MAX_BOARD);
@@ -970,8 +970,15 @@ do_general(int isbid)
setbnfile(genbuf, bp->brdname, "postsample", posttype);
Copy(genbuf, fpath);
}
+
+#ifdef EXP_EDIT_UPLOAD
+# ifdef GLOBAL_BBSMOVIE
+ if (strcmp(currboard, GLOBAL_BBSMOVIE) == 0)
+ edflags |= EDITFLAG_UPLOAD;
+# endif // GLOBAL_BBSMOVIE
+#endif // EXP_EDIT_UPLOAD
- aborted = vedit(fpath, YEA, &islocal);
+ aborted = vedit2(fpath, YEA, &islocal, edflags);
if (aborted == -1) {
unlink(fpath);
pressanykey();
@@ -1327,11 +1334,17 @@ edit_post(int ent, fileheader_t * fhdr, const char *direct)
// int recordTouched = 0;
time4_t oldmt, newmt;
off_t oldsz;
+ int edflags = 0;
#ifdef EDITPOST_SMARTMERGE
char canDoSmartMerge = 1;
#endif // EDITPOST_SMARTMERGE
+#ifdef EXP_EDITPOST_TEXTONLY
+ // experimental: "text only" editing
+ edflags |= EXP_EDITPOST_TEXTONLY;
+#endif
+
assert(0<=currbid-1 && currbid-1<MAX_BOARD);
if (strcmp(bp->brdname, GLOBAL_SECURITY) == 0)
return DONOTHING;
@@ -1397,14 +1410,9 @@ edit_post(int ent, fileheader_t * fhdr, const char *direct)
#endif // EDITPOST_SMARTMERGE
-#ifdef EXP_EDITPOST_TEXTONLY
- // experimental: "text only" editing
- if (vedit2(fpath, 0, NULL, 1) == -1)
- break;
-#else
- if (vedit(fpath, 0, NULL) == -1)
+
+ if (vedit2(fpath, 0, NULL, edflags) == -1)
break;
-#endif
newmt = dasht(genbuf);