summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2012-11-28 23:23:32 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2012-11-28 23:23:32 +0800
commitd08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8 (patch)
tree9dbe5a00a30d02daaf65e6f1b6c00e0283d369a0
parent56e8444013e4c3aeaae4f31e747f4a883ce84343 (diff)
downloadpttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.tar
pttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.tar.gz
pttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.tar.bz2
pttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.tar.lz
pttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.tar.xz
pttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.tar.zst
pttbbs-d08fb45c9f99cb4eb4a91629a16b7c1e0a0decc8.zip
Improve AngelCIA process.
- hide ip in query. - display user reference (usernum/UID) in selection screen, help tracking angels that change nicks to unexpected / fake values. git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5721 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/mbbsd/angel.c12
-rw-r--r--pttbbs/mbbsd/talk.c6
2 files changed, 12 insertions, 6 deletions
diff --git a/pttbbs/mbbsd/angel.c b/pttbbs/mbbsd/angel.c
index a0e25494..85ec0314 100644
--- a/pttbbs/mbbsd/angel.c
+++ b/pttbbs/mbbsd/angel.c
@@ -229,21 +229,23 @@ select_angel() {
for (i = 0; i < list.angels; i++) {
char fn[PATHLEN];
char nick[IDLEN + 1] = "";
- const char *uid = getuserid(list.uids[i]);
+ int uid = list.uids[i];
+ const char *userid = getuserid(uid);
FILE *fp = NULL;
int has_nick = 0;
- sethomefile(fn, uid, FN_ANGELMSG);
+ sethomefile(fn, userid, FN_ANGELMSG);
if ((fp = fopen(fn, "rt")) != NULL) {
angel_parse_nick_fp(fp, nick, sizeof(nick));
strlcat(nick, "小天使", sizeof(nick));
has_nick = 1;
fclose(fp);
} else {
- strlcpy(nick, uid, sizeof(nick));
+ strlcpy(nick, userid, sizeof(nick));
}
- prints(" %3i. %s %s\n", i + 1, nick,
- has_nick ? "" : ANSI_COLOR(1;31) "(未設定暱稱)" ANSI_RESET);
+ prints(" %3i. %s %s [UID: %d]\n", i + 1, nick,
+ has_nick ? "" : ANSI_COLOR(1;31) "(未設定暱稱)" ANSI_RESET,
+ uid);
}
while (list.angels) {
char ans[5];
diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c
index 8a105097..c711952a 100644
--- a/pttbbs/mbbsd/talk.c
+++ b/pttbbs/mbbsd/talk.c
@@ -488,7 +488,10 @@ my_query(const char *uident)
outs("《私人信箱》最近無新信件\n");
// ------------------------------------------------------------
-
+#ifdef ANGEL_CIA_ACCOUNT
+ if (strcasecmp(muser.userid, ANGEL_CIA_ACCOUNT) != 0)
+#endif
+ {
prints("《上次上站》%-28.28s《上次故鄉》",
PERM_HIDE(&muser) ? "秘密" :
Cdate(muser.lastseen ? &muser.lastseen : &muser.lastlogin));
@@ -499,6 +502,7 @@ my_query(const char *uident)
#endif // !USE_MASKED_FROMHOST
outs(muser.lasthost[0] ? muser.lasthost : "(不詳)");
outs("\n");
+ }
// ------------------------------------------------------------