* minor fixes:

   * menu: item name refine
   * mbbsd: merge INSCREEN and BANNER.
   * logind.h: refine tabs


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4525 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 12 insertions, 11 deletions

diff --git a/include/logind.h b/include/logind.h
index 493d0c09..aebbffea 100644
--- a/include/logind.h
+++ b/include/logind.h
@@ -7,20 +7,20 @@
 
 typedef struct login_data
 {
-	// size of current structure
-	size_t cb;
+    // size of current structure
+    size_t cb;
 
     // terminal information
     int  t_lines, t_cols;
     int  encoding;
-	Fnv32_t client_code;
+    Fnv32_t client_code;
 
     // user authentication
     char userid[IDLEN+1];
-	char hostip[32+1];
+    char hostip[32+1];
 
 }   login_data;
 
 #endif // _BBS_LOGIND_H
 
-// vim:ts=4:sw=4
+// vim:et
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index 003ff719..d487eca3 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -2033,12 +2033,13 @@ check_ban_and_load(int fd, struct ProgramOption *option)
 					 * sec  */
     static int      banned = 0;
 
-#ifdef INSCREEN
+    // if you have your own banner, define as INSCREEN in pttbbs.conf
+    // if you don't want anny benner, define NO_INSCREEN
+#ifndef NO_INSCREEN
+# ifndef   INSCREEN
+#  define  INSCREEN "【" BBSNAME "】◎(" MYHOSTNAME ", " MYIP ") \r\n"
+# endif
     write(fd, INSCREEN, sizeof(INSCREEN));
-#else
-#define BANNER \
-"【" BBSNAME "】◎ 台大流行網 ◎(" MYHOSTNAME ") 調幅(" MYIP ") \r\n"
-    write(fd, BANNER, sizeof(BANNER));
 #endif
 
     if ((time(0) - chkload_time) > 1) {
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 30ae1f5e..a6421bcb 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -836,7 +836,7 @@ Play_Play(void)
 int
 Name_Menu(void)
 {
-    domenu(M_NMENU, "白色恐怖", 'O', namelist);
+    domenu(M_NMENU, "名單編輯", 'O', namelist);
     return 0;
 }