feature for SOB users to import account

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

2 files changed, 58 insertions, 123 deletions

diff --git a/include/fpg.h b/include/fpg.h
index 57ae46c3..0ceabd73 100644
--- a/include/fpg.h
+++ b/include/fpg.h
@@ -1,137 +1,72 @@
-
-
 #define STRLEN   80             /* Length of most string data */
+#define BRC_STRLEN 15           /* Length of boardname */
 #define BTLEN    48             /* Length of board title */
-#define FTTLEN    72             /* Length of title */
 #define NAMELEN  40             /* Length of username/realname */
 #define FNLEN    33             /* Length of filename  */
+                                /* Ptt 說這裡有bug*/
 #define IDLEN    12             /* Length of bid/uid */
 #define PASSLEN  14             /* Length of encrypted passwd field */
 #define REGLEN   38             /* Length of registration data */
 
-typedef unsigned char uschar;   /* length = 1 */
-typedef unsigned int  usint;    /* length = 4 */
-
 
-typedef struct
-{
-      uschar        id;
-        char          broken;
-}       WEAPONARMOR;
 
-typedef struct
-{
-  char          id;
-  char          name[IDLEN + 1];
-  char          lv;
-  short         lp;
-  ushort        mlp;
-  short         hp;
-  ushort        mhp;
-  uschar        po;
-  uschar        st;
-  uschar        ag;
-  uschar        lu;
-  int           ex;
-  char          emotion;
-  char          moral;
-  char          wisdom;
-  char          will;
-  char          charm;
-  WEAPONARMOR   weapon;
-  WEAPONARMOR   armor[4];
-  uschar        flag;
-  char          hungry;
-  char          sick;
-  char          angry;
-}       PET;
-
-typedef struct
-{
-  char   userid[IDLEN + 1];
-  char   realname[20];
-  char   username[24];
-  char   passwd[PASSLEN];
-  ushort uflag;
-  usint  userlevel;
-  ushort numlogins;
-  ushort numposts;
-  time_t firstlogin;
-  time_t lastlogin;
-  char   lasthost[16];
-  char   email[50];
-  char   address[50];
-  char   justify[REGLEN + 1];
-  uschar month;
-  uschar day;
-  uschar year;
-  uschar sex;
-  uschar state;
-  ushort mailk;
-  ushort keepmail;
-  int    money;
-  ushort totalday;
-  uschar totalhour;
-  uschar totalmin;
-  int    market[10];
-  short  locate;
-  char   action;
-  char   direct;
-  char   speed;
-  char   count;
-  uschar landnum;
-  uschar tool[10];
-  char   NAME[IDLEN + 1];
-  char   LV;
-  short  HP;
-  short  MHP;
-  short  MP;
-  short  MMP;
-  short  WC;
-  short  AC;
-  short  PO;
-  short  ST;
-  short  AG;
-  short  LU;
-  int    EX;
-  char   EVENT;
-  uschar WA[6];
-  uschar USE[10];
-  uschar MAGIC[5];
-  uschar NOWOCCUPATION;
-  short  OCCUPATION[4];
-  uschar cardfightnum;
-  uschar cardfight[20];
-  uschar dragon[5];
-  PET    pet;
-  usint  bank;
-  char   left[36];
-} ACCT;
+typedef unsigned char uschar;   /* length = 1 */
+typedef unsigned int usint;     /* length = 4 */
+typedef unsigned short int ushort;     /* length = 4 */
 
-struct fileheader
+/* ----------------------------------------------------- */
+/* .PASSWDS struct : 512 bytes                           */
+/* ----------------------------------------------------- */
+struct sobuserec
 {
-  char filename[FNLEN];         /* M.9876543210.A */
-  char savemode;                /* file save mode */
-  char owner[IDLEN + 2];        /* uid[.] */
-  char date[6];                 /* [02/02] or space(5) */
-  char title[FTTLEN + 1];
-  uschar filemode;              /* must be last field @ boards.c */
+  char userid[IDLEN + 1];         /* 使用者名稱  13 bytes */
+  char realname[20];              /* 真實姓名    20 bytes */
+  char username[24];              /* 暱稱        24 bytes */
+  char passwd[PASSLEN];           /* 密碼        14 bytes */
+  uschar uflag;                   /* 使用者選項   1 byte  */
+  usint userlevel;                /* 使用者權限   4 bytes */
+  ushort numlogins;               /* 上站次數     2 bytes */
+  ushort numposts;                /* POST次數     2 bytes */
+  time_t firstlogin;              /* 註冊時間     4 bytes */
+  time_t lastlogin;               /* 前次上站     4 bytes */
+  char lasthost[24];              /* 上站地點    24 bytes */
+  char vhost[24];                 /* 虛擬網址    24 bytes */
+  char email[50];                 /* E-MAIL      50 bytes */
+  char address[50];               /* 地址        50 bytes */
+  char justify[REGLEN + 1];       /* 註冊資料    39 bytes */
+  uschar month;                   /* 出生月份     1 byte  */
+  uschar day;                     /* 出生日期     1 byte  */
+  uschar year;                    /* 出生年份     1 byte  */
+  uschar sex;                     /* 性別         1 byte  */
+  uschar state;                   /* 狀態??       1 byte  */
+  usint habit;                    /* 喜好設定     4 bytes */
+  uschar pager;                   /* 心情顏色     1 bytes */
+  uschar invisible;               /* 隱身模式     1 bytes */
+  usint exmailbox;                /* 信箱封數     4 bytes */
+  usint exmailboxk;               /* 信箱K數      4 bytes */
+  usint toquery;                  /* 好奇度       4 bytes */
+  usint bequery;                  /* 人氣度       4 bytes */
+  char toqid[IDLEN + 1];          /* 前次查誰    13 bytes */
+  char beqid[IDLEN + 1];          /* 前次被誰查  13 bytes */
+  unsigned long int totaltime;    /* 上線總時數   8 bytes */
+  usint sendmsg;                  /* 發訊息次數   4 bytes */
+  usint receivemsg;               /* 收訊息次數   4 bytes */
+  unsigned long int goldmoney;    /* 風塵金幣     8 bytes */
+  unsigned long int silvermoney;  /* 銀幣         8 bytes */
+  unsigned long int exp;          /* 經驗值       8 bytes */
+  time_t dtime;                   /* 存款時間     4 bytes */
+  int scoretimes;                 /* 評分次數     4 bytes */
+  uschar rtimes;                  /* 填註冊單次數 1 bytes */
+  int award;                      /* 獎懲判斷     4 bytes */
+  int pagermode;                  /* 呼叫器門號   4 bytes */
+  char pagernum[7];               /* 呼叫器號碼   7 bytes */
+  char feeling[5];                /* 心情指數     5 bytes */
+  char title[20];                 /* 稱謂(封號)  20 bytes */
+  usint five_win;
+  usint five_lost;
+  usint five_draw;
+  char pad[91];                  /* 空著填滿至512用      */
 };
-typedef struct fileheader fileheader;
 
-struct boardheader
-{
-  char brdname[IDLEN + 1];      /* bid */
-  char title[BTLEN + 1];
-  char BM[IDLEN * 3 + 3];       /* BMs' uid, token '/' */
-  char group[9];		/* 看板分類 */
-  char type;			/* 看板性質: 轉信？目錄？ */
-  char pad[1];
-  time_t bupdate;               /* note update time */
-  char pad2[3];
-  uschar bvote;                 /* Vote flags */
-  time_t vtime;                 /* Vote close time */
-  usint level;
-};
-typedef struct boardheader boardheader;
+typedef struct sobuserec sobuserec;
 
diff --git a/include/proto.h b/include/proto.h
index edfad702..ee39868e 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -358,7 +358,7 @@ int Name_Menu(void);
 
 #ifdef MERGEBBS
 /* merge */
-int m_fpg(void);
+int m_sob(void);
 void m_sob_brd(char *bname,char *fromdir);
 #endif