summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mbbsd/mail.c19
-rw-r--r--mbbsd/talk.c6
2 files changed, 21 insertions, 4 deletions
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index f4ba6d64..a4d47df7 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -1,4 +1,4 @@
-/* $Id: mail.c,v 1.14 2002/06/27 19:49:48 kcwu Exp $ */
+/* $Id: mail.c,v 1.15 2002/07/02 02:12:56 in2 Exp $ */
#include "bbs.h"
char currmaildir[32];
static char msg_cc[] = "\033[32m[群組名單]\033[m\n";
@@ -1220,8 +1220,16 @@ static int mail_waterball(int ent, fileheader_t *fhdr, char *direct)
char fname[500], genbuf[200];
FILE *fp;
+ if( !strstr(fhdr->title, "熱線記錄") ){
+ vmsg("必須是 熱線記錄 才能使用水球整理的唷!");
+ return 1;
+ }
if(!address[0])
strcpy(address, cuser.email);
+ move(b_lines - 5, 0);
+ outs("水球整理程式:\n"
+ "系統將會按照和不同人丟的水球各獨自獨立\n"
+ "於整點的時候 (尖鋒時段除外) 將資料整理好寄送給您\n\n\n");
if(address[0]) {
sprintf(genbuf, "寄給 [%s] 嗎(Y/N/Q)?[Y] ", address);
getdata(b_lines - 2, 0, genbuf, fname, 3, LCECHO);
@@ -1235,7 +1243,7 @@ static int mail_waterball(int ent, fileheader_t *fhdr, char *direct)
if(fname[0] && strchr(fname, '.')) {
strcpy(address, fname);
} else {
- outmsg("取消處理");
+ vmsg("取消處理");
return 1;
}
}
@@ -1243,7 +1251,11 @@ static int mail_waterball(int ent, fileheader_t *fhdr, char *direct)
return -2;
// sprintf(fname, "%d\n", cmode);
- getdata(b_lines - 1, 0, "使用模式(0/1)? [1]", fname, 3, LCECHO);
+ getdata(b_lines - 1, 0, "使用模式(0/1/Q)? [1]", fname, 3, LCECHO);
+ if( fname[0] == 'Q' || fname[0] == 'q' ){
+ outmsg("取消處理");
+ return 1;
+ }
cmode = (fname[0] != '0' && fname[0] != '1') ? 1 : fname[0] - '0';
sprintf(fname, BBSHOME "/jobspool/water.src.%s-%d",
@@ -1257,6 +1269,7 @@ static int mail_waterball(int ent, fileheader_t *fhdr, char *direct)
fp = fopen(fname, "wt");
fprintf(fp, "%s\n%s\n%d\n", cuser.userid, address, cmode);
fclose(fp);
+ vmsg("設定完成, 系統將在下一個整點(尖鋒時段除外)將資料寄給您");
return FULLUPDATE;
}
#endif
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index f63778c9..e0c5fa92 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1,4 +1,4 @@
-/* $Id: talk.c,v 1.72 2002/06/30 09:20:21 in2 Exp $ */
+/* $Id: talk.c,v 1.73 2002/07/02 02:12:56 in2 Exp $ */
#include "bbs.h"
#define QCAST int (*)(const void *, const void *)
@@ -771,6 +771,10 @@ int t_display(void)
}
setuserfile(genbuf, fn_writelog);
if (more(genbuf, YEA) != -1){
+ move(b_lines - 4, 0);
+ outs("\033[1;33;45m★現在 Ptt提供創新的水球整理程式★\033[m\n"
+ "您將水球存至信箱後, 在【郵件選單】該信件前按 u,\n"
+ "系統即會將您的水球紀錄重新整理後寄送給您唷! \n");
getdata(b_lines - 1, 0, "清除(C) 移至備忘錄(M) 保留(R) (C/M/R)?[R]",
ans, sizeof(ans), LCECHO);
if (*ans == 'm'){