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

This commit is contained in:
Antonio Cañas Vargas 2016-06-15 00:34:00 +02:00
parent 87da14688a
commit 2857b09558
4 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -128,14 +128,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.225.1 (2016-06-14)"
#define Log_PLATFORM_VERSION "SWAD 15.225.2 (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.1: Jun 14, 2016 New option in user administration to report a user as possible duplicated. Not finished. (202468 lines)
Version 15.225.2: Jun 15, 2016 New option in user administration to report a user as possible duplicate. Not finished. (? lines)
Version 15.225.1: Jun 14, 2016 New option in user administration to report a user as possible duplicate. Not finished. (202468 lines)
Version 15.225: Jun 14, 2016 Removing a user's photo now requires confirmation. (202425 lines)
5 changes necessary in database:
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1574','es','N','Preguntar si eliminar foto otro usr.');

2
swad_enrollment.c
View File

@ -3749,7 +3749,7 @@ void Enr_ModifyUsr (void)
break;
case Enr_REPORT_USR_AS_POSSIBLE_DUPLICATE:
if (!ItsMe && Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER)
Lay_ShowAlert (Lay_INFO,"Option under development."); // TODO: Program this!
Usr_ReportUsrAsPossibleDuplicate ();
else
Error = true;
break;

32
swad_user.c
View File

@ -2705,6 +2705,7 @@ static void Usr_InsertMyLastData (void)
(long) (time_t) 0); // The user never accessed to notifications
DB_QueryINSERT (Query,"can not insert last user's data");
}
/*****************************************************************************/
/************* Write a row of a table with the data of a guest ***************/
/*****************************************************************************/
@ -7841,3 +7842,34 @@ void Usr_RemoveUsrFromUsrBanned (long UsrCod)
UsrCod);
DB_QueryDELETE (Query,"can not remove user from users banned");
}
/*****************************************************************************/
/******************** Report a user as possible duplicate ********************/
/*****************************************************************************/
void Usr_ReportUsrAsPossibleDuplicate (void)
{
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
char Query[256];
bool ItsMe;
/***** Get user to be reported as possible duplicate *****/
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{
/* Check if it's allowed to me to report users as possible duplicatedr */
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
if (!ItsMe && Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER)
{
sprintf (Query,"REPLACE INTO usr_dup (UsrCod,UsrWhoReported,TimeReport)"
" VALUES ('%ld','%ld',NOW())",
Gbl.Usrs.Other.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_ShowAlert (Lay_INFO,Query); // TODO: Remove this line, written only for debug purposes
// DB_QueryINSERT (Query,"can not report duplicate");
}
else
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
}
else
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
}

2
swad_user.h
View File

@ -350,4 +350,6 @@ void Usr_GetAndShowNumUsrsInPlatform (Rol_Role_t Role);
bool Usr_CheckIfUsrBanned (long UsrCod);
void Usr_RemoveUsrFromUsrBanned (long UsrCod);
void Usr_ReportUsrAsPossibleDuplicate (void);
#endif