diff --git a/sql/swad.sql b/sql/swad.sql index 32b82e7d9..a88aed858 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS actions_MFU ( -- -- Table ann_seen: stores users who have seen global announcements -- -CREATE TABLE IF NOT EXISTS admin ( +CREATE TABLE IF NOT EXISTS usr_admins ( UsrCod INT NOT NULL, Scope ENUM('Sys','Ins','Ctr','Deg') NOT NULL, Cod INT NOT NULL, diff --git a/swad_account.c b/swad_account.c index 964289a3e..2c4d9fea5 100644 --- a/swad_account.c +++ b/swad_account.c @@ -1060,7 +1060,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, /***** Remove user as administrator of any degree *****/ DB_QueryDELETE ("can not remove a user as administrator", - "DELETE FROM admin WHERE UsrCod=%ld", + "DELETE FROM usr_admins WHERE UsrCod=%ld", UsrDat->UsrCod); if (QuietOrVerbose == Cns_VERBOSE) diff --git a/swad_changelog.h b/swad_changelog.h index c857a4b2c..c6b2a1c09 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -600,10 +600,14 @@ TODO: Salvador Romero Cort TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria. */ -#define Log_PLATFORM_VERSION "SWAD 20.44.1 (2021-03-05)" +#define Log_PLATFORM_VERSION "SWAD 20.44.2 (2021-03-05)" #define CSS_FILE "swad20.33.9.css" #define JS_FILE "swad20.6.2.js" /* + Version 20.44.2: Mar 05, 2021 Admins database table renamed. (305639 lines) + 1 change necessary in database: +RENAME TABLE admin TO usr_admins; + Version 20.44.1: Mar 05, 2021 Surveys database table renamed. (305623 lines) 1 change necessary in database: RENAME TABLE surveys TO svy_surveys; diff --git a/swad_database.c b/swad_database.c index fae58e922..3a1a9e585 100644 --- a/swad_database.c +++ b/swad_database.c @@ -165,25 +165,6 @@ mysql> DESCRIBE actions_MFU; "LastClick DATETIME NOT NULL," "UNIQUE INDEX(UsrCod,ActCod))"); -/***** Table admin *****/ -/* -mysql> DESCRIBE admin; -+--------+-------------------------------+------+-----+---------+-------+ -| Field | Type | Null | Key | Default | Extra | -+--------+-------------------------------+------+-----+---------+-------+ -| UsrCod | int(11) | NO | PRI | NULL | | -| Scope | enum('Sys','Ins','Ctr','Deg') | NO | PRI | NULL | | -| Cod | int(11) | NO | PRI | NULL | | -+--------+-------------------------------+------+-----+---------+-------+ -3 rows in set (0.00 sec) -*/ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS admin (" - "UsrCod INT NOT NULL," - "Scope ENUM('Sys','Ins','Ctr','Deg') NOT NULL," - "Cod INT NOT NULL," - "UNIQUE INDEX(UsrCod,Scope,Cod)," - "INDEX (Scope,Cod))"); - /***** Table agendas *****/ /* mysql> DESCRIBE agendas; @@ -3379,6 +3360,46 @@ mysql> DESCRIBE tst_tags; "UNIQUE INDEX(TagCod)," "INDEX(CrsCod,ChangeTime))"); +/***** Table usr_IDs *****/ +/* +mysql> DESCRIBE usr_IDs; ++-----------+---------------+------+-----+---------+-------+ +| Field | Type | Null | Key | Default | Extra | ++-----------+---------------+------+-----+---------+-------+ +| UsrCod | int(11) | NO | PRI | NULL | | +| UsrID | char(16) | NO | PRI | NULL | | +| CreatTime | datetime | NO | | NULL | | +| Confirmed | enum('N','Y') | NO | | N | | ++-----------+---------------+------+-----+---------+-------+ +4 rows in set (0.01 sec) +*/ + DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_IDs (" + "UsrCod INT NOT NULL," + "UsrID CHAR(16) NOT NULL," // ID_MAX_BYTES_USR_ID + "CreatTime DATETIME NOT NULL," + "Confirmed ENUM('N','Y') NOT NULL DEFAULT 'N'," + "UNIQUE INDEX(UsrCod,UsrID)," + "INDEX(UsrID))"); + +/***** Table usr_admins *****/ +/* +mysql> DESCRIBE usr_admins; ++--------+-------------------------------+------+-----+---------+-------+ +| Field | Type | Null | Key | Default | Extra | ++--------+-------------------------------+------+-----+---------+-------+ +| UsrCod | int(11) | NO | PRI | NULL | | +| Scope | enum('Sys','Ins','Ctr','Deg') | NO | PRI | NULL | | +| Cod | int(11) | NO | PRI | NULL | | ++--------+-------------------------------+------+-----+---------+-------+ +3 rows in set (0.00 sec) +*/ + DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_admins (" + "UsrCod INT NOT NULL," + "Scope ENUM('Sys','Ins','Ctr','Deg') NOT NULL," + "Cod INT NOT NULL," + "UNIQUE INDEX(UsrCod,Scope,Cod)," + "INDEX (Scope,Cod))"); + /***** Table usr_banned *****/ /* mysql> DESCRIBE usr_banned; @@ -3581,27 +3602,6 @@ mysql> DESCRIBE usr_follow; "UNIQUE INDEX (FollowedCod,FollowerCod)," "INDEX (FollowTime))"); -/***** Table usr_IDs *****/ -/* -mysql> DESCRIBE usr_IDs; -+-----------+---------------+------+-----+---------+-------+ -| Field | Type | Null | Key | Default | Extra | -+-----------+---------------+------+-----+---------+-------+ -| UsrCod | int(11) | NO | PRI | NULL | | -| UsrID | char(16) | NO | PRI | NULL | | -| CreatTime | datetime | NO | | NULL | | -| Confirmed | enum('N','Y') | NO | | N | | -+-----------+---------------+------+-----+---------+-------+ -4 rows in set (0.01 sec) -*/ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_IDs (" - "UsrCod INT NOT NULL," - "UsrID CHAR(16) NOT NULL," // ID_MAX_BYTES_USR_ID - "CreatTime DATETIME NOT NULL," - "Confirmed ENUM('N','Y') NOT NULL DEFAULT 'N'," - "UNIQUE INDEX(UsrCod,UsrID)," - "INDEX(UsrID))"); - /***** Table usr_last *****/ /* mysql> DESCRIBE usr_last; diff --git a/swad_degree.c b/swad_degree.c index 0eb402bb9..485e9adbc 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -130,9 +130,10 @@ void Deg_SeeDegWithPendingCrss (void) NumDegs = (unsigned) DB_QuerySELECT (&mysql_res,"can not get degrees" " with pending courses", "SELECT courses.DegCod,COUNT(*)" - " FROM admin,courses,degrees" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=courses.DegCod" + " FROM usr_admins,courses,degrees" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=courses.DegCod" " AND (courses.Status & %u)<>0" " AND courses.DegCod=degrees.DegCod" " GROUP BY courses.DegCod" @@ -1537,7 +1538,7 @@ void Deg_RemoveDegreeCompletely (long DegCod) /***** Remove administrators of this degree *****/ DB_QueryDELETE ("can not remove administrators of a degree", - "DELETE FROM admin WHERE Scope='%s' AND Cod=%ld", + "DELETE FROM usr_admins WHERE Scope='%s' AND Cod=%ld", Sco_GetDBStrFromScope (Hie_Lvl_DEG),DegCod); /***** Remove the degree *****/ diff --git a/swad_enrolment.c b/swad_enrolment.c index ed545de71..6b4b218ef 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2355,9 +2355,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=courses.DegCod" + " FROM usr_admins,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=courses.DegCod" " AND courses.CrsCod=crs_usr_requests.CrsCod" " AND ((1<0" " ORDER BY crs_usr_requests.RequestTime DESC", @@ -2373,9 +2374,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=degrees.CtrCod" + " FROM usr_admins,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" " AND courses.CrsCod=crs_usr_requests.CrsCod" " AND ((1<0" @@ -2392,9 +2394,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,centres,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=centres.InsCod" + " FROM usr_admins,centres,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=centres.InsCod" " AND centres.CtrCod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" " AND courses.CrsCod=crs_usr_requests.CrsCod" @@ -2459,9 +2462,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,institutions,centres,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod" + " FROM usr_admins,institutions,centres,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod" " AND degrees.CtrCod=centres.CtrCod" " AND centres.InsCod=institutions.InsCod" " AND institutions.CtyCod=%ld" @@ -2482,9 +2486,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,institutions,centres,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=centres.CtrCod" + " FROM usr_admins,institutions,centres,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=centres.CtrCod" " AND centres.InsCod=institutions.InsCod" " AND institutions.CtyCod=%ld" " AND centres.CtrCod=degrees.CtrCod" @@ -2505,9 +2510,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,institutions,centres,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=institutions.InsCod" + " FROM usr_admins,institutions,centres,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=institutions.InsCod" " AND institutions.CtyCod=%ld" " AND institutions.InsCod=centres.InsCod" " AND centres.CtrCod=degrees.CtrCod" @@ -2580,9 +2586,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,centres,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod" + " FROM usr_admins,centres,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod" " AND degrees.CtrCod=centres.CtrCod" " AND centres.InsCod=%ld" " AND degrees.DegCod=courses.DegCod" @@ -2602,9 +2609,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,centres,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=centres.CtrCod" + " FROM usr_admins,centres,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=centres.CtrCod" " AND centres.InsCod=%ld" " AND centres.CtrCod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" @@ -2675,9 +2683,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) "crs_usr_requests.UsrCod," "crs_usr_requests.Role," "UNIX_TIMESTAMP(crs_usr_requests.RequestTime)" - " FROM admin,degrees,courses,crs_usr_requests" - " WHERE admin.UsrCod=%ld AND admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod" + " FROM usr_admins,degrees,courses,crs_usr_requests" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod" " AND degrees.CtrCod=%ld" " AND degrees.DegCod=courses.DegCod" " AND courses.CrsCod=crs_usr_requests.CrsCod" @@ -3395,7 +3404,7 @@ static void Enr_RegisterAdmin (struct UsrData *UsrDat,Hie_Lvl_Level_t Scope,long { /***** Insert or replace administrator in current institution/centre/degree *****/ DB_QueryREPLACE ("can not create administrator", - "REPLACE INTO admin" + "REPLACE INTO usr_admins" " (UsrCod,Scope,Cod)" " VALUES" " (%ld,'%s',%ld)", @@ -4245,7 +4254,7 @@ static void Enr_EffectivelyRemAdm (struct UsrData *UsrDat,Hie_Lvl_Level_t Scope, { /***** Remove user from the table of admins *****/ DB_QueryDELETE ("can not remove an administrator", - "DELETE FROM admin" + "DELETE FROM usr_admins" " WHERE UsrCod=%ld AND Scope='%s' AND Cod=%ld", UsrDat->UsrCod,Sco_GetDBStrFromScope (Scope),Cod); diff --git a/swad_hierarchy.c b/swad_hierarchy.c index a7f85e93b..8940dae24 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -664,27 +664,27 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan) " centres, degrees" " admin by a user", "(SELECT %u AS S,-1 AS Cod,'' AS FullName" - " FROM admin" + " FROM usr_admins" " WHERE UsrCod=%ld" " AND Scope='%s')" " UNION " - "(SELECT %u AS S,admin.Cod,institutions.FullName" - " FROM admin,institutions" - " WHERE admin.UsrCod=%ld" - " AND admin.Scope='%s'" - " AND admin.Cod=institutions.InsCod)" + "(SELECT %u AS S,usr_admins.Cod,institutions.FullName" + " FROM usr_admins,institutions" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=institutions.InsCod)" " UNION " - "(SELECT %u AS S,admin.Cod,centres.FullName" - " FROM admin,centres" - " WHERE admin.UsrCod=%ld" - " AND admin.Scope='%s'" - " AND admin.Cod=centres.CtrCod)" + "(SELECT %u AS S,usr_admins.Cod,centres.FullName" + " FROM usr_admins,centres" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=centres.CtrCod)" " UNION " - "(SELECT %u AS S,admin.Cod,degrees.FullName" - " FROM admin,degrees" - " WHERE admin.UsrCod=%ld" - " AND admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod)" + "(SELECT %u AS S,usr_admins.Cod,degrees.FullName" + " FROM usr_admins,degrees" + " WHERE usr_admins.UsrCod=%ld" + " AND usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod)" " ORDER BY S,FullName", (unsigned) Hie_Lvl_SYS,UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_SYS), (unsigned) Hie_Lvl_INS,UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_INS), diff --git a/swad_notification.c b/swad_notification.c index 252ff5b35..b9e8597cb 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1279,7 +1279,7 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod) // ==> send notification to administrators or superusers NumRows = DB_QuerySELECT (&mysql_res,"can not get users" " to be notified", - "SELECT UsrCod FROM admin" + "SELECT UsrCod FROM usr_admins" " WHERE (Scope='%s'" " OR (Scope='%s' AND Cod=%ld)" " OR (Scope='%s' AND Cod=%ld)" diff --git a/swad_user.c b/swad_user.c index ac2d14dbf..3072846f0 100644 --- a/swad_user.c +++ b/swad_user.c @@ -935,7 +935,7 @@ bool Usr_CheckIfUsrIsSuperuser (long UsrCod) Gbl.Cache.UsrIsSuperuser.UsrCod = UsrCod; Gbl.Cache.UsrIsSuperuser.IsSuperuser = (DB_QueryCOUNT ("can not check if a user is superuser", - "SELECT COUNT(*) FROM admin" + "SELECT COUNT(*) FROM usr_admins" " WHERE UsrCod=%ld AND Scope='%s'", UsrCod,Sco_GetDBStrFromScope (Hie_Lvl_SYS)) != 0); return Gbl.Cache.UsrIsSuperuser.IsSuperuser; @@ -5037,7 +5037,7 @@ static void Usr_GetAdmsLst (Hie_Lvl_Level_t Scope) DB_BuildQuery (&Query, "SELECT %s FROM usr_data" " WHERE UsrCod IN " - "(SELECT DISTINCT UsrCod FROM admin)" + "(SELECT DISTINCT UsrCod FROM usr_admins)" " ORDER BY Surname1,Surname2,FirstName,UsrCod", QueryFields); break; @@ -5046,23 +5046,26 @@ static void Usr_GetAdmsLst (Hie_Lvl_Level_t Scope) DB_BuildQuery (&Query, "SELECT %s FROM usr_data" " WHERE UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s')" " OR UsrCod IN " - "(SELECT admin.UsrCod FROM admin,institutions" - " WHERE admin.Scope='%s'" - " AND admin.Cod=institutions.InsCod" + "(SELECT usr_admins.UsrCod" + " FROM usr_admins,institutions" + " WHERE usr_admins.Scope='%s'" + " AND usr_admins.Cod=institutions.InsCod" " AND institutions.CtyCod=%ld)" " OR UsrCod IN " - "(SELECT admin.UsrCod FROM admin,centres,institutions" - " WHERE admin.Scope='%s'" - " AND admin.Cod=centres.CtrCod" + "(SELECT usr_admins.UsrCod" + " FROM usr_admins,centres,institutions" + " WHERE usr_admins.Scope='%s'" + " AND usr_admins.Cod=centres.CtrCod" " AND centres.InsCod=institutions.InsCod" " AND institutions.CtyCod=%ld)" " OR UsrCod IN " - "(SELECT admin.UsrCod FROM admin,degrees,centres,institutions" - " WHERE admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod" + "(SELECT usr_admins.UsrCod" + " FROM usr_admins,degrees,centres,institutions" + " WHERE usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod" " AND degrees.CtrCod=centres.CtrCod" " AND centres.InsCod=institutions.InsCod" " AND institutions.CtyCod=%ld)" @@ -5079,20 +5082,20 @@ static void Usr_GetAdmsLst (Hie_Lvl_Level_t Scope) DB_BuildQuery (&Query, "SELECT %s FROM usr_data" " WHERE UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s')" " OR UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s' AND Cod=%ld)" " OR UsrCod IN " - "(SELECT admin.UsrCod FROM admin,centres" - " WHERE admin.Scope='%s'" - " AND admin.Cod=centres.CtrCod" + "(SELECT usr_admins.UsrCod FROM usr_admins,centres" + " WHERE usr_admins.Scope='%s'" + " AND usr_admins.Cod=centres.CtrCod" " AND centres.InsCod=%ld)" " OR UsrCod IN " - "(SELECT admin.UsrCod FROM admin,degrees,centres" - " WHERE admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod" + "(SELECT usr_admins.UsrCod FROM usr_admins,degrees,centres" + " WHERE usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod" " AND degrees.CtrCod=centres.CtrCod" " AND centres.InsCod=%ld)" " ORDER BY Surname1,Surname2,FirstName,UsrCod", @@ -5109,18 +5112,18 @@ static void Usr_GetAdmsLst (Hie_Lvl_Level_t Scope) DB_BuildQuery (&Query, "SELECT %s FROM usr_data" " WHERE UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s')" " OR UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s' AND Cod=%ld)" " OR UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s' AND Cod=%ld)" " OR UsrCod IN " - "(SELECT admin.UsrCod FROM admin,degrees" - " WHERE admin.Scope='%s'" - " AND admin.Cod=degrees.DegCod" + "(SELECT usr_admins.UsrCod FROM usr_admins,degrees" + " WHERE usr_admins.Scope='%s'" + " AND usr_admins.Cod=degrees.DegCod" " AND degrees.CtrCod=%ld)" " ORDER BY Surname1,Surname2,FirstName,UsrCod", QueryFields, @@ -5134,16 +5137,16 @@ static void Usr_GetAdmsLst (Hie_Lvl_Level_t Scope) DB_BuildQuery (&Query, "SELECT %s FROM usr_data" " WHERE UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s')" " OR UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s' AND Cod=%ld)" " OR UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s' AND Cod=%ld)" " OR UsrCod IN " - "(SELECT UsrCod FROM admin" + "(SELECT UsrCod FROM usr_admins" " WHERE Scope='%s' AND Cod=%ld)" " ORDER BY Surname1,Surname2,FirstName,UsrCod", QueryFields,