diff --git a/checkin_notes b/checkin_notes index 6b1b61dddf..ed9cd67100 100755 --- a/checkin_notes +++ b/checkin_notes @@ -22212,3 +22212,11 @@ David 7 Jan 2005 sched/ db_dump.C sched_locality.C + +David 7 Jan 2005 + - User web: show "external" version of cross-project ID + (i.e. hashed with email_addr) in the My Account page. + It will now match what's in the XML dump files + + html/inc + user.inc diff --git a/html/inc/user.inc b/html/inc/user.inc index bb7e2c63e3..eb2f54505b 100644 --- a/html/inc/user.inc +++ b/html/inc/user.inc @@ -149,7 +149,11 @@ function show_user_page_private($user) { row1("Other"); row2("", "Log out"); row2("Account number
Used in URLs", $user->id); - row2("Cross-project ID", $user->cross_project_id); + $x = $user->cross_project_id . $user->email_addr; + row2( + "Cross-project ID
Used in exported accounting data", + md5($x) + ); end_table(); } diff --git a/sched/sched_locality.C b/sched/sched_locality.C index 5594ece99f..a413b007d8 100644 --- a/sched/sched_locality.C +++ b/sched/sched_locality.C @@ -186,7 +186,7 @@ static void send_new_file_work( retval = extract_filename(result.name, filename); if (retval) { log_messages.printf( - SCHED_MSG_LOG::DEBUG + SCHED_MSG_LOG::DEBUG, "result doesn't contain filename: %s\n", result.name ); continue;