From 890dd47e135c29397a6006556e186061f2afcc67 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Tue, 4 Dec 2007 17:38:19 +0000
Subject: - move hard-coded board names to pttbbs.conf.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3629 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
include/config.h | 22 ++++++++++++++++++++++
mbbsd/bbs.c | 23 ++++++++++++++++++-----
mbbsd/cache.c | 2 +-
mbbsd/gamble.c | 2 +-
mbbsd/mail.c | 2 +-
mbbsd/mbbsd.c | 6 ++----
mbbsd/talk.c | 4 ++--
mbbsd/user.c | 2 +-
sample/pttbbs.conf | 29 +++++++++++++++++++++++------
9 files changed, 71 insertions(+), 21 deletions(-)
diff --git a/include/config.h b/include/config.h
index 62113515..ff5006a0 100644
--- a/include/config.h
+++ b/include/config.h
@@ -31,6 +31,28 @@
#define BBSGID (99)
#endif
+/* Default Board Names */
+#ifndef GLOBAL_BUGREPORT
+#define GLOBAL_BUGREPORT "SYSOP"
+#endif
+
+#ifndef GLOBAL_LAW
+#define GLOBAL_LAW BBSMNAME "Law"
+#endif
+
+#ifndef GLOBAL_NEWBIE
+#define GLOBAL_NEWBIE BBSMNAME "NewHand"
+#endif
+
+#ifndef GLOBAL_NOTE
+#define GLOBAL_NOTE "Note"
+#endif
+
+#ifndef GLOBAL_FOREIGN
+#define GLOBAL_FOREIGN BBSMNAME "Foreign"
+#endif
+
+/* Environment */
#ifndef RELAY_SERVER_IP /* �H���~�H�� mail server */
#define RELAY_SERVER_IP "127.0.0.1"
#endif
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 934cf3e9..2cd2bb91 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -825,7 +825,8 @@ do_general(int isbid)
if( !CheckPostPerm()
#ifdef FOREIGN_REG
// ���O�~�y�ϥΪ̦b PttForeign �O
- && !((cuser.uflag2 & FOREIGN) && strcmp(bp->brdname, "PttForeign") == 0)
+ && !((cuser.uflag2 & FOREIGN) &&
+ strcmp(bp->brdname, GLOBAL_FOREIGN) == 0)
#endif
) {
vmsg("�藍�_�A�z�ثe�L�k�b���o���峹�I");
@@ -3241,8 +3242,14 @@ good_post(int ent, fileheader_t * fhdr, const char *direct)
if (fhdr->filemode & FILE_DIGEST) {
fhdr->filemode = (fhdr->filemode & ~FILE_DIGEST);
- if (!strcmp(currboard, "Note") || !strcmp(currboard, "PttBug") ||
- !strcmp(currboard, "Artdsn") || !strcmp(currboard, "PttLaw")) {
+ if (!strcmp(currboard, GLOBAL_NOTE) ||
+ // 2007/12/05: what is 'Artdsn' here?
+ // disable it unless someone need it...
+ // !strcmp(currboard, "Artdsn") ||
+ !strcmp(currboard, GLOBAL_BUGREPORT) ||
+ !strcmp(currboard, GLOBAL_LAW)
+ )
+ {
deumoney(searchuser(fhdr->owner, NULL), -1000); // TODO if searchuser() return 0
if (!(currmode & MODE_SELECT))
fhdr->multi.money -= 1000;
@@ -3281,8 +3288,14 @@ good_post(int ent, fileheader_t * fhdr, const char *direct)
#endif
fhdr->filemode = (fhdr->filemode & ~FILE_MARKED) | FILE_DIGEST;
- if (!strcmp(currboard, "Note") || !strcmp(currboard, "PttBug") ||
- !strcmp(currboard, "Artdsn") || !strcmp(currboard, "PttLaw")) {
+ if (!strcmp(currboard, GLOBAL_NOTE) ||
+ // 2007/12/05: what is 'Artdsn' here?
+ // disable it unless someone need it...
+ // !strcmp(currboard, "Artdsn") ||
+ !strcmp(currboard, GLOBAL_BUGREPORT) ||
+ !strcmp(currboard, GLOBAL_LAW)
+ )
+ {
deumoney(searchuser(fhdr->owner, NULL), 1000); // TODO if searchuser() return 0
if (!(currmode & MODE_SELECT))
fhdr->multi.money += 1000;
diff --git a/mbbsd/cache.c b/mbbsd/cache.c
index f38263e8..881748cd 100644
--- a/mbbsd/cache.c
+++ b/mbbsd/cache.c
@@ -855,7 +855,7 @@ reload_pttcache(void)
SHM->Pbusystate = 1;
SHM->last_film = 0;
bzero(SHM->notes, sizeof(SHM->notes));
- setapath(pbuf, "Note");
+ setapath(pbuf, GLOBAL_NOTE);
setadir(buf, pbuf);
id = 0;
if ((fp = fopen(buf, "r"))) {
diff --git a/mbbsd/gamble.c b/mbbsd/gamble.c
index 3229b906..9896333d 100644
--- a/mbbsd/gamble.c
+++ b/mbbsd/gamble.c
@@ -249,7 +249,7 @@ openticket(int bid)
if(rename(buf, outcome) != 0)
{
unlockutmpmode();
- vmsg("�L�k�dzƶ}��... �Ц� PttBug ���i�ê��W�O�W�C");
+ vmsg("�L�k�dzƶ}��... �Ц� " GLOBAL_BUGREPORT " ���i�ê��W�O�W�C");
return 0;
}
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index 74efde1f..0196aa88 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -155,7 +155,7 @@ invalidaddr(const char *addr)
"���ˬd���X��]�A�ҥH�ڭ̻ݭn���T�����~�^���C\n\n"
"�p�G�A�T�ꥴ���F�A�Ъ������L�U���������C\n"
"�p�G�A�{���A��J����}�T��O�諸�A�Ч�U�����T���ƻs�_��\n"
- "�öK�� SYSOP �� PttBug �O�C�������y�����K�`�P��p�C\n\n"
+ "�öK�� " GLOBAL_BUGREPORT " �O�C�������y�����K�`�P��p�C\n\n"
ANSI_COLOR(1;33));
sprintf(errmsg, "��l��J��}: [%s]\n"
"���~��m: �� %d �r��: 0x%02X [ %c ]\n",
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index 3e1fbef0..87b98b0f 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -257,16 +257,14 @@ abort_bbs_debug(int sig)
sigaddset(&sigset, SIGXCPU);
sigprocmask(SIG_UNBLOCK, &sigset, NULL);
- // TODO change the PttBug to some other names for non-PTT sites?
-
#define CRASH_MSG ANSI_COLOR(0) \
"\r\n�{�����`, �ߨ��_�u. \r\n" \
- "�Ь� PttBug �O�ԭz���D�o�g�L�C\r\n"
+ "�Ь� " GLOBAL_BUGREPORT " �O�ԭz���D�o�g�L�C\r\n"
#define XCPU_MSG ANSI_COLOR(0) \
"\r\n�{���ӥιL�h�p��귽, �ߨ��_�u�C\r\n" \
"�i��O (a)����Ӧh�ӥθ귽���ʧ@ �� (b)�{�����J�L�a�j��. "\
- "�Ь� PttBug �O�ԭz���D�o�g�L�C\r\n"
+ "�Ь� " GLOBAL_BUGREPORT " �O�ԭz���D�o�g�L�C\r\n"
if(sig==SIGXCPU)
write(1, XCPU_MSG, sizeof(XCPU_MSG));
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 31694b34..32d22a96 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -3407,7 +3407,7 @@ GotoNewHand(){
if (currboard[0])
strlcpy(old_board, currboard, IDLEN + 1);
- if (enter_board("PttNewHand")==0) {
+ if (enter_board(GLOBAL_NEWBIE)==0) {
Read();
}
@@ -3470,7 +3470,7 @@ AngelNotOnline(){
"�w�w�w�w�w�w�w�w�w�w�w�w�w�w�r��" ANSI_RESET "\n");
move(b_lines - 4, 0);
- outs("�p�D�H�ϥΤW���D�䤣��p�ѨϽШ�s�⪩(PttNewhand)\n"
+ outs("�p�D�H�ϥΤW���D�䤣��p�ѨϽШ�s�⪩(" GLOBAL_NEWBIE ")\n"
" �Q�d�����p�ѨϽШ�\\�@��(AngelPray)\n"
" �Q��ݪO�b�����ܥi��(AskBoard)\n"
"�Х��b�U�O�W�M�䵪�שΫ� Ctrl-P �o��");
diff --git a/mbbsd/user.c b/mbbsd/user.c
index c8a7943b..f89d1d82 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -241,7 +241,7 @@ mail_violatelaw(const char *crime, const char *police, const char *reason, const
"�ɶ�: %s\n"
ANSI_COLOR(1;32) "%s" ANSI_RESET "�P�M�G\n " ANSI_COLOR(1;32) "%s" ANSI_RESET
"�]" ANSI_COLOR(1;35) "%s" ANSI_RESET "�欰�A\n�H�ϥ������W�A�B�H" ANSI_COLOR(1;35) "%s" ANSI_RESET "�A�S���q��"
- "\n�Ш� PttLaw �d�߬����k�W��T�A�è� Play-Pay-ViolateLaw ú��@��",
+ "\n�Ш� " GLOBAL_LAW " �d�߬����k�W��T�A�è� Play-Pay-ViolateLaw ú��@��",
ctime4(&now), police, crime, reason, result);
fclose(fp);
strcpy(fhdr.title, "[���i] �H�k�P�M���i");
diff --git a/sample/pttbbs.conf b/sample/pttbbs.conf
index a3ed4c5c..a086184c 100644
--- a/sample/pttbbs.conf
+++ b/sample/pttbbs.conf
@@ -31,6 +31,29 @@
#define BBSUID 9999
#define BBSGID 99
+/* *** �H�U���w�]�O�W *** */
+
+/* �o�Ϳ��~�ɫ�ij���^���O�W�����O */
+#define GLOBAL_BUGREPORT BBSMNAME "Bug"
+/* �k�߶D�^���O */
+#define GLOBAL_LAW BBSMNAME "Law"
+/* �s��O */
+#define GLOBAL_NEWBIE BBSMNAME "NewHand"
+/* �ʺA�ݪO���a */
+#define GLOBAL_NOTE "Note"
+/* �~��O */
+#define GLOBAL_FOREIGN BBSMNAME "Foreign"
+
+/* *** �H�U���w�q�ɷ|�h�X�\��O�W *** */
+
+/* �Y�w�q, �h�H�������W���ѥ�����K */
+#define GLOBAL_DIGEST BBSMNAME "Digest"
+
+/* �Y�w�q, �h�����Ҧ����l��/�H�Ѵ��г��|�����b���O */
+//#define GLOBAL_FIVECHESS_LOG BBSMNAME "Five"
+//#define GLOBAL_CCHESS_LOG BBSMNAME "CChess"
+
+
/* �̤j�s����, �H�����c�N�ϥΪ� post ���j�峹 */
#define MAX_EDIT_LINE 2048
@@ -98,12 +121,6 @@
/* �Y�w�q, �Τ@�ө_�Ǫ��Ʀr���ˬd�ڪ��̷R�M�ݪO�C���O�_���~ */
#define MEM_CHECK 0x98761234
-/* �Y�w�q, �h�H�������W���ѥ�����K */
-#define GLOBAL_DIGEST "PttDigest"
-
-/* �Y�w�q, �h�����Ҧ����l��/�H�Ѵ��г��|�����b���O */
-//#define GLOBAL_FIVECHESS_LOG "PttFive"
-//#define GLOBAL_CCHESS_LOG "PttCChess"
/* �Y�w�q, �h�i�b�~�� (shmctl cmsignal) �n�D�N mbbsd�N zapbuf ����.
�|�ϥΫD���W���O����n�D�禡. (�ثe�u�b FreeBSD�W���չL)
--
cgit v1.2.3