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.225.7

This commit is contained in:
Antonio Cañas Vargas 2016-06-15 14:52:43 +02:00
parent ea2aa6df16
commit bb46e86ff2
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_account.c
View File

@ -745,6 +745,9 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat,
UsrDat->UsrCod);
DB_QueryDELETE (Query,"can not remove user's requests for inscription");
/***** Remove user from possible duplicate users *****/
Usr_RemoveUsrFromDuplicated (UsrDat->UsrCod);
/***** Remove user from the table of courses and users *****/
sprintf (Query,"DELETE FROM crs_usr"
" WHERE UsrCod='%ld'",

3
swad_changelog.h
View File

@ -128,13 +128,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.225.6 (2016-06-15)"
#define Log_PLATFORM_VERSION "SWAD 15.225.7 (2016-06-15)"
#define CSS_FILE "swad15.224.3.css"
#define JS_FILE "swad15.216.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.225.7: Jun 15, 2016 Listing possible duplicate users. (202775 lines)
Version 15.225.6: Jun 15, 2016 Listing possible duplicate users. (202761 lines)
Version 15.225.5: Jun 15, 2016 Simplification in texts (links) to view guests and admins. (202586 lines)
Version 15.225.4: Jun 15, 2016 Listing possible duplicate users. Not finished. (202623 lines)

21
swad_user.c
View File

@ -7996,10 +7996,9 @@ void Usr_ListDuplicateUsrs (void)
fprintf (Gbl.F.Out,"</tr>");
}
else // User does not exists or user already belongs to course ==> remove user from table of possible duplicate users
{
// TODO: Remove user from table of possible duplicate users
}
else // User does not exists ==>
// remove user from table of possible duplicate users
Usr_RemoveUsrFromDuplicated (UsrDat->UsrCod);
}
/* End table */
@ -8014,3 +8013,17 @@ void Usr_ListDuplicateUsrs (void)
/***** End frame *****/
Lay_EndRoundFrame ();
}
/*****************************************************************************/
/********************* Remove a request for enrollment ***********************/
/*****************************************************************************/
void Usr_RemoveUsrFromDuplicated (long UsrCod)
{
char Query[128];
/***** Remove enrollment request *****/
sprintf (Query,"DELETE FROM usr_duplicated WHERE UsrCod='%ld'",
UsrCod);
DB_QueryDELETE (Query,"can not remove a user from possible duplicates");
}

1
swad_user.h
View File

@ -353,5 +353,6 @@ void Usr_RemoveUsrFromUsrBanned (long UsrCod);
void Usr_ReportUsrAsPossibleDuplicate (void);
void Usr_PutLinkToListDupUsrs (void);
void Usr_ListDuplicateUsrs (void);
void Usr_RemoveUsrFromDuplicated (long UsrCod);
#endif