summaryrefslogtreecommitdiffstats
path: root/mbbsd
diff options
context:
space:
mode:
Diffstat (limited to 'mbbsd')
-rw-r--r--mbbsd/bbs.c3
-rw-r--r--mbbsd/friend.c4
-rw-r--r--mbbsd/gamble.c16
-rw-r--r--mbbsd/lovepaper.c4
-rw-r--r--mbbsd/mail.c4
-rw-r--r--mbbsd/menu.c12
-rw-r--r--mbbsd/syspost.c8
-rw-r--r--mbbsd/user.c46
-rw-r--r--mbbsd/var.c16
-rw-r--r--mbbsd/voteboard.c44
-rw-r--r--mbbsd/xyz.c4
11 files changed, 98 insertions, 63 deletions
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 665739ec..ed27b214 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1,4 +1,4 @@
-/* $Id: bbs.c,v 1.53 2002/06/19 13:23:14 lwms Exp $ */
+/* $Id: bbs.c,v 1.54 2002/06/19 13:40:50 lwms Exp $ */
#include "bbs.h"
static void mail_by_link(char* owner, char* title, char* path) {
@@ -1900,3 +1900,4 @@ void mobile_message(char *mobile, char *message)
bsmtp(char *fpath, char *title, char *rcpt, int method);
}
+#endif
diff --git a/mbbsd/friend.c b/mbbsd/friend.c
index d772ad8c..4a3f636c 100644
--- a/mbbsd/friend.c
+++ b/mbbsd/friend.c
@@ -1,4 +1,4 @@
-/* $Id: friend.c,v 1.6 2002/06/04 13:08:33 in2 Exp $ */
+/* $Id: friend.c,v 1.7 2002/06/19 13:27:16 lwms Exp $ */
#include "bbs.h"
/* ------------------------------------- */
@@ -160,7 +160,7 @@ static void friend_append(int type, int count) {
for( ; i < 8 ; ++i )
if( i != type ){
++j;
- sprintf(buf, " (%d) %s 版的 %s\n", j, currboard,
+ sprintf(buf, " (%d) %s 板的 %s\n", j, currboard,
friend_list[(int) i]);
outs(buf);
}
diff --git a/mbbsd/gamble.c b/mbbsd/gamble.c
index fbd06ab0..ff1c39d6 100644
--- a/mbbsd/gamble.c
+++ b/mbbsd/gamble.c
@@ -1,4 +1,4 @@
-/* $Id: gamble.c,v 1.15 2002/06/12 11:33:46 ptt Exp $ */
+/* $Id: gamble.c,v 1.16 2002/06/19 13:28:16 lwms Exp $ */
#include "bbs.h"
#ifndef _BBS_UTIL_C_
@@ -16,7 +16,7 @@ int post_msg(char* bname, char* title, char *msg, char* author)
fileheader_t fhdr;
char genbuf[256];
- /* 在 bname 版發表新文章 */
+ /* 在 bname 板發表新文章 */
sprintf(genbuf, "boards/%c/%s", bname[0], bname);
stampfile(genbuf, &fhdr);
fp = fopen(genbuf,"w");
@@ -107,10 +107,10 @@ static int show_ticket_data(char *direct, int *price, boardheader_t *bh) {
"總賭金。\n"
" 4.每筆獎金由系統抽取 5% 之稅金%s。\n\n"
"\033[32m%s:\033[m", *price,
- bh?"此賭盤由版主負責舉辦並且決定開獎時間結果, 站長不管, 願賭服輸。":
+ bh?"此賭盤由板主負責舉辦並且決定開獎時間結果, 站長不管, 願賭服輸。":
"系統每天 2:00 11:00 16:00 21:00 開獎。",
- bh?", 其中 2% 分給開獎版主":"",
- bh?"版主自訂規則及說明":"前幾次開獎結果");
+ bh?", 其中 2% 分給開獎板主":"",
+ bh?"板主自訂規則及說明":"前幾次開獎結果");
sprintf(genbuf, "%s/"FN_TICKET, direct);
@@ -193,14 +193,14 @@ int ticket(int bid)
/*--
Tim011127
為了控制CS問題 但是這邊還不能完全解決這問題,
- 若user通過檢查下去, 剛好版主開獎, 還是會造成user的這次紀錄
- 很有可能跑到下次賭盤的紀錄去, 也很有可能被版主新開賭盤時洗掉
+ 若user通過檢查下去, 剛好板主開獎, 還是會造成user的這次紀錄
+ 很有可能跑到下次賭盤的紀錄去, 也很有可能被板主新開賭盤時洗掉
不過這邊至少可以做到的是, 頂多只會有一筆資料是錯的
--*/
if(bid && !dashf(fn_ticket))
{
move(b_lines-1,0);
- prints("哇!! 耐ㄚ捏...版主已經停止下注了 不能賭嚕");
+ prints("哇!! 耐ㄚ捏...板主已經停止下注了 不能賭嚕");
pressanykey();
break;
}
diff --git a/mbbsd/lovepaper.c b/mbbsd/lovepaper.c
index 4c96f461..d4757ecf 100644
--- a/mbbsd/lovepaper.c
+++ b/mbbsd/lovepaper.c
@@ -1,4 +1,4 @@
-/* $Id: lovepaper.c,v 1.5 2002/06/04 13:08:33 in2 Exp $ */
+/* $Id: lovepaper.c,v 1.6 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
#define DATA "etc/lovepaper.dat"
@@ -18,7 +18,7 @@ int x_love() {
move(1,0);
clrtobot();
- outs("\n歡迎使用情書產生器 v0.00 版 \n");
+ outs("\n歡迎使用情書產生器 v0.00 板 \n");
outs("有何難以啟齒的話,交由系統幫你說吧.\n爸爸說 : 濫情不犯法.\n");
if(!getdata(7, 0, "收信人:", receiver, sizeof(receiver), DOECHO))
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index 8610e5c5..65141096 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -1,4 +1,4 @@
-/* $Id: mail.c,v 1.12 2002/06/06 21:34:11 in2 Exp $ */
+/* $Id: mail.c,v 1.13 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
char currmaildir[32];
static char msg_cc[] = "\033[32m[群組名單]\033[m\n";
@@ -1173,7 +1173,7 @@ static int mail_cite(int ent, fileheader_t *fhdr, char *direct) {
clrtoeol();
move(1, 0);
- generalnamecomplete("輸入看版名稱 (直接Enter進入私人信件夾):",
+ generalnamecomplete("輸入看板名稱 (直接Enter進入私人信件夾):",
buf, sizeof(buf),
SHM->Bnumber,
completeboard_compar,
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 61bf8bda..3fa138f1 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.10 2002/06/06 21:34:11 in2 Exp $ */
+/* $Id: menu.c,v 1.11 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
/* help & menu processring */
@@ -406,12 +406,12 @@ static commands_t xyzlist[] = {
{x_gpl, 0, "LLicense GNU 使用執照"},
#endif
#ifdef HAVE_INFO
- {x_program, 0, "PProgram 本程式之版本與版權宣告"},
+ {x_program, 0, "PProgram 本程式之板本與板權宣告"},
#endif
- {x_boardman,0, "MMan Boards 《看版精華區排行榜》"},
-// {x_boards,0, "HHot Boards 《看版人氣排行榜》"},
+ {x_boardman,0, "MMan Boards 《看板精華區排行榜》"},
+// {x_boards,0, "HHot Boards 《看板人氣排行榜》"},
{x_history, 0, "HHistory 《我們的成長》"},
- {x_note, 0, "NNote 《酸甜苦辣流言版》"},
+ {x_note, 0, "NNote 《酸甜苦辣流言板》"},
{x_login,0, "SSystem 《系統重要公告》"},
{x_week, 0, "WWeek 《本週五十大熱門話題》"},
{x_issue, 0, "IIssue 《今日十大熱門話題》"},
@@ -463,7 +463,7 @@ static commands_t playlist[] = {
#if HAVE_JCEE
{m_jcee, PERM_LOGINOK, "JJCEE 【 大學聯考查榜系統 】"},
#endif
- {note, PERM_LOGINOK, "NNote 【 刻刻流言版 】"},
+ {note, PERM_LOGINOK, "NNote 【 刻刻流言板 】"},
{x_weather,0 , "WWeather 【 氣象預報 】"},
{x_stock,0 , "SStock 【 股市行情 】"},
#ifdef HAVE_BIG2
diff --git a/mbbsd/syspost.c b/mbbsd/syspost.c
index bbd07381..3039cd6b 100644
--- a/mbbsd/syspost.c
+++ b/mbbsd/syspost.c
@@ -1,4 +1,4 @@
-/* $Id: syspost.c,v 1.10 2002/06/04 13:08:34 in2 Exp $ */
+/* $Id: syspost.c,v 1.11 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
void post_change_perm(int oldperm, int newperm, char *sysopid, char *userid) {
@@ -29,7 +29,7 @@ void post_change_perm(int oldperm, int newperm, char *sysopid, char *userid) {
clrtobot();
clear();
while(!getdata_str(5, 0, "請輸入理由以示負責:",
- reason, sizeof(reason), DOECHO, "看版版主:"));
+ reason, sizeof(reason), DOECHO, "看板板主:"));
fprintf(fp, "\n \033[1;37m站長%s修改權限理由是:%s\033[m",
cuser.userid, reason);
fclose(fp);
@@ -80,8 +80,8 @@ void post_violatelaw(char* crime, char* police, char* reason, char* result){
void post_newboard(char* bgroup, char* bname, char* bms){
char genbuf[256], title[128];
- sprintf(title, "[新版成立] %s", bname);
- sprintf(genbuf, "%s 開了一個新版 %s : %s\n\n新任版主為 %s\n\n恭喜*^_^*\n",
+ sprintf(title, "[新板成立] %s", bname);
+ sprintf(genbuf, "%s 開了一個新板 %s : %s\n\n新任板主為 %s\n\n恭喜*^_^*\n",
cuser.userid, bname, bgroup, bms);
post_msg("Record", title, genbuf, "[系統]");
}
diff --git a/mbbsd/user.c b/mbbsd/user.c
index c7a5e455..337010f1 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -1,4 +1,4 @@
-/* $Id: user.c,v 1.22 2002/06/06 21:34:11 in2 Exp $ */
+/* $Id: user.c,v 1.23 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
static char *sex[8] = {
@@ -84,7 +84,7 @@ void user_display(userec_t *u, int real) {
diff / 60, diff % 60);
}
- /* Thor: 想看看這個 user 是那些版的版主 */
+ /* Thor: 想看看這個 user 是那些板的板主 */
if(u->userlevel >= PERM_BM) {
int i;
boardheader_t *bhdr;
@@ -789,7 +789,7 @@ static void toregister(char *email, char *genbuf, char *phone, char *career,
clear();
stand_title("認證設定");
move(2, 0);
- outs("您好, 本站採兩種方式認證:\n"
+ outs("您好, 本站認證認證的方式有:\n"
" 1.若您有 E-Mail (本站不接受 yahoo, kimo等免費的 E-Mail)\n"
" 請輸入您的 E-Mail , 我們會寄發含有認證碼的信件給您\n"
" 收到後請到 (U)ser => (R)egister 輸入認證碼, 即可通過認證\n"
@@ -801,11 +801,35 @@ static void toregister(char *email, char *genbuf, char *phone, char *career,
"* 您應該會在輸入完成後十分鐘內收到認證信, 若過久未收到, *\n"
"* 或輸入後發生認證碼錯誤, 麻煩重填一次 E-Mail 或改手動認證 *\n"
"************************************************************\n");
+
+#ifdef HAVEMOBILE
+ outs(" 3.若您有手機門號且想採取手機簡訊認證的方式 , 請輸入 m \n"
+ " 我們將會寄發含有認證碼的簡訊給您 \n"
+ " 收到後請到(U)ser => (R)egister 輸入認證碼, 即可通過認證\n");
+#endif
+
while( 1 ){
email[0] = 0;
getfield(15, "身分認證用", "E-Mail Address", email, 50);
if( strcmp(email, "x") == 0 || strcmp(email, "X") == 0 )
break;
+#ifdef HAVEMOBILE
+ else if ( strcmp(email, "m") == 0 || strcmp(email,"M") == 0 ) {
+ if ( isvaildmobile(mobile) ) {
+ char yn[3];
+ getdata(16, 0, "請再次確認您輸入的手機號碼正確嘛? [y/N]",
+ yn, sizeof(yn), LCECHO);
+ if( yn[0] == 'Y' || yn[0] == 'y' )
+ break;
+ }
+ else{
+ move(17, 0);
+ prints("指定的手機號碼不合法,"
+ "若您無手機門號請選擇其他方式認證");
+ }
+
+ }
+#endif
else if( isvaildemail(email) ){
char yn[3];
getdata(16, 0, "請再次確認您輸入的 E-Mail 位置正確嘛? [y/N]",
@@ -838,14 +862,24 @@ static void toregister(char *email, char *genbuf, char *phone, char *career,
else{
char tmp[IDLEN + 1];
if( phone != NULL ){
- sprintf(genbuf, "%s:%s:<Email>", phone, career);
+#ifdef HAVEMOBILE
+ if ( strcmp(email, "m") == 0 || strcmp(email,"M") == 0 )
+ sprintf(genbuf, "%s:%s:<Mobile>", phone, career);
+ else
+#endif
+ sprintf(genbuf, "%s:%s:<Email>", phone, career);
strncpy(cuser.justify, genbuf, REGLEN);
sethomefile(buf, cuser.userid, "justify");
}
sprintf(buf, "您在 "BBSNAME" 的認證碼: %s", getregcode(genbuf));
strcpy(tmp, cuser.userid);
strcpy(cuser.userid, "SYSOP");
- bsmtp("etc/registermail", buf, email, 0);
+#ifdef HAVEMOBILE
+ if ( strcmp(email, "m") == 0 || strcmp(email,"M") == 0 )
+ mobile_message(mobile, buf);
+ else
+#endif
+ bsmtp("etc/registermail", buf, email, 0);
strcpy(cuser.userid, tmp);
outs("\n\n\n我們即將寄出認證信 (您應該會在 10 分鐘內收到)\n"
"收到後您可以跟據認證信標題的認證碼\n"
@@ -1070,7 +1104,7 @@ static int u_list_CB(userec_t *uentp) {
level = uentp->userlevel;
strcpy(permstr, "----");
- if(level & PERM_SYSOP)
+ if(level & PERM_SYSOP)
permstr[0] = 'S';
else if(level & PERM_ACCOUNTS)
permstr[0] = 'A';
diff --git a/mbbsd/var.c b/mbbsd/var.c
index 123f7245..4fe601b1 100644
--- a/mbbsd/var.c
+++ b/mbbsd/var.c
@@ -1,4 +1,4 @@
-/* $Id: var.c,v 1.7 2002/06/06 21:34:11 in2 Exp $ */
+/* $Id: var.c,v 1.8 2002/06/19 13:32:23 lwms Exp $ */
#define INCLUDE_VAR_H
#include "bbs.h"
@@ -41,13 +41,13 @@ char *str_permboard[] = {
"不可 Zap", /* BRD_NOZAP */
"不列入統計", /* BRD_NOCOUNT */
"不轉信", /* BRD_NOTRAN */
- "群組版", /* BRD_GROUP */
- "隱藏版", /* BRD_HIDE */
+ "群組板", /* BRD_GROUP */
+ "隱藏板", /* BRD_HIDE */
"限制(不需設定)", /* BRD_POSTMASK */
- "匿名版", /* BRD_ANONYMOUS */
- "預設匿名版", /* BRD_DEFAULTANONYMOUS */
- "違法改進中看版", /* BRD_BAD */
- "連署專用看版", /* BRD_VOTEBOARD */
+ "匿名板", /* BRD_ANONYMOUS */
+ "預設匿名板", /* BRD_DEFAULTANONYMOUS */
+ "違法改進中看板", /* BRD_BAD */
+ "連署專用看板", /* BRD_VOTEBOARD */
"已警告要廢除", /* BRD_WARNEL */
"熱門看板群組", /* BRD_TOP */
"沒想到",
@@ -237,7 +237,7 @@ char *ModeTypeTable[MAX_MODES] = {
"計算機", /* CAL */
"編籍座右銘", /* PROVERB */
"公佈欄", /* ANNOUNCE */
- "刻流言版", /* EDNOTE */
+ "刻流言板", /* EDNOTE */
"英漢翻譯機", /* CDICT */
"檢視自己物品", /* LOBJ */
"點歌", /* OSONG */
diff --git a/mbbsd/voteboard.c b/mbbsd/voteboard.c
index 2f71fef2..3d35cead 100644
--- a/mbbsd/voteboard.c
+++ b/mbbsd/voteboard.c
@@ -1,4 +1,4 @@
-/* $Id: voteboard.c,v 1.7 2002/06/04 13:08:34 in2 Exp $ */
+/* $Id: voteboard.c,v 1.8 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
#define VOTEBOARD "NewBoard"
@@ -201,7 +201,7 @@ int do_voteboard() {
pressanykey();
move(0, 0);
clrtobot();
- prints("(1)申請新版 (2)廢除舊版 (3)連署版主 (4)罷免版主\n");
+ prints("(1)申請新板 (2)廢除舊板 (3)連署板主 (4)罷免板主\n");
if (!strcmp(currboard, VOTEBOARD))
prints("(5)連署小組長 (6)罷免小組長 ");
if (!strcmp(currboard, VOTEBOARD) && HAS_PERM(PERM_SYSOP))
@@ -216,27 +216,27 @@ int do_voteboard() {
switch(temp){
case 1:
do{
- if (!getdata(4, 0, "請輸入看版英文名稱:", topic, IDLEN+1, DOECHO))
+ if (!getdata(4, 0, "請輸入看板英文名稱:", topic, IDLEN+1, DOECHO))
return FULLUPDATE;
else if (invalid_brdname(topic))
- outs("不是正確的看版名稱");
+ outs("不是正確的看板名稱");
else if (getbnum(topic) > 0)
outs("本名稱已經存在");
else
break;
}while(temp > 0);
- sprintf(title, "[申請新版] %s", topic);
- sprintf(genbuf, "%s\n\n%s%s\n%s","申請新版", "英文名稱: ", topic, "中文名稱: ");
+ sprintf(title, "[申請新板] %s", topic);
+ sprintf(genbuf, "%s\n\n%s%s\n%s","申請新板", "英文名稱: ", topic, "中文名稱: ");
- if (!getdata(5, 0, "請輸入看版中文名稱:", topic, 20, DOECHO))
+ if (!getdata(5, 0, "請輸入看板中文名稱:", topic, 20, DOECHO))
return FULLUPDATE;
strcat(genbuf, topic);
- strcat(genbuf, "\n看版類別: ");
- if (!getdata(6, 0, "請輸入看版類別:", topic, 20, DOECHO))
+ strcat(genbuf, "\n看板類別: ");
+ if (!getdata(6, 0, "請輸入看板類別:", topic, 20, DOECHO))
return FULLUPDATE;
strcat(genbuf, topic);
- strcat(genbuf, "\n版主名單: ");
- getdata(7, 0, "請輸入版主名單:", topic, IDLEN * 3 + 3, DOECHO);
+ strcat(genbuf, "\n板主名單: ");
+ getdata(7, 0, "請輸入板主名單:", topic, IDLEN * 3 + 3, DOECHO);
strcat(genbuf, topic);
strcat(genbuf, "\n申請原因: \n");
outs("請輸入申請原因(至多五行),要清楚填寫不然不會核准喔");
@@ -251,15 +251,15 @@ int do_voteboard() {
break;
case 2:
do{
- if (!getdata(4, 0, "請輸入看版英文名稱:", topic, IDLEN+1, DOECHO))
+ if (!getdata(4, 0, "請輸入看板英文名稱:", topic, IDLEN+1, DOECHO))
return FULLUPDATE;
else if (getbnum(topic) <= 0)
outs("本名稱並不存在");
else
break;
}while(temp > 0);
- sprintf(title, "[廢除舊版] %s", topic);
- sprintf(genbuf, "%s\n\n%s%s\n","廢除舊版", "英文名稱: ", topic);
+ sprintf(title, "[廢除舊板] %s", topic);
+ sprintf(genbuf, "%s\n\n%s%s\n","廢除舊板", "英文名稱: ", topic);
strcat(genbuf, "\n廢除原因: \n");
outs("請輸入廢除原因(至多五行),要清楚填寫不然不會核准喔");
for(i= 8;i<13;i++){
@@ -274,15 +274,15 @@ int do_voteboard() {
break;
case 3:
do{
- if (!getdata(4, 0, "請輸入看版英文名稱:", topic, IDLEN+1, DOECHO))
+ if (!getdata(4, 0, "請輸入看板英文名稱:", topic, IDLEN+1, DOECHO))
return FULLUPDATE;
else if (getbnum(topic) <= 0)
outs("本名稱並不存在");
else
break;
}while(temp > 0);
- sprintf(title, "[連署版主] %s", topic);
- sprintf(genbuf, "%s\n\n%s%s\n%s%s","連署版主", "英文名稱: ", topic, "申請 ID : ", cuser.userid);
+ sprintf(title, "[連署板主] %s", topic);
+ sprintf(genbuf, "%s\n\n%s%s\n%s%s","連署板主", "英文名稱: ", topic, "申請 ID : ", cuser.userid);
strcat(genbuf, "\n申請政見: \n");
outs("請輸入申請政見(至多五行),要清楚填寫不然不會核准喔");
for(i= 8;i<13;i++){
@@ -296,20 +296,20 @@ int do_voteboard() {
break;
case 4:
do{
- if (!getdata(4, 0, "請輸入看版英文名稱:", topic, IDLEN+1, DOECHO))
+ if (!getdata(4, 0, "請輸入看板英文名稱:", topic, IDLEN+1, DOECHO))
return FULLUPDATE;
else if ((i = getbnum(topic)) <= 0)
outs("本名稱並不存在");
else
break;
}while(temp > 0);
- sprintf(title, "[罷免版主] %s", topic);
- sprintf(genbuf, "%s\n\n%s%s\n%s","罷免版主", "英文名稱: ", topic, "版主 ID : ");
+ sprintf(title, "[罷免板主] %s", topic);
+ sprintf(genbuf, "%s\n\n%s%s\n%s","罷免板主", "英文名稱: ", topic, "板主 ID : ");
do{
- if (!getdata(6, 0, "請輸入版主ID:", topic, IDLEN + 1, DOECHO))
+ if (!getdata(6, 0, "請輸入板主ID:", topic, IDLEN + 1, DOECHO))
return FULLUPDATE;
else if (!userid_is_BM(topic, bcache[i-1].BM))
- outs("不是該版的版主");
+ outs("不是該板的板主");
else
break;
}while(temp > 0);
diff --git a/mbbsd/xyz.c b/mbbsd/xyz.c
index 59a265b3..3a14b4b5 100644
--- a/mbbsd/xyz.c
+++ b/mbbsd/xyz.c
@@ -1,4 +1,4 @@
-/* $Id: xyz.c,v 1.8 2002/06/04 13:08:34 in2 Exp $ */
+/* $Id: xyz.c,v 1.9 2002/06/19 13:32:23 lwms Exp $ */
#include "bbs.h"
/* 各種統計及相關資訊列表 */
@@ -301,7 +301,7 @@ int Goodbye() {
movie(999);
if(cuser.userlevel) {
getdata(b_lines - 1, 0,
- "(G)隨風而逝 (M)托夢站長 (N)酸甜苦辣流言版?[G] ",
+ "(G)隨風而逝 (M)托夢站長 (N)酸甜苦辣流言板?[G] ",
genbuf, 3, LCECHO);
if(genbuf[0] == 'm')
mail_sysop();