Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.226.6

This commit is contained in:
Antonio Cañas Vargas 2016-06-18 01:01:26 +02:00
parent 5224b810c0
commit 2cb2070d61
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/cambios.sql
View File

@ -11595,3 +11595,5 @@ UPDATE notif SET NotifyEvent=3 WHERE NotifyEvent=2;
CREATE TABLE IF NOT EXISTS usr_duplicated (UsrCod INT NOT NULL,InformerCod INT NOT NULL,InformTime DATETIME NOT NULL,UNIQUE INDEX(UsrCod,InformerCod),INDEX(UsrCod));
SELECT DISTINCT UsrCod FROM (SELECT DISTINCT UsrCod FROM usr_IDs WHERE UsrID IN (SELECT UsrID FROM usr_IDs WHERE UsrCod='1') UNION SELECT UsrCod FROM usr_data WHERE Surname1='' AND Surname2='' AND FirstName='') AS I;

3
swad_changelog.h
View File

@ -129,13 +129,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.226.5 (2016-06-18)"
#define Log_PLATFORM_VERSION "SWAD 15.226.6 (2016-06-18)"
#define CSS_FILE "swad15.226.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.226.6: Jun 18, 2016 Changes in query about similar users. (202962 lines)
Version 15.226.5: Jun 18, 2016 Code refactoring in duplicate users. (202948 lines)
Version 15.226.4: Jun 17, 2016 Translation of buttons in list of similar users. (202934 lines)
Version 15.226.3: Jun 17, 2016 Request the removal of a user account from list of similar users. (202912 lines)

23
swad_duplicate.c
View File

@ -245,7 +245,7 @@ static void Dup_ListSimilarUsrs (void)
extern const char *Txt_Possibly_duplicate_users;
extern const char *Txt_No_users_found[Rol_NUM_ROLES];
struct UsrData UsrDat;
char Query[256];
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumUsrs;
@ -255,10 +255,23 @@ static void Dup_ListSimilarUsrs (void)
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL);
/***** Build query *****/
sprintf (Query,"SELECT DISTINCT UsrCod FROM usr_IDs"
" WHERE usr_IDs.UsrID IN"
" (SELECT UsrID FROM usr_IDs WHERE UsrCod='%ld')",
Gbl.Usrs.Other.UsrDat.UsrCod);
if (Gbl.Usrs.Other.UsrDat.Surname1[0] &&
Gbl.Usrs.Other.UsrDat.FirstName[0]) // Name and surname 1 not empty
sprintf (Query,"SELECT DISTINCT UsrCod FROM"
"(SELECT DISTINCT UsrCod FROM usr_IDs"
" WHERE UsrID IN (SELECT UsrID FROM usr_IDs WHERE UsrCod='%ld')"
" UNION"
" SELECT UsrCod FROM usr_data"
" WHERE Surname1='%s' AND Surname2='%s' AND FirstName='%s')"
" AS U",
Gbl.Usrs.Other.UsrDat.UsrCod,
Gbl.Usrs.Other.UsrDat.Surname1,
Gbl.Usrs.Other.UsrDat.Surname2,
Gbl.Usrs.Other.UsrDat.FirstName);
else
sprintf (Query,"SELECT DISTINCT UsrCod FROM usr_IDs"
" WHERE UsrID IN (SELECT UsrID FROM usr_IDs WHERE UsrCod='%ld')",
Gbl.Usrs.Other.UsrDat.UsrCod);
NumUsrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get similar users");
/***** List possible duplicated users *****/