diff --git a/swad_changelog.h b/swad_changelog.h index b17624466..ba6103014 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -125,17 +125,20 @@ // TODO: Modify WS function getUsers changing: userRole to indicate all users, and a new parameter filter (search string (name, @nickname, mail)) to restring number of users // TODO: Add a new WS function to count the nunmber of users to return in call to function getUsers +// TODO: Search should be restricted by default to the smaller (down in hierarchy) scope + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.231 (2016-06-24)" +#define Log_PLATFORM_VERSION "SWAD 15.231.1 (2016-06-24)" #define CSS_FILE "swad15.229.css" #define JS_FILE "swad15.226.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 15.231.1: Jun 24, 2015 All users can search guests. (? lines) Version 15.231: Jun 24, 2015 Speed up in search of users by using temporary tables. (203427 lines) Version 15.230.4: Jun 23, 2015 Optimization in search of users. (203369 lines) Version 15.230.3: Jun 23, 2015 Optimization in search of users. (203378 lines) diff --git a/swad_search.c b/swad_search.c index 8385dc5c1..d12781a72 100644 --- a/swad_search.c +++ b/swad_search.c @@ -297,7 +297,7 @@ static bool Sch_CheckIfIHavePermissionToSearch (Sch_WhatToSearch_t WhatToSearch) 0x1FF, // Sch_SEARCH_COURSES 0x1FF, // Sch_SEARCH_TEACHERS 0x1FF, // Sch_SEARCH_STUDENTS - 0x100, // Sch_SEARCH_GUESTS Only if I am a system admin + 0x1FF, // Sch_SEARCH_GUESTS 0x1FF, // Sch_SEARCH_OPEN_DOCUMENTS 0x1FE, // Sch_SEARCH_DOCUM_IN_MY_COURSES Only if I am logged 0x1FE, // Sch_SEARCH_MY_DOCUMENTS Only if I am logged diff --git a/swad_user.c b/swad_user.c index cd952128f..8cf9f3bbd 100644 --- a/swad_user.c +++ b/swad_user.c @@ -144,7 +144,7 @@ static void Usr_WriteUsrData (const char *BgColor, static void Usr_BuildQueryToGetUsrsLstCrs (Rol_Role_t Role,char *Query); static void Usr_SearchListUsrs (Rol_Role_t Role); static void Usr_CreateTmpTableAndSearchCandidateUsrs (const char *UsrQuery); -static void Usr_CreateExtraTmpTables (void); +static void Usr_CreateExtraTmpTablesForSearch (void); static void Usr_CloneTmpTableCandidateUsers (unsigned NumCopy); static void Usr_DropTmpTablesWithCandidateUsrs (void); @@ -3905,7 +3905,7 @@ static void Usr_SearchListUsrs (Rol_Role_t Role) (unsigned) Role); break; default: // I am logged - Usr_CreateExtraTmpTables (); + Usr_CreateExtraTmpTablesForSearch (); sprintf (Query,"SELECT list_usrs.UsrCod,usr_data.Sex FROM " "(" // Users whose privacy is @@ -4001,7 +4001,7 @@ static void Usr_SearchListUsrs (Rol_Role_t Role) Gbl.CurrentCty.Cty.CtyCod); break; default: // I am logged - Usr_CreateExtraTmpTables (); + Usr_CreateExtraTmpTablesForSearch (); sprintf (Query,"SELECT list_usrs.UsrCod,usr_data.Sex FROM " "(" // Users whose privacy is @@ -4114,7 +4114,7 @@ static void Usr_SearchListUsrs (Rol_Role_t Role) Gbl.CurrentIns.Ins.InsCod); break; default: // I am logged - Usr_CreateExtraTmpTables (); + Usr_CreateExtraTmpTablesForSearch (); sprintf (Query,"SELECT list_usrs.UsrCod,usr_data.Sex FROM " "(" // Users whose privacy is @@ -4223,7 +4223,7 @@ static void Usr_SearchListUsrs (Rol_Role_t Role) Gbl.CurrentCtr.Ctr.CtrCod); break; default: // I am logged - Usr_CreateExtraTmpTables (); + Usr_CreateExtraTmpTablesForSearch (); sprintf (Query,"SELECT list_usrs.UsrCod,usr_data.Sex FROM " "(" // Users whose privacy is @@ -4328,7 +4328,7 @@ static void Usr_SearchListUsrs (Rol_Role_t Role) Gbl.CurrentDeg.Deg.DegCod); break; default: // I am logged - Usr_CreateExtraTmpTables (); + Usr_CreateExtraTmpTablesForSearch (); sprintf (Query,"SELECT list_usrs.UsrCod,usr_data.Sex FROM " "(" // Users whose privacy is @@ -4428,7 +4428,7 @@ static void Usr_SearchListUsrs (Rol_Role_t Role) Gbl.CurrentCrs.Crs.CrsCod); break; default: // I am logged - Usr_CreateExtraTmpTables (); + Usr_CreateExtraTmpTablesForSearch (); sprintf (Query,"SELECT DISTINCT list_usrs.UsrCod,usr_data.Sex,crs_usr.Accepted FROM " "(" // Users whose privacy is @@ -4518,10 +4518,10 @@ static void Usr_CreateTmpTableAndSearchCandidateUsrs (const char *UsrQuery) } /*****************************************************************************/ -/************** Create more temporary tables users in search *****************/ +/************** Create more temporary tables for search users ****************/ /*****************************************************************************/ -static void Usr_CreateExtraTmpTables (void) +static void Usr_CreateExtraTmpTablesForSearch (void) { char Query[256];