remove fav branch, open new branch for big5<->gb

git-svn-id: http://opensvn.csie.org/pttbbs/branches/victor.gb@1373 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

24 files changed, 40 insertions, 32 deletions

diff --git a/pttbbs/docs/INSTALL b/pttbbs/docs/INSTALL
index 09f8a94b..8ef9d1f9 100644
--- a/pttbbs/docs/INSTALL
+++ b/pttbbs/docs/INSTALL
@@ -28,16 +28,19 @@ $Id$
 
     1)至 ftp://ptt2.cc 抓得每日自動製作的 snapshot ,
       通常檔名長的會像是 pttbbs-DATE-SNAP.tar.gz
+      再解開該檔即可: tar zxvf pttbbs-DATE-SNAP.tar.gz
 
-    2)直接抓取 http://ptt2.cc:8080/pttbbs/trunk/pttbbs/ 下所有資料
-      如 wget -r -np http://ptt2.cc:8080/pttbbs/trunk/pttbbs/
+    2)直接抓取 http://OpenSVN.csie.org/pttbbs/trunk/pttbbs下的所有資料.
+      如 wget -r -np http://OpenSVN.csie.org/pttbbs/trunk/pttbbs
 
     3)透過 subversion 聯繫 pttbbs version control repository
-      您必須先安裝 subversion
-       (in FreeBSD, `cd /usr/ports/devel/subversion/; make all install clean` )
+      您必須先安裝 subversion (請參考官方網站 http://subversion.tigris.org/ )
+      在 FreeBSD底下, 直接使用 ports 安裝即可:
+      		cd /usr/ports/devel/subversion/; make all install
+      其他作業系統請參考 http://subversion.tigris.org/project_packages.html
+      或相關文件.
 
-      再執行 svn checkout svn://ptt2.cc/trunk/pttbbs 或是
-             svn checkout http://ptt2.cc:8080/pttbbs/trunk/pttbbs/
+      再執行 svn checkout http://OpenSVN.csie.org/pttbbs/trunk/pttbbs
 
     其中不論您以方式 1或 3取得源碼, 您都可以在該目錄下直接透過 svn update
     更新至 pttbbs 最新的源碼. 如:
diff --git a/pttbbs/include/gomo.h b/pttbbs/include/gomo.h
index e2a5a5ca..30556aa9 100644
--- a/pttbbs/include/gomo.h
+++ b/pttbbs/include/gomo.h
@@ -1,4 +1,4 @@
-/* $Id: gomo.h,v 1.2 2002/06/04 13:07:12 in2 Exp $ */
+/* $Id$ */
 
 #ifndef _INCLUDE_GOMO_H
 #define _INCLUDE_GOMO_H
diff --git a/pttbbs/mbbsd/args.c b/pttbbs/mbbsd/args.c
index bf36827b..32156517 100644
--- a/pttbbs/mbbsd/args.c
+++ b/pttbbs/mbbsd/args.c
@@ -1,4 +1,4 @@
-/* $Id: args.c,v 1.8 2003/06/26 01:04:03 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 #ifdef HAVE_SETPROCTITLE
 
diff --git a/pttbbs/mbbsd/bbcall.c b/pttbbs/mbbsd/bbcall.c
index 93fe499d..12d3ec06 100644
--- a/pttbbs/mbbsd/bbcall.c
+++ b/pttbbs/mbbsd/bbcall.c
@@ -1,4 +1,4 @@
-/* $Id: bbcall.c,v 1.9 2003/06/28 08:44:03 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 #define SERVER_0941     "www.chips.com.tw"
diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c
index 70d48202..dcf2608e 100644
--- a/pttbbs/mbbsd/board.c
+++ b/pttbbs/mbbsd/board.c
@@ -1075,6 +1075,7 @@ choose_board(int newflag)
 	    brdnum = -1;
 	    break;
 	case 'y':
+	    if (get_current_fav() != NULL || yank_flag != 0)
 	    yank_flag = (yank_flag + 1) % 2;
 	    brdnum = -1;
 	    break;
@@ -1129,6 +1130,8 @@ choose_board(int newflag)
 		ptr = &nbrd[num];
 		if (yank_flag == 0) {
 		    if (ptr->myattr & BRD_FAV) {
+			if (ptr->myattr & BRD_FOLDER && getans("你確定刪除嗎? [N/y]") != 'y')
+			    break;
 			fav_remove_item(ptr->bid, get_fav_type(ptr));
 			ptr->myattr &= ~BRD_FAV;
 		    }
diff --git a/pttbbs/mbbsd/calendar.c b/pttbbs/mbbsd/calendar.c
index 67524a91..3faed16a 100644
--- a/pttbbs/mbbsd/calendar.c
+++ b/pttbbs/mbbsd/calendar.c
@@ -1,4 +1,4 @@
-/* $Id: calendar.c,v 1.8 2003/01/16 11:58:04 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 typedef struct event_t {
diff --git a/pttbbs/mbbsd/card.c b/pttbbs/mbbsd/card.c
index 55102df5..2ed12260 100644
--- a/pttbbs/mbbsd/card.c
+++ b/pttbbs/mbbsd/card.c
@@ -1,4 +1,4 @@
-/* $Id: card.c,v 1.6 2002/07/22 19:02:00 in2 Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 static int
diff --git a/pttbbs/mbbsd/dark.c b/pttbbs/mbbsd/dark.c
index 4c9c6486..71058894 100644
--- a/pttbbs/mbbsd/dark.c
+++ b/pttbbs/mbbsd/dark.c
@@ -1,4 +1,4 @@
-/* $Id: dark.c,v 1.8 2002/07/22 19:02:00 in2 Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 #define RED   1
diff --git a/pttbbs/mbbsd/fav.c b/pttbbs/mbbsd/fav.c
index 8267cbe8..5446a1ea 100644
--- a/pttbbs/mbbsd/fav.c
+++ b/pttbbs/mbbsd/fav.c
@@ -38,10 +38,6 @@ inline int get_data_number(fav_t *fp){
     return fp->nBoards + fp->nLines + fp->nFolders;
 }
 
-inline int get_current_fav_level(void){
-    return fav_stack_num;
-}
-
 inline fav_t *get_current_fav(void){
     if (fav_stack_num == 0)
 	return NULL;
diff --git a/pttbbs/mbbsd/lovepaper.c b/pttbbs/mbbsd/lovepaper.c
index 1ab87944..826f6eb4 100644
--- a/pttbbs/mbbsd/lovepaper.c
+++ b/pttbbs/mbbsd/lovepaper.c
@@ -1,4 +1,4 @@
-/* $Id: lovepaper.c,v 1.11 2003/01/19 16:06:06 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 #define DATA "etc/lovepaper.dat"
 
diff --git a/pttbbs/mbbsd/syspost.c b/pttbbs/mbbsd/syspost.c
index 8fdc361c..39ccf97e 100644
--- a/pttbbs/mbbsd/syspost.c
+++ b/pttbbs/mbbsd/syspost.c
@@ -1,4 +1,4 @@
-/* $Id: syspost.c,v 1.18 2003/01/19 16:06:06 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 int
diff --git a/pttbbs/mbbsd/topsong.c b/pttbbs/mbbsd/topsong.c
index 015f7de5..81f4d0c6 100644
--- a/pttbbs/mbbsd/topsong.c
+++ b/pttbbs/mbbsd/topsong.c
@@ -1,4 +1,4 @@
-/* $Id: topsong.c,v 1.6 2002/07/27 10:04:34 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 #define MAX_SONGS 300
diff --git a/pttbbs/mbbsd/user.c b/pttbbs/mbbsd/user.c
index 323d0939..3554103f 100644
--- a/pttbbs/mbbsd/user.c
+++ b/pttbbs/mbbsd/user.c
@@ -936,7 +936,7 @@ isvalidemail(char *email)
 }
 
 static void
-toregister(char *email, char *genbuf, char *phone, char *career, char fore,
+toregister(char *email, char *genbuf, char *phone, char *career,
 	   char *ident, char *rname, char *addr, char *mobile)
 {
     FILE           *fn;
@@ -1250,7 +1250,7 @@ u_register(void)
 	    outs("認證碼錯誤\n");
 	    pressanykey();
 	}
-	toregister(email, genbuf, phone, career, fore[0], ident, rname, addr, mobile);
+	toregister(email, genbuf, phone, career, ident, rname, addr, mobile);
 	return FULLUPDATE;
     }
 
@@ -1396,7 +1396,7 @@ u_register(void)
     trim(addr);
     trim(phone);
 
-    toregister(email, genbuf, phone, career, fore[0], ident, rname, addr, mobile);
+    toregister(email, genbuf, phone, career, ident, rname, addr, mobile);
 
     clear();
     move(9, 3);
diff --git a/pttbbs/mbbsd/vice.c b/pttbbs/mbbsd/vice.c
index e774479c..d66f498d 100644
--- a/pttbbs/mbbsd/vice.c
+++ b/pttbbs/mbbsd/vice.c
@@ -1,4 +1,4 @@
-/* $Id: vice.c,v 1.9 2003/06/28 08:49:26 kcwu Exp $ */
+/* $Id$ */
 #include "bbs.h"
 
 #define VICE_PLAY   BBSHOME "/etc/vice/vice.play"
diff --git a/pttbbs/pttpi/cgi/Makefile b/pttbbs/pttpi/cgi/Makefile
index 42613de3..8b7b61a1 100644
--- a/pttbbs/pttpi/cgi/Makefile
+++ b/pttbbs/pttpi/cgi/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2003/05/19 01:33:00 in2 Exp $
+# $Id$
 
 .include "../../pttbbs.mk"
 
diff --git a/pttbbs/pttpi/cgi/pttpi.c b/pttbbs/pttpi/cgi/pttpi.c
index 1e452f68..28ec6197 100644
--- a/pttbbs/pttpi/cgi/pttpi.c
+++ b/pttbbs/pttpi/cgi/pttpi.c
@@ -1,4 +1,4 @@
-/* $Id: pttpi.c,v 1.5 2003/05/19 05:15:36 in2 Exp $ */
+/* $Id$ */
 #include "bbs.h"
 #include "pierr.h"
 #include <xmlrpc.h>
diff --git a/pttbbs/pttpi/cgi/t/article.list.pl b/pttbbs/pttpi/cgi/t/article.list.pl
index 27370aa1..9943741a 100644
--- a/pttbbs/pttpi/cgi/t/article.list.pl
+++ b/pttbbs/pttpi/cgi/t/article.list.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: article.list.pl,v 1.1 2003/05/19 02:04:14 in2 Exp $
+# $Id$
 use Frontier::Client;
 use Frontier::RPC2;
 use MIME::Base64;
diff --git a/pttbbs/pttpi/cgi/t/article.readfn.pl b/pttbbs/pttpi/cgi/t/article.readfn.pl
index e2d0bc27..805948ff 100644
--- a/pttbbs/pttpi/cgi/t/article.readfn.pl
+++ b/pttbbs/pttpi/cgi/t/article.readfn.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: article.readfn.pl,v 1.1 2003/05/19 02:06:34 in2 Exp $
+# $Id$
 use Frontier::Client;
 use Frontier::RPC2;
 use MIME::Base64;
diff --git a/pttbbs/pttpi/cgi/t/board.getBid.pl b/pttbbs/pttpi/cgi/t/board.getBid.pl
index a628da4e..0e542f5c 100644
--- a/pttbbs/pttpi/cgi/t/board.getBid.pl
+++ b/pttbbs/pttpi/cgi/t/board.getBid.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: board.getBid.pl,v 1.1 2003/05/19 01:57:22 in2 Exp $
+# $Id$
 use Frontier::Client;
 use Data::Dumper;
 do 'host.pl';
diff --git a/pttbbs/pttpi/cgi/t/board.getBrdInfo.pl b/pttbbs/pttpi/cgi/t/board.getBrdInfo.pl
index 7870e386..4de62ca2 100644
--- a/pttbbs/pttpi/cgi/t/board.getBrdInfo.pl
+++ b/pttbbs/pttpi/cgi/t/board.getBrdInfo.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: board.getBrdInfo.pl,v 1.1 2003/05/19 01:58:27 in2 Exp $
+# $Id$
 use Frontier::Client;
 use Frontier::RPC2;
 use MIME::Base64;
diff --git a/pttbbs/pttpi/cgi/t/board.getNarticle.pl b/pttbbs/pttpi/cgi/t/board.getNarticle.pl
index a5fb56a1..1cc0a422 100644
--- a/pttbbs/pttpi/cgi/t/board.getNarticle.pl
+++ b/pttbbs/pttpi/cgi/t/board.getNarticle.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: board.getNarticle.pl,v 1.1 2003/05/19 02:01:15 in2 Exp $
+# $Id$
 use Frontier::Client;
 use Frontier::RPC2;
 use MIME::Base64;
diff --git a/pttbbs/pttpi/cgi/t/class.list.pl b/pttbbs/pttpi/cgi/t/class.list.pl
index 9e10932b..f328caf3 100644
--- a/pttbbs/pttpi/cgi/t/class.list.pl
+++ b/pttbbs/pttpi/cgi/t/class.list.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: class.list.pl,v 1.1 2003/05/19 02:02:52 in2 Exp $
+# $Id$
 use Frontier::Client;
 use Frontier::RPC2;
 use MIME::Base64;
diff --git a/pttbbs/sample/crontab b/pttbbs/sample/crontab
index 3eb4c4f3..888dde53 100644
--- a/pttbbs/sample/crontab
+++ b/pttbbs/sample/crontab
@@ -99,6 +99,12 @@
 # 每日砍除 ALLPOST
 30	5	*	*	*	/bin/rm boards/A/ALLPOST; mkdir boards/A/ALLPOST
 
+# for safty
+9	*	*	*	*	bin/shmctl bBMC
+
+# rebuildaloha
+25	6	3	*	*	bin/rebuildaloha.pl > /dev/null
+
 # utmpfix
 0	2-20	*	*	*	bin/shmctl utmpfix -n
 0	21	*	*	*	bin/shmctl utmpfix -t 10800
diff --git a/pttbbs/util/xchatd.h b/pttbbs/util/xchatd.h
index d0a6e1e4..fed869eb 100644
--- a/pttbbs/util/xchatd.h
+++ b/pttbbs/util/xchatd.h
@@ -1,4 +1,4 @@
-/* $Id: xchatd.h,v 1.1 2002/03/07 15:13:46 in2 Exp $ */
+/* $Id$ */
 
 #ifndef _XCHAT_H_
 #define _XCHAT_H_