From 878bcdc81ea3ede5fb409493dd28707b12f53aef Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 12 May 2003 12:47:18 +0000
Subject: rename

git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@842 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/admin.c | 6 ++++--
 mbbsd/mbbsd.c | 4 ++--
 mbbsd/user.c  | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 0dee134b..15659d31 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -1,4 +1,4 @@
-/* $Id: admin.c,v 1.39 2003/05/12 04:10:13 victor Exp $ */
+/* $Id: admin.c,v 1.40 2003/05/12 12:47:18 victor Exp $ */
 #include "bbs.h"
 
 /* 使用者管理 */
@@ -524,7 +524,7 @@ x_file()
 	fpath = "etc/feast";
 	break;
     case 'm':
-	fpath = "etc/foreign_expired";
+	fpath = "etc/foreign_welcome";
 	break;
     case 'n':
 	fpath = "etc/foreign_expired_warn";
@@ -935,6 +935,8 @@ scan_register_form(char *regfile, int automode, int neednum)
 	    default:
 		prints("以下使用者資料已經更新:\n");
 		mail_muser(muser, "[註冊成功\囉]", "etc/registered");
+		if(muser.uflag2 & FOREIGN)
+		    mail_muser(muser, "[出入境管理局]", "etc/foreign_welcome");
 		muser.userlevel |= (PERM_LOGINOK | PERM_POST);
 		strlcpy(muser.realname, fdata[2], sizeof(muser.realname));
 		strlcpy(muser.address, fdata[4], sizeof(muser.address));
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index d52ffbcb..1aaf9900 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -1,4 +1,4 @@
-/* $Id: mbbsd.c,v 1.76 2003/05/11 00:35:16 victor Exp $ */
+/* $Id: mbbsd.c,v 1.77 2003/05/12 12:47:18 victor Exp $ */
 #include "bbs.h"
 
 #define SOCKET_QLEN 4
@@ -891,7 +891,7 @@ user_login()
 	}
 	else if (login_start_time - cuser.firstlogin > FOREIGN_REG_DAY * 24 * 3600){
 	    cuser.userlevel &= ~(PERM_LOGINOK | PERM_POST);
-	    mail_muser(cuser, "[出入境管理局]", "etc/foreign_expired");
+	    vmsg("警告：請至出入境管理局申請永久居留");
 	}
     }
 #endif
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 6ca5e408..5eac671d 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -1,4 +1,4 @@
-/* $Id: user.c,v 1.59 2003/05/12 04:06:35 victor Exp $ */
+/* $Id: user.c,v 1.60 2003/05/12 12:47:18 victor Exp $ */
 #include "bbs.h"
 
 static char    *sex[8] = {
@@ -1198,6 +1198,8 @@ u_register(void)
 		exit(0);
 	    }
 	    mail_muser(cuser, "[註冊成功\囉]", "etc/registeredmail");
+	    if(cuser.uflag2 & FOREIGN)
+		mail_muser(cuser, "[出入境管理局]", "etc/foreign_welcome");
 	    cuser.userlevel |= (PERM_LOGINOK | PERM_POST);
 	    prints("\n註冊成功\, 重新上站後將取得完整權限\n"
 		   "請按下任一鍵跳離後重新上站~ :)");
-- 
cgit v1.2.3