haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-08-15 19:23:05 +00:00
Code Issues Releases Wiki Activity

Don't list special users like '1@seafile_group'.

Browse Source
This commit is contained in:
cuihaikuo 2018-05-10 14:19:48 +08:00
parent b5186bf494
commit a74e7654e4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/server/user-mgr.c
View File

@ -1399,7 +1399,8 @@ ccnet_user_manager_get_emailusers (CcnetUserManager *manager,
"t1.is_staff, t1.is_active, t1.ctime, " "t1.is_staff, t1.is_active, t1.ctime, "
"t2.role, t1.passwd FROM EmailUser t1 " "t2.role, t1.passwd FROM EmailUser t1 "
"LEFT JOIN UserRole t2 " "LEFT JOIN UserRole t2 "
"ON t1.email = t2.email %s", "ON t1.email = t2.email %s "
"WHERE t1.email NOT LIKE '%%@seafile_group'",
status_condition); status_condition);
rc = ccnet_db_statement_foreach_row (db, rc = ccnet_db_statement_foreach_row (db,
@ -1418,6 +1419,7 @@ ccnet_user_manager_get_emailusers (CcnetUserManager *manager,
"t2.role, t1.passwd FROM EmailUser t1 " "t2.role, t1.passwd FROM EmailUser t1 "
"LEFT JOIN UserRole t2 " "LEFT JOIN UserRole t2 "
"ON t1.email = t2.email %s " "ON t1.email = t2.email %s "
"WHERE t1.email NOT LIKE '%%@seafile_group' "
"ORDER BY t1.id LIMIT ? OFFSET ?", "ORDER BY t1.id LIMIT ? OFFSET ?",
status_condition); status_condition);
@ -1500,6 +1502,7 @@ ccnet_user_manager_search_emailusers (CcnetUserManager *manager,
"LEFT JOIN UserRole t2 " "LEFT JOIN UserRole t2 "
"ON t1.email = t2.email " "ON t1.email = t2.email "
"WHERE t1.Email LIKE ? " "WHERE t1.Email LIKE ? "
"AND t1.email NOT LIKE '%%@seafile_group' "
"ORDER BY t1.id", "ORDER BY t1.id",
get_emailusers_cb, &ret, get_emailusers_cb, &ret,
1, "string", db_patt); 1, "string", db_patt);
@ -1511,6 +1514,7 @@ ccnet_user_manager_search_emailusers (CcnetUserManager *manager,
"LEFT JOIN UserRole t2 " "LEFT JOIN UserRole t2 "
"ON t1.email = t2.email " "ON t1.email = t2.email "
"WHERE t1.Email LIKE ? " "WHERE t1.Email LIKE ? "
"AND t1.email NOT LIKE '%%@seafile_group' "
"ORDER BY t1.id LIMIT ? OFFSET ?", "ORDER BY t1.id LIMIT ? OFFSET ?",
get_emailusers_cb, &ret, get_emailusers_cb, &ret,
3, "string", db_patt, 3, "string", db_patt,
@ -1744,7 +1748,7 @@ ccnet_user_manager_get_superusers(CcnetUserManager *manager)
"t2.role, t1.passwd FROM EmailUser t1 " "t2.role, t1.passwd FROM EmailUser t1 "
"LEFT JOIN UserRole t2 " "LEFT JOIN UserRole t2 "
"ON t1.email = t2.email " "ON t1.email = t2.email "
"WHERE is_staff = 1;"); "WHERE is_staff = 1 AND t1.email NOT LIKE '%%@seafile_group';");
if (ccnet_db_foreach_selected_row (db, sql, get_emailusers_cb, &ret) < 0) { if (ccnet_db_foreach_selected_row (db, sql, get_emailusers_cb, &ret) < 0) {
while (ret != NULL) { while (ret != NULL) {