From 2230c0a8c5a4eb2397673d37e709454195c5e284 Mon Sep 17 00:00:00 2001 From: piaip Date: Fri, 28 Aug 2009 13:57:40 +0000 Subject: * moving into the new pwcu (password - current user helper) API git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4783 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 31 +++++++++++++++++++++++++------ include/pttstruct.h | 3 ++- 2 files changed, 27 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index 80265894..00fffb2e 100644 --- a/include/proto.h +++ b/include/proto.h @@ -187,8 +187,8 @@ const char *ask_tmpbuf(int y); /* emaildb */ #ifdef USE_EMAILDB -int emaildb_check_email(char * email, int email_len); -int emaildb_update_email(char * userid, int userid_len, char * email, int email_len); +int emaildb_check_email (const char * email, int email_len); +int emaildb_update_email(const char * userid, int userid_len, const char * email, int email_len); #endif #ifdef USE_REGCHECKD int regcheck_ambiguous_userid_exist(const char *userid); @@ -615,7 +615,7 @@ int isvalidemail(char *email); void uinfo_query(userec_t *u, int real, int unum); int showsignature(char *fname, int *j, SigInfo *psi); int u_cancelbadpost(); -void kick_all(char *user); +void kick_all(const char *user); void violate_law(userec_t * u, int unum); void mail_violatelaw(const char* crime, const char* police, const char* reason, const char* result); int u_info(void); @@ -692,12 +692,31 @@ void passwd_force_update(int flag); int passwd_sync_update (int num, userec_t * buf); int passwd_sync_query (int num, userec_t * buf); -// int passwd_add_my_numpost(int diff); // temporary hack before new account system ready. - // current user help utilities -int pwcuSetSignature (unsigned char newsig); int pwcuBitSetLevel (unsigned int mask); int pwcuBitUnsetLevel (unsigned int mask); +int pwcuSetSignature (unsigned char newsig); +int pwcuIncNumPost (); +int pwcuDecNumPost (); +int pwcuSetGoodPost (unsigned int newgp); +int pwcuViolateLaw (); +int pwcuSaveViolateLaw (); +int pwcuAddExMailBox (int m); +int pwcuToggleOutMail (); +int pwcuSetLoginView (unsigned int bits); +int pwcuSetWaterballMode(unsigned int bm); +int pwcuSetLastSongTime (time4_t clk); +int pwcuSetMyAngel (const char *angel_uid); +int pwcuSetNickname (const char *nickname); + +// session save +int pwcuLoginSave (); +int pwcuExitSave (); + +// initialization +void pwcuInitGuestPerm (); +void pwcuInitGuestInfo (); +int pwcuInitAdminPerm (); /* calendar */ int calendar(void); diff --git a/include/pttstruct.h b/include/pttstruct.h index 2c3591c4..c0ea9f64 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -94,8 +94,9 @@ typedef struct userec_t { char career[40]; /* 學歷職業 */ char phone[20]; /* 電話 */ + uint32_t numlogindays; /* 登入天次 */ - char chkpad1[52]; + char chkpad1[48]; time4_t chkpad2[3]; /* in case 有人忘了把 time4_t 調好... */ // 以上應為 sizeof(chicken_t) 同等大小 -- cgit v1.2.3 From f70549636d72d203ed0f50fb66688319c3fcb878 Mon Sep 17 00:00:00 2001 From: piaip Date: Fri, 28 Aug 2009 14:15:05 +0000 Subject: * modify more APIs git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4784 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index 00fffb2e..4263dd01 100644 --- a/include/proto.h +++ b/include/proto.h @@ -130,7 +130,7 @@ const char * postperm_msg(const char *bname); int give_tax(int money); const char* money_level(int money); int vice(int money, const char* item); -#define reload_money() cuser.money=moneyof(usernum) +#define reload_money() // cuser.money=moneyof(usernum) int lockutmpmode(int unmode, int state); int unlockutmpmode(void); int x_file(void); @@ -695,7 +695,6 @@ int passwd_sync_query (int num, userec_t * buf); // current user help utilities int pwcuBitSetLevel (unsigned int mask); int pwcuBitUnsetLevel (unsigned int mask); -int pwcuSetSignature (unsigned char newsig); int pwcuIncNumPost (); int pwcuDecNumPost (); int pwcuSetGoodPost (unsigned int newgp); @@ -704,11 +703,16 @@ int pwcuSaveViolateLaw (); int pwcuAddExMailBox (int m); int pwcuToggleOutMail (); int pwcuSetLoginView (unsigned int bits); -int pwcuSetWaterballMode(unsigned int bm); int pwcuSetLastSongTime (time4_t clk); int pwcuSetMyAngel (const char *angel_uid); int pwcuSetNickname (const char *nickname); +// non-important based variables (only save on exit) +int pwcuSetSignature (unsigned char newsig); +int pwcuSetWaterballMode(unsigned int bm); +int pwcuToggleSortBoard (); +int pwcuToggleFriendList(); + // session save int pwcuLoginSave (); int pwcuExitSave (); -- cgit v1.2.3 From e40b5f174956a652514959e367df348c0ad66d9f Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 29 Aug 2009 12:59:17 +0000 Subject: * enable lastseen and CONST_CUSER, also use cuser_ref as "&cuser". git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4786 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 1 + include/pttstruct.h | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index 4263dd01..bd547eea 100644 --- a/include/proto.h +++ b/include/proto.h @@ -718,6 +718,7 @@ int pwcuLoginSave (); int pwcuExitSave (); // initialization +void pwcuInitZero (); void pwcuInitGuestPerm (); void pwcuInitGuestInfo (); int pwcuInitAdminPerm (); diff --git a/include/pttstruct.h b/include/pttstruct.h index c0ea9f64..cd0c98df 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -66,7 +66,7 @@ typedef struct userec_t { uint32_t numlogins; /* 上站次數 */ uint32_t numposts; /* 文章篇數 */ time4_t firstlogin; /* 註冊時間 */ - time4_t lastlogin; /* 最近上站時間 */ + time4_t lastlogin; /* 最近上站時間(包含隱身) */ char lasthost[IPV4LEN+1];/* 上次上站來源 */ int32_t money; /* Ptt幣 */ @@ -97,7 +97,8 @@ typedef struct userec_t { uint32_t numlogindays; /* 登入天次 */ char chkpad1[48]; - time4_t chkpad2[3]; /* in case 有人忘了把 time4_t 調好... */ + time4_t lastseen; /* 最近上站時間(隱身不計) */ + time4_t chkpad2[2]; /* in case 有人忘了把 time4_t 調好... */ // 以上應為 sizeof(chicken_t) 同等大小 time4_t lastsong; /* 上次點歌時間 */ @@ -138,6 +139,14 @@ typedef struct userec_t { char pad_tail[28]; } PACKSTRUCT userec_t; +#ifdef CONST_CUSER +# define cuser ((const userec_t ) pwcuser) +# define cuser_ref ((const userec_t*)&pwcuser) +#else +# define cuser pwcuser +# define cuser_ref (&cuser) +#endif + /* flags in userec_t.withme */ #define WITHME_ALLFLAG 0x55555555 #define WITHME_TALK 0x00000001 -- cgit v1.2.3 From 9d9efb47decf91be83230ff1f2318d6f2d981265 Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 29 Aug 2009 15:53:49 +0000 Subject: * (pwcu branch) code refine * also changed numlogin formula to 'only increase max to one per each day', which allow us to update the value in login state instead of logout stage git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4792 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index bd547eea..6b14f475 100644 --- a/include/proto.h +++ b/include/proto.h @@ -693,8 +693,8 @@ int passwd_sync_update (int num, userec_t * buf); int passwd_sync_query (int num, userec_t * buf); // current user help utilities -int pwcuBitSetLevel (unsigned int mask); -int pwcuBitUnsetLevel (unsigned int mask); +int pwcuBitEnableLevel (unsigned int mask); +int pwcuBitDisableLevel (unsigned int mask); int pwcuIncNumPost (); int pwcuDecNumPost (); int pwcuSetGoodPost (unsigned int newgp); -- cgit v1.2.3 From 8c66da7267b5b91eb47b3321892a505e7824d5e6 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 30 Aug 2009 00:29:10 +0000 Subject: * (pwch branch) change chess results to use pwcu API git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4793 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index 6b14f475..1276c1f1 100644 --- a/include/proto.h +++ b/include/proto.h @@ -706,6 +706,8 @@ int pwcuSetLoginView (unsigned int bits); int pwcuSetLastSongTime (time4_t clk); int pwcuSetMyAngel (const char *angel_uid); int pwcuSetNickname (const char *nickname); +int pwcuChessResult (int sigType, ChessGameResult); +int pwcuSetChessEloRating(uint16_t elo_rating); // non-important based variables (only save on exit) int pwcuSetSignature (unsigned char newsig); -- cgit v1.2.3 From 2962ffe9d364a629996465a1cf08770791823db3 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 30 Aug 2009 03:00:49 +0000 Subject: * (pwcu branch) make user compatible to pwcu API git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4794 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index 1276c1f1..b01e8712 100644 --- a/include/proto.h +++ b/include/proto.h @@ -612,7 +612,7 @@ int kill_user(int num, const char *userid); int u_editcalendar(void); void user_display(const userec_t *u, int real); int isvalidemail(char *email); -void uinfo_query(userec_t *u, int real, int unum); +void uinfo_query(const char *uid, int real, int unum); int showsignature(char *fname, int *j, SigInfo *psi); int u_cancelbadpost(); void kick_all(const char *user); @@ -700,6 +700,7 @@ int pwcuDecNumPost (); int pwcuSetGoodPost (unsigned int newgp); int pwcuViolateLaw (); int pwcuSaveViolateLaw (); +int pwcuCancelBadpost (); int pwcuAddExMailBox (int m); int pwcuToggleOutMail (); int pwcuSetLoginView (unsigned int bits); @@ -708,16 +709,20 @@ int pwcuSetMyAngel (const char *angel_uid); int pwcuSetNickname (const char *nickname); int pwcuChessResult (int sigType, ChessGameResult); int pwcuSetChessEloRating(uint16_t elo_rating); +int pwcuSaveUserFlags (); // non-important based variables (only save on exit) int pwcuSetSignature (unsigned char newsig); int pwcuSetWaterballMode(unsigned int bm); int pwcuToggleSortBoard (); int pwcuToggleFriendList(); +int pwcuToggleUserFlag (unsigned int mask); // not saved until pwcuSaveUserFlags +int pwcuToggleUserFlag2 (unsigned int mask); // not saved until pwcuSaveUserFlags -// session save +// session management int pwcuLoginSave (); int pwcuExitSave (); +int pwcuReload (); // initialization void pwcuInitZero (); -- cgit v1.2.3 From 7b2cc2e83030882b319bbf87932c7727c174adc7 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 30 Aug 2009 07:33:13 +0000 Subject: * (pwcu branch) const cuser code complete git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4795 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 14 +++++++++++++- include/pttstruct.h | 5 +++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index b01e8712..e0f784c0 100644 --- a/include/proto.h +++ b/include/proto.h @@ -458,7 +458,6 @@ int setupnewuser(const userec_t *user); int regform_estimate_queuesize(); void new_register(void); void check_register(void); -void check_birthday(void); int check_regmail(char *email); // check and prompt for invalid reason; will str_lower() mail domain. void delregcodefile(void); @@ -710,6 +709,19 @@ int pwcuSetNickname (const char *nickname); int pwcuChessResult (int sigType, ChessGameResult); int pwcuSetChessEloRating(uint16_t elo_rating); int pwcuSaveUserFlags (); +int pwcuRegCompleteJustify (const char *justify); +int pwcuRegSetTemporaryJustify(const char *justify, const char *email); +int pwcuRegisterSetInfo (const char *rname, + const char *addr, + const char *career, + const char *phone, + const char *email, + int mobile, + uint8_t sex, + uint8_t year, + uint8_t month, + uint8_t day, + uint8_t is_foreign); // non-important based variables (only save on exit) int pwcuSetSignature (unsigned char newsig); diff --git a/include/pttstruct.h b/include/pttstruct.h index cd0c98df..a79e2bb6 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -140,11 +140,12 @@ typedef struct userec_t { } PACKSTRUCT userec_t; #ifdef CONST_CUSER -# define cuser ((const userec_t ) pwcuser) +// const userec_t cuser; # define cuser_ref ((const userec_t*)&pwcuser) +# define cuser (*cuser_ref) #else -# define cuser pwcuser # define cuser_ref (&cuser) +# define cuser pwcuser #endif /* flags in userec_t.withme */ -- cgit v1.2.3 From 37019e5c460e64a6dec35863d53603fbe9825ce1 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 30 Aug 2009 08:25:07 +0000 Subject: * (pwcu branch) code refine, remove unused code, and finetune alerts git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4796 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/pttstruct.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/pttstruct.h b/include/pttstruct.h index a79e2bb6..3d554e54 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -315,14 +315,8 @@ typedef struct msgque_t { #define ALERT_NEW_MAIL (0x01) #define ISNEWMAIL(utmp) (utmp->alerts & ALERT_NEW_MAIL) -#define ALERT_PWD_PERM (0x02) -#define ALERT_PWD_BADPOST (0x04) -#define ALERT_PWD_GOODPOST (0x08) -#define ALERT_PWD_JUSTIFY (0x10) -// #define ALERT_PWD_LOGINS (0x20) -#define ALERT_PWD_POSTS (0x40) -#define ALERT_PWD_RELOAD (0x80) // reload entire pwd -#define ALERT_PWD (ALERT_PWD_PERM|ALERT_PWD_BADPOST|ALERT_PWD_GOODPOST|ALERT_PWD_JUSTIFY|ALERT_PWD_POSTS|ALERT_PWD_RELOAD) +#define ALERT_PWD_PERM (0x02) +#define ISNEWPERM(utmp) (utmp->alerts & ALERT_PWD_PERM) // userinfo_t.angelpause values #define ANGELPAUSE_NONE (0) // reject none (accept all) -- cgit v1.2.3 From 5f589c904a3be5b6eaa5abd57052b481d6a24c18 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 30 Aug 2009 10:08:49 +0000 Subject: * fix numlogindays git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4799 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/pttstruct.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/pttstruct.h b/include/pttstruct.h index 3d554e54..2e130628 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -63,7 +63,7 @@ typedef struct userec_t { uint32_t uflag; /* 習慣1 , see uflags.h */ uint32_t uflag2; /* 習慣2 , see uflags.h */ uint32_t userlevel; /* 權限 */ - uint32_t numlogins; /* 上站次數 */ + uint32_t numlogindays; /* 上線資歷 (每日最多+1的登入次數) */ uint32_t numposts; /* 文章篇數 */ time4_t firstlogin; /* 註冊時間 */ time4_t lastlogin; /* 最近上站時間(包含隱身) */ @@ -94,9 +94,8 @@ typedef struct userec_t { char career[40]; /* 學歷職業 */ char phone[20]; /* 電話 */ - uint32_t numlogindays; /* 登入天次 */ - char chkpad1[48]; + char chkpad1[52]; time4_t lastseen; /* 最近上站時間(隱身不計) */ time4_t chkpad2[2]; /* in case 有人忘了把 time4_t 調好... */ // 以上應為 sizeof(chicken_t) 同等大小 -- cgit v1.2.3 From c7ec45b470726d9b50e7d549a09569e22e2a9a69 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 30 Aug 2009 12:56:13 +0000 Subject: * add more checking to numlogindays git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4802 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index e0f784c0..bc32e07d 100644 --- a/include/proto.h +++ b/include/proto.h @@ -745,5 +745,7 @@ int pwcuInitAdminPerm (); /* calendar */ int calendar(void); int ParseDate(const char *date, int *year, int *month, int *day); +int ParseDateTime(const char *date, int *year, int *month, int *day, + int *hour, int *min, int *sec); #endif -- cgit v1.2.3 From 3fbfbac63d50619f92d98140fa7f59f570a180c7 Mon Sep 17 00:00:00 2001 From: piaip Date: Mon, 31 Aug 2009 05:54:49 +0000 Subject: * merge pwcu branch with trunk git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4806 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index bc32e07d..a70298b3 100644 --- a/include/proto.h +++ b/include/proto.h @@ -187,8 +187,8 @@ const char *ask_tmpbuf(int y); /* emaildb */ #ifdef USE_EMAILDB -int emaildb_check_email (const char * email, int email_len); -int emaildb_update_email(const char * userid, int userid_len, const char * email, int email_len); +int emaildb_check_email (const char *email, int email_len); +int emaildb_update_email(const char *userid, int userid_len, const char *email, int email_len); #endif #ifdef USE_REGCHECKD int regcheck_ambiguous_userid_exist(const char *userid); -- cgit v1.2.3 From 2933c380c0ffa5422cc5bc74e23e6a92440cca92 Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 5 Sep 2009 14:22:59 +0000 Subject: * change display name of numlogindays to macro (we may change it again in future) git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4809 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/common.h b/include/common.h index d3fee9b5..bf7a1cef 100644 --- a/include/common.h +++ b/include/common.h @@ -111,6 +111,8 @@ #define STR_POST1 "看板:" #define STR_POST2 "站內:" +#define STR_LOGINDAYS "登入天次" + /* AIDS */ #define AID_DISPLAYNAME "文章代碼(AID)" /* end of AIDS */ -- cgit v1.2.3 From 12fe18273839304131da83bbb54a639896fd69f0 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 6 Sep 2009 13:07:50 +0000 Subject: * experimental: add user recent login history view git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4810 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/common.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/common.h b/include/common.h index bf7a1cef..da8a20be 100644 --- a/include/common.h +++ b/include/common.h @@ -43,6 +43,10 @@ #define FN_BOARDHELP "etc/board.help" #define FN_USERMEMO "memo.txt" // 使用者個人記事本 #define FN_BADLOGIN "logins.bad" // in BBSHOME & user directory +#define FN_RECENTLOGIN "logins.recent" // in user directory +#ifndef SZ_RECENTLOGIN +#define SZ_RECENTLOGIN (32000) +#endif // 自訂刪除文章時出現的標題與檔案 -- cgit v1.2.3 From cdc7c144df5bfa137d3f9dcdcb3fcbdd1561e579 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 6 Sep 2009 13:09:10 +0000 Subject: let's try this name git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4811 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/common.h b/include/common.h index da8a20be..6e25ce2b 100644 --- a/include/common.h +++ b/include/common.h @@ -115,7 +115,7 @@ #define STR_POST1 "看板:" #define STR_POST2 "站內:" -#define STR_LOGINDAYS "登入天次" +#define STR_LOGINDAYS "登入次數" /* AIDS */ #define AID_DISPLAYNAME "文章代碼(AID)" -- cgit v1.2.3 From e2a6b4b4502bd8926777c9b17747e65528422464 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 6 Sep 2009 13:38:14 +0000 Subject: * refine message with quantity git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4813 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/common.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/common.h b/include/common.h index 6e25ce2b..59316fb3 100644 --- a/include/common.h +++ b/include/common.h @@ -116,6 +116,7 @@ #define STR_POST2 "站內:" #define STR_LOGINDAYS "登入次數" +#define STR_LOGINDAYS_QTY "次" /* AIDS */ #define AID_DISPLAYNAME "文章代碼(AID)" -- cgit v1.2.3 From d4d7b4113cf03c906f9d408526b0dee082adde53 Mon Sep 17 00:00:00 2001 From: piaip Date: Mon, 7 Sep 2009 02:11:19 +0000 Subject: * allow query old login number (for self only) * merge latest git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4816 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/common.h | 2 +- include/pttstruct.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/common.h b/include/common.h index 59316fb3..d5400070 100644 --- a/include/common.h +++ b/include/common.h @@ -45,7 +45,7 @@ #define FN_BADLOGIN "logins.bad" // in BBSHOME & user directory #define FN_RECENTLOGIN "logins.recent" // in user directory #ifndef SZ_RECENTLOGIN -#define SZ_RECENTLOGIN (32000) +#define SZ_RECENTLOGIN (16000) // size of max recent log before rotation #endif diff --git a/include/pttstruct.h b/include/pttstruct.h index 2e130628..deae733a 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -95,7 +95,8 @@ typedef struct userec_t { char career[40]; /* 學歷職業 */ char phone[20]; /* 電話 */ - char chkpad1[52]; + uint32_t old_numlogins; /* 轉換前的 numlogins, 備份檢視用 */ + char chkpad1[48]; time4_t lastseen; /* 最近上站時間(隱身不計) */ time4_t chkpad2[2]; /* in case 有人忘了把 time4_t 調好... */ // 以上應為 sizeof(chicken_t) 同等大小 -- cgit v1.2.3 From ca5ee5b2867227c04827eb952685f8212715d1c7 Mon Sep 17 00:00:00 2001 From: piaip Date: Tue, 8 Sep 2009 03:33:23 +0000 Subject: * merge trunk * merge current * allow view old 'goodpost' just like old numlogin git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4820 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/proto.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/proto.h b/include/proto.h index a70298b3..ea232c78 100644 --- a/include/proto.h +++ b/include/proto.h @@ -53,11 +53,7 @@ void BlogMain(int); #endif /* assess */ -int inc_goodpost(const char *, int num); int inc_badpost(const char *, int num); -int inc_goodsale(const char *, int num); -int inc_badsale(const char *, int num); -//void set_assess(int uid, unsigned char num, int type); /* bbs */ void delete_allpost(const char *userid); -- cgit v1.2.3 From f115309f094fb58ce49a14a24d58144aa13d3e5c Mon Sep 17 00:00:00 2001 From: piaip Date: Thu, 10 Sep 2009 09:03:31 +0000 Subject: * make const_cuser default git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4824 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/pttstruct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/pttstruct.h b/include/pttstruct.h index deae733a..4a8b76a9 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -139,7 +139,7 @@ typedef struct userec_t { char pad_tail[28]; } PACKSTRUCT userec_t; -#ifdef CONST_CUSER +#ifndef NO_CONST_CUSER // const userec_t cuser; # define cuser_ref ((const userec_t*)&pwcuser) # define cuser (*cuser_ref) -- cgit v1.2.3