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 16.167.15

This commit is contained in:
Antonio Cañas Vargas 2017-03-26 04:22:07 +02:00
parent 1a85195547
commit 80d9c44a00
4 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -209,13 +209,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.14 (2017-03-26)"
#define Log_PLATFORM_VERSION "SWAD 16.167.15 (2017-03-26)"
#define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.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 16.167.15:Mar 26, 2017 Code refactoring in enrollment. (217694 lines)
Version 16.167.14:Mar 26, 2017 Code refactoring in follow/unfollow. (217691 lines)
Version 16.167.13:Mar 26, 2017 Code refactoring in uploading of photos. (217686 lines)
Version 16.167.12:Mar 26, 2017 Code refactoring in edition of institutions. (217685 lines)

57
swad_enrollment.c
View File

@ -3564,9 +3564,9 @@ void Enr_CreateNewUsr1 (void)
/***** Get user's ID from form *****/
ID_GetParamOtherUsrIDPlain (); // User's ID was already modified and passed as a hidden parameter
/***** Initialize error and message *****/
Gbl.Error = false;
Gbl.Message[0] = '\0';
/***** Initialize alert type and message *****/
Gbl.AlertType = Lay_INFO; // No error, no success
Gbl.Message[0] = '\0'; // Do not write anything
if (ID_CheckIfUsrIDIsValid (Gbl.Usrs.Other.UsrDat.IDs.List[0].ID)) // User's ID valid
{
@ -3597,6 +3597,7 @@ void Enr_CreateNewUsr1 (void)
Enr_ModifyRoleInCurrentCrs (&Gbl.Usrs.Other.UsrDat,NewRole);
/* Success message */
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_The_role_of_THE_USER_X_in_the_course_Y_has_changed_from_A_to_B,
Gbl.Usrs.Other.UsrDat.FullName,Gbl.CurrentCrs.Crs.FullName,
Txt_ROLES_SINGUL_abc[OldRole][Gbl.Usrs.Other.UsrDat.Sex],
@ -3610,6 +3611,7 @@ void Enr_CreateNewUsr1 (void)
Enr_SET_ACCEPTED_TO_FALSE);
/* Success message */
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_THE_USER_X_has_been_enrolled_in_the_course_Y,
Gbl.Usrs.Other.UsrDat.FullName,Gbl.CurrentCrs.Crs.FullName);
}
@ -3623,9 +3625,8 @@ void Enr_CreateNewUsr1 (void)
}
else // User's ID not valid
{
Gbl.Error = true;
/***** Error message *****/
Gbl.AlertType = Lay_ERROR;
sprintf (Gbl.Message,Txt_The_ID_X_is_not_valid,
Gbl.Usrs.Other.UsrDat.IDs.List[0].ID);
}
@ -3633,15 +3634,15 @@ void Enr_CreateNewUsr1 (void)
void Enr_CreateNewUsr2 (void)
{
if (Gbl.Error) // User's ID not valid
Lay_ShowAlert (Lay_ERROR,Gbl.Message);
else // User's ID valid
if (Gbl.AlertType == Lay_ERROR) // User's ID not valid
Lay_ShowAlert (Gbl.AlertType,Gbl.Message);
else // User's ID valid
{
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
{
/***** Show success message *****/
if (Gbl.Message[0])
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
Lay_ShowAlert (Gbl.AlertType,Gbl.Message);
/***** Change user's groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
@ -3666,9 +3667,9 @@ void Enr_ModifyUsr1 (void)
Rol_Role_t OldRole;
Rol_Role_t NewRole;
/***** Initialize error and message *****/
Gbl.Error = false;
Gbl.Message[0] = '\0';
/***** Initialize alert type and message *****/
Gbl.AlertType = Lay_INFO; // No error, no success
Gbl.Message[0] = '\0'; // Do not write anything
/***** Get user from form *****/
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
@ -3710,6 +3711,7 @@ void Enr_ModifyUsr1 (void)
Enr_ModifyRoleInCurrentCrs (&Gbl.Usrs.Other.UsrDat,NewRole);
/* Show success message */
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_The_role_of_THE_USER_X_in_the_course_Y_has_changed_from_A_to_B,
Gbl.Usrs.Other.UsrDat.FullName,Gbl.CurrentCrs.Crs.FullName,
Txt_ROLES_SINGUL_abc[OldRole][Gbl.Usrs.Other.UsrDat.Sex],
@ -3723,6 +3725,7 @@ void Enr_ModifyUsr1 (void)
Enr_SET_ACCEPTED_TO_FALSE);
/* Show success message */
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_THE_USER_X_has_been_enrolled_in_the_course_Y,
Gbl.Usrs.Other.UsrDat.FullName,Gbl.CurrentCrs.Crs.FullName);
}
@ -3735,59 +3738,59 @@ void Enr_ModifyUsr1 (void)
}
}
else
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REGISTER_ONE_DEGREE_ADMIN:
if (Gbl.Usrs.Me.LoggedRole < Rol_CTR_ADM)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REGISTER_ONE_CENTRE_ADMIN:
if (Gbl.Usrs.Me.LoggedRole < Rol_INS_ADM)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REGISTER_ONE_INSTITUTION_ADMIN:
if (Gbl.Usrs.Me.LoggedRole != Rol_SYS_ADM)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REPORT_USR_AS_POSSIBLE_DUPLICATE:
if (ItsMe || Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REMOVE_ONE_USR_FROM_CRS:
if (!ItsMe && Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REMOVE_ONE_DEGREE_ADMIN:
if (!ItsMe && Gbl.Usrs.Me.LoggedRole < Rol_CTR_ADM)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REMOVE_ONE_CENTRE_ADMIN:
if (!ItsMe && Gbl.Usrs.Me.LoggedRole < Rol_INS_ADM)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_REMOVE_ONE_INSTITUTION_ADMIN:
if (!ItsMe && Gbl.Usrs.Me.LoggedRole != Rol_SYS_ADM)
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
case Enr_ELIMINATE_ONE_USR_FROM_PLATFORM:
if (!Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Other.UsrDat.UsrCod))
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
default:
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
break;
}
}
else
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
}
void Enr_ModifyUsr2 (void)
{
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
if (Gbl.Error)
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
if (Gbl.AlertType == Lay_WARNING)
Lay_ShowAlert (Gbl.AlertType,Txt_User_not_found_or_you_do_not_have_permission_);
else // No error
switch (Gbl.Usrs.RegRemAction)
{
@ -3796,7 +3799,7 @@ void Enr_ModifyUsr2 (void)
{
/***** Show success message *****/
if (Gbl.Message[0])
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
Lay_ShowAlert (Gbl.AlertType,Gbl.Message);
/***** Change user's groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?

1
swad_global.c
View File

@ -120,7 +120,6 @@ void Gbl_InitializeGlobals (void)
Gbl.Form.Num = -1; // Number of form. It's increased by 1 at the begin of each form
Gbl.Form.Inside = false; // Set to true inside a form to avoid nested forms
Gbl.Error = false;
Gbl.AlertType = Lay_SUCCESS; // Used to show alert in a posteriori function
Gbl.DB.DatabaseIsOpen = false;

3
swad_global.h
View File

@ -100,8 +100,7 @@ struct Globals
char UniqueId[32 + Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 10 + 1]; // Unique identifier string used in forms
bool Inside; // Set to true inside a form to avoid nested forms
} Form;
bool Error;
Lay_AlertType_t AlertType;
Lay_AlertType_t AlertType; // Used in a posteriori function to write success / warning message
struct
{