mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-10 10:45:23 +02:00
Version 14.35
This commit is contained in:
parent
3804950434
commit
cf357a1eee
2
Makefile
2
Makefile
|
@ -30,7 +30,7 @@ OBJS = swad_action.o swad_announcement.o swad_assignment.o swad_attendance.o \
|
|||
swad_banner.o \
|
||||
swad_centre.o swad_chat.o swad_config.o swad_connected.o swad_country.o swad_course.o swad_cryptography.o \
|
||||
swad_database.o swad_date.o swad_degree.o swad_department.o \
|
||||
swad_exam.o \
|
||||
swad_enrollment.o swad_exam.o \
|
||||
swad_file.o swad_file_browser.o swad_forum.o \
|
||||
swad_global.o swad_group.o \
|
||||
swad_holiday.o \
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
|
||||
#include "swad_bool.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_ID.h"
|
||||
#include "swad_parameter.h"
|
||||
|
@ -557,7 +558,7 @@ void ID_RemoveMyUsrID (void)
|
|||
ID_GetListIDsFromUsrCod (&Gbl.Usrs.Me.UsrDat);
|
||||
|
||||
/***** Show my account again *****/
|
||||
Usr_ShowFormChangeMyAccount ();
|
||||
Enr_ShowFormChangeMyAccount ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -672,7 +673,7 @@ void ID_NewMyUsrID (void)
|
|||
ID_GetListIDsFromUsrCod (&Gbl.Usrs.Me.UsrDat);
|
||||
|
||||
/***** Show my account again *****/
|
||||
Usr_ShowFormChangeMyAccount ();
|
||||
Enr_ShowFormChangeMyAccount ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include "swad_chat.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_exam.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_ID.h"
|
||||
#include "swad_indicator.h"
|
||||
|
@ -1849,10 +1850,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActSeeAtt */{ 861, 3,TabUsr,ActSeeAtt ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Att_SeeAttEvents ,"rollcall" },
|
||||
/* ActLstTch */{ 679, 4,TabUsr,ActLstTch ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeTeachers ,"classphototch" },
|
||||
/* ActLstAdm */{ 587, 5,TabUsr,ActLstAdm ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ListDataAdms ,"listtch" },
|
||||
/* ActReqSignUp */{1054, 6,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ReqSignUpInCrs ,"enrollmentrequest" },
|
||||
/* ActSeeSignUpReq */{1057, 7,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ShowEnrollmentRequests ,"enrollmentrequest" },
|
||||
/* ActReqMdfOneUsr */{ 177, 8,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ReqRegRemUsr ,"config" },
|
||||
/* ActReqMdfSevUsr */{ 797, 9,TabUsr,ActReqMdfSevUsr ,0x1F0,0x1E0,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ShowFormRegRemSeveralUsrs ,"configs" },
|
||||
/* ActReqSignUp */{1054, 6,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqSignUpInCrs ,"enrollmentrequest" },
|
||||
/* ActSeeSignUpReq */{1057, 7,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ShowEnrollmentRequests ,"enrollmentrequest" },
|
||||
/* ActReqMdfOneUsr */{ 177, 8,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRegRemUsr ,"config" },
|
||||
/* ActReqMdfSevUsr */{ 797, 9,TabUsr,ActReqMdfSevUsr ,0x1F0,0x1E0,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ShowFormRegRemSeveralUsrs ,"configs" },
|
||||
/* ActLstCon */{ 995,10,TabUsr,ActLstCon ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Con_ShowConnectedUsrs ,"userplugged" },
|
||||
|
||||
// Actions not in menu:
|
||||
|
@ -1920,28 +1921,28 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActRecAttStd */{1072,-1,TabUsr,ActSeeAtt ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Att_RegisterStudentsInAttEvent ,NULL},
|
||||
/* ActRecAttMe */{1076,-1,TabUsr,ActSeeAtt ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Att_RegisterMeAsStdInAttEvent ,NULL},
|
||||
|
||||
/* ActSignUp */{1056,-1,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SignUpInCrs ,NULL},
|
||||
/* ActReqRejSignUp */{1058,-1,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AskIfRejectSignUp ,NULL},
|
||||
/* ActRejSignUp */{1059,-1,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_RejectSignUp ,NULL},
|
||||
/* ActSignUp */{1056,-1,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_SignUpInCrs ,NULL},
|
||||
/* ActReqRejSignUp */{1058,-1,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRejectSignUp ,NULL},
|
||||
/* ActRejSignUp */{1059,-1,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RejectSignUp ,NULL},
|
||||
|
||||
/* ActReqMdfUsr */{ 161,-1,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AskIfRegRemAnotherUsr ,NULL},
|
||||
/* ActReqMdfUsr */{ 161,-1,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRegRemAnotherUsr ,NULL},
|
||||
|
||||
/* ActReqUsrPho */{ 375,-1,TabUsr,ActReqMdfOneUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_SendPhotoUsr ,NULL},
|
||||
/* ActDetUsrPho */{ 695,-1,TabUsr,ActReqMdfOneUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
|
||||
/* ActUpdUsrPho */{ 374,-1,TabUsr,ActReqMdfOneUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL},
|
||||
/* ActRemUsrPho */{ 429,-1,TabUsr,ActReqMdfOneUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_RemoveUsrPhoto ,NULL},
|
||||
|
||||
/* ActCreOthUsrDat */{ 440,-1,TabUsr,ActReqMdfOneUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_CreatAndShowNewUsrRecordAndRegInCrs,NULL},
|
||||
/* ActUpdOthUsrDat */{ 439,-1,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ModifAndShowUsrCardAndRegInCrsAndGrps,NULL},
|
||||
/* ActCreOthUsrDat */{ 440,-1,TabUsr,ActReqMdfOneUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_CreatAndShowNewUsrRecordAndRegInCrs,NULL},
|
||||
/* ActUpdOthUsrDat */{ 439,-1,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifAndShowUsrCardAndRegInCrsAndGrps,NULL},
|
||||
|
||||
/* ActReqAccEnrCrs */{ 592,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ReqAcceptRegisterInCrs ,NULL},
|
||||
/* ActAccEnrCrs */{ 558,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AcceptRegisterMeInCrs ,NULL},
|
||||
/* ActRemMeCrs */{ 559,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ReqRemMeFromCrs ,NULL},
|
||||
/* ActReqAccEnrCrs */{ 592,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqAcceptRegisterInCrs ,NULL},
|
||||
/* ActAccEnrCrs */{ 558,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AcceptRegisterMeInCrs ,NULL},
|
||||
/* ActRemMeCrs */{ 559,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRemMeFromCrs ,NULL},
|
||||
|
||||
/* ActNewAdm */{ 586,-1,TabUsr,ActReqMdfOneUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AddAdmToDeg ,NULL},
|
||||
/* ActRemAdm */{ 584,-1,TabUsr,ActReqMdfOneUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_RemAdm ,NULL},
|
||||
/* ActNewAdm */{ 586,-1,TabUsr,ActReqMdfOneUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToDeg ,NULL},
|
||||
/* ActRemAdm */{ 584,-1,TabUsr,ActReqMdfOneUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdm ,NULL},
|
||||
|
||||
/* ActRcvFrmMdfUsrCrs*/{ 799,-1,TabUsr,ActReqMdfSevUsr ,0x1F0,0x1E0,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ReceiveFormUsrsCrs ,NULL},
|
||||
/* ActRcvFrmMdfUsrCrs*/{ 799,-1,TabUsr,ActReqMdfSevUsr ,0x1F0,0x1E0,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormUsrsCrs ,NULL},
|
||||
|
||||
/* ActFrmIDsOthUsr */{1239,-1,TabUsr,ActReqMdfOneUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
|
||||
/* ActRemIDOth */{1240,-1,TabUsr,ActReqMdfOneUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
|
||||
|
@ -1949,14 +1950,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActFrmPwdOthUsr */{ 598,-1,TabUsr,ActReqMdfOneUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormOthPwd ,NULL},
|
||||
/* ActChgPwdOthUsr */{ 82,-1,TabUsr,ActReqMdfOneUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pwd_UpdateOtherPwd1 ,Pwd_UpdateOtherPwd2 ,NULL},
|
||||
|
||||
/* ActRemUsrCrs */{ 58,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x1E0,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_RemUsrFromCrs ,NULL},
|
||||
/* ActRemUsrGbl */{ 62,-1,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_RemUsrGbl ,NULL},
|
||||
/* ActRemUsrCrs */{ 58,-1,TabUsr,ActReqMdfOneUsr ,0x1F8,0x1E0,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemUsrFromCrs ,NULL},
|
||||
/* ActRemUsrGbl */{ 62,-1,TabUsr,ActReqMdfOneUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemUsrGbl ,NULL},
|
||||
|
||||
/* ActReqRemAllStdCrs*/{ 88,-1,TabUsr,ActReqMdfSevUsr ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AskRemAllStdsThisCrs ,NULL},
|
||||
/* ActRemAllStdCrs */{ 87,-1,TabUsr,ActReqMdfSevUsr ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_RemAllStdsThisCrs ,NULL},
|
||||
/* ActReqRemAllStdCrs*/{ 88,-1,TabUsr,ActReqMdfSevUsr ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskRemAllStdsThisCrs ,NULL},
|
||||
/* ActRemAllStdCrs */{ 87,-1,TabUsr,ActReqMdfSevUsr ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAllStdsThisCrs ,NULL},
|
||||
|
||||
/* ActReqRemOldUsr */{ 590,-1,TabUsr,ActReqMdfSevUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AskRemoveOldUsrs ,NULL},
|
||||
/* ActRemOldUsr */{ 773,-1,TabUsr,ActReqMdfSevUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_RemoveOldUsrs ,NULL},
|
||||
/* ActReqRemOldUsr */{ 590,-1,TabUsr,ActReqMdfSevUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskRemoveOldUsrs ,NULL},
|
||||
/* ActRemOldUsr */{ 773,-1,TabUsr,ActReqMdfSevUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemoveOldUsrs ,NULL},
|
||||
|
||||
// TabMsg ******************************************************************
|
||||
// Actions in menu:
|
||||
|
@ -2185,7 +2186,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
// TabPrf ******************************************************************
|
||||
// Actions in menu:
|
||||
/* ActFrmLogIn */{ 843, 0,TabPrf,ActFrmLogIn ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_WriteFormLoginLogout ,"keyuser" },
|
||||
/* ActFrmUsrAcc */{ 36, 1,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ShowFormAccount ,"arroba" },
|
||||
/* ActFrmUsrAcc */{ 36, 1,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ShowFormAccount ,"arroba" },
|
||||
/* ActReqSndNewPwd */{ 665, 2,TabPrf,ActReqSndNewPwd ,0x000,0x001,0x001,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormSendNewPwd ,"key" },
|
||||
/* ActFrmChgMyPwd */{ 34, 3,TabPrf,ActFrmChgMyPwd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormChgPwd ,"key" },
|
||||
/* ActReqEdiRecCom */{ 285, 4,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ShowFormMyCommRecord ,"card" },
|
||||
|
@ -2207,7 +2208,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
|
||||
/* ActChgMyRol */{ 589,-1,TabPrf,ActFrmLogIn ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Usr_ChangeMyRole ,Usr_ShowFormsRoleAndLogout ,NULL},
|
||||
|
||||
/* ActCreUsrAcc */{1163,-1,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_AfterCreationNewAccount ,NULL},
|
||||
/* ActCreUsrAcc */{1163,-1,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AfterCreationNewAccount ,NULL},
|
||||
|
||||
/* ActRemIDMe */{1147,-1,TabPrf,ActFrmUsrAcc ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveMyUsrID ,NULL},
|
||||
/* ActNewIDMe */{1148,-1,TabPrf,ActFrmUsrAcc ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewMyUsrID ,NULL},
|
||||
|
|
|
@ -35,12 +35,17 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.34.4 (2014/12/08)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.35 (2014/12/12)"
|
||||
|
||||
// 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 | tail -1
|
||||
|
||||
/*
|
||||
Version 14.35 :Dic 12, 2014 New MIME type, suggested by Benito Palacios.
|
||||
New module swad_enrollment for enrollment (registration) or removing of users. (170725 lines)
|
||||
1 change necessary in Makefile:
|
||||
Add swad_enrollment.o to list of object files
|
||||
|
||||
Version 14.34.4 :Dic 08, 2014 Some messages translated. (170623 lines)
|
||||
Version 14.34.3 :Dic 08, 2014 Tables are printed with rounded corners. (170602 lines)
|
||||
Version 14.34.2 :Dic 08, 2014 Button to show more details on list of attendances. (170728 lines)
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "swad_constant.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_degree.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_exam.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_indicator.h"
|
||||
|
@ -1884,7 +1885,7 @@ static void Crs_EmptyCourseCompletely (long CrsCod)
|
|||
Crs_GetDataOfCourseByCod (&Crs);
|
||||
|
||||
/***** Remove all the students in the course *****/
|
||||
Usr_RemAllStdsInCrs (&Crs);
|
||||
Enr_RemAllStdsInCrs (&Crs);
|
||||
|
||||
/***** Set all the notifications from the course as removed,
|
||||
except notifications about new messages *****/
|
||||
|
|
|
@ -853,6 +853,7 @@ const char *Brw_MIMETypesAllowed[] =
|
|||
"video/x-ms-wmv", // WMV (Windows Media File)
|
||||
"video/x-msvideo", // AVI
|
||||
"x-world/x-vrml", // VRML Worlds wrl
|
||||
"x-java", // Source code in Java
|
||||
"zz-application/zz-winassoc-cdr", // Corel Draw (CDR)
|
||||
"zz-application/zz-winassoc-mpp" // Microsoft Project mpp
|
||||
};
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
|
||||
#include "swad_config.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_ID.h"
|
||||
#include "swad_import.h"
|
||||
|
@ -202,7 +203,7 @@ void Imp_ImportStdsFromAnImpGrp (long ImpGrpCod,struct ListCodGrps *LstGrps,unsi
|
|||
UsrDat.Sex = ImpStd.Sex;
|
||||
|
||||
/* Update user's data */
|
||||
Usr_UpdateUsrData (&UsrDat);
|
||||
Enr_UpdateUsrData (&UsrDat);
|
||||
|
||||
/* Update e-mail */
|
||||
if (!UsrDat.Email[0])
|
||||
|
@ -214,11 +215,11 @@ void Imp_ImportStdsFromAnImpGrp (long ImpGrpCod,struct ListCodGrps *LstGrps,unsi
|
|||
}
|
||||
|
||||
if (UsrDat.RoleInCurrentCrsDB == Rol_ROLE_STUDENT) // He/she was already a student in current course
|
||||
Usr_AcceptUsrInCrs (UsrDat.UsrCod);
|
||||
Enr_AcceptUsrInCrs (UsrDat.UsrCod);
|
||||
else // He/she not belonged to the current course
|
||||
/* Register user as student in the current course */
|
||||
Usr_RegisterUsrInCurrentCrs (&UsrDat,Rol_ROLE_STUDENT,
|
||||
Cns_QUIET,Usr_SET_ACCEPTED_TO_TRUE);
|
||||
Enr_RegisterUsrInCurrentCrs (&UsrDat,Rol_ROLE_STUDENT,
|
||||
Cns_QUIET,Enr_SET_ACCEPTED_TO_TRUE);
|
||||
|
||||
/* Register user in the selected groups */
|
||||
if (Gbl.CurrentCrs.Grps.NumGrps) // If there are groups in current course
|
||||
|
@ -245,15 +246,15 @@ void Imp_ImportStdsFromAnImpGrp (long ImpGrpCod,struct ListCodGrps *LstGrps,unsi
|
|||
|
||||
/* Create user */
|
||||
UsrDat.IDs.List[0].Confirmed = true; // If he/she is a new user ==> his/her ID will be stored as confirmed in database
|
||||
Usr_CreateNewUsr (&UsrDat);
|
||||
Enr_CreateNewUsr (&UsrDat);
|
||||
|
||||
/* Update e-mail */
|
||||
if (!Mai_UpdateEmailInDB (&UsrDat,UsrDat.Email)) // Email was already registered and confirmed by another user
|
||||
UsrDat.Email[0] = '\0';
|
||||
|
||||
/* Register user as student in the current course */
|
||||
Usr_RegisterUsrInCurrentCrs (&UsrDat,Rol_ROLE_STUDENT,
|
||||
Cns_QUIET,Usr_SET_ACCEPTED_TO_TRUE);
|
||||
Enr_RegisterUsrInCurrentCrs (&UsrDat,Rol_ROLE_STUDENT,
|
||||
Cns_QUIET,Enr_SET_ACCEPTED_TO_TRUE);
|
||||
|
||||
/* Register user in the selected groups */
|
||||
if (Gbl.CurrentCrs.Grps.NumGrps) // If there are groups in current course
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include <unistd.h> // For access, lstat, getpid, chdir, symlink, unlink
|
||||
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_mail.h"
|
||||
#include "swad_parameter.h"
|
||||
|
@ -1108,7 +1109,7 @@ void Mai_RemoveEmail (void)
|
|||
Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_delete_your_current_email);
|
||||
|
||||
/***** Show my account again *****/
|
||||
Usr_ShowFormChangeMyAccount ();
|
||||
Enr_ShowFormChangeMyAccount ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1188,7 +1189,7 @@ void Mai_UpdateEmail (void)
|
|||
}
|
||||
|
||||
/***** Show my account again *****/
|
||||
Usr_ShowFormChangeMyAccount ();
|
||||
Enr_ShowFormChangeMyAccount ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <string.h> // For string functions
|
||||
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_parameter.h"
|
||||
#include "swad_QR.h"
|
||||
|
@ -310,7 +311,7 @@ void Nck_RemoveNick (void)
|
|||
Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_delete_your_current_nickname);
|
||||
|
||||
/***** Show my account again *****/
|
||||
Usr_ShowFormChangeMyAccount ();
|
||||
Enr_ShowFormChangeMyAccount ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -405,7 +406,7 @@ void Nck_UpdateNick (void)
|
|||
Gbl.Message);
|
||||
|
||||
/***** Show my account again *****/
|
||||
Usr_ShowFormChangeMyAccount ();
|
||||
Enr_ShowFormChangeMyAccount ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "swad_config.h"
|
||||
#include "swad_config.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_exam.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_mark.h"
|
||||
|
@ -699,10 +700,10 @@ void Ntf_GetNotifSummaryAndContent (char *SummaryStr,char **ContentStr,Ntf_Notif
|
|||
Mrk_GetNotifMyMarks (SummaryStr,ContentStr,Cod,UsrCod,MaxChars,GetContent);
|
||||
break;
|
||||
case Ntf_EVENT_ENROLLMENT:
|
||||
Usr_GetNotifEnrollment (SummaryStr,CrsCod,UsrCod,MaxChars);
|
||||
Enr_GetNotifEnrollment (SummaryStr,CrsCod,UsrCod,MaxChars);
|
||||
break;
|
||||
case Ntf_EVENT_ENROLLMENT_REQUEST:
|
||||
Usr_GetNotifEnrollmentRequest (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
Enr_GetNotifEnrollmentRequest (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
break;
|
||||
case Ntf_EVENT_NOTICE:
|
||||
Not_GetNotifNotice (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <unistd.h> // For unlink
|
||||
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_ID.h"
|
||||
#include "swad_password.h"
|
||||
|
@ -184,7 +185,7 @@ void Pwd_ActChgMyPwd1 (void)
|
|||
{
|
||||
strcpy (Gbl.Usrs.Me.UsrDat.Password,NewEncryptedPassword);
|
||||
Ses_UpdateSessionDataInDB ();
|
||||
Usr_UpdateUsrData (&Gbl.Usrs.Me.UsrDat);
|
||||
Enr_UpdateUsrData (&Gbl.Usrs.Me.UsrDat);
|
||||
strcpy (Gbl.Message,Txt_Your_password_has_been_changed_successfully);
|
||||
Gbl.Usrs.Error = false;
|
||||
}
|
||||
|
@ -472,7 +473,7 @@ void Pwd_UpdateOtherPwd1 (void)
|
|||
{
|
||||
/* Update other user's data */
|
||||
strcpy (Gbl.Usrs.Other.UsrDat.Password,NewEncryptedPassword);
|
||||
Usr_UpdateUsrData (&Gbl.Usrs.Other.UsrDat);
|
||||
Enr_UpdateUsrData (&Gbl.Usrs.Other.UsrDat);
|
||||
|
||||
sprintf (Gbl.Message,Txt_The_X_password_has_been_changed_successfully,
|
||||
Gbl.Usrs.Other.UsrDat.FullName);
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "swad_action.h"
|
||||
#include "swad_config.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_file.h"
|
||||
#include "swad_file_browser.h"
|
||||
#include "swad_global.h"
|
||||
|
@ -660,7 +661,7 @@ static void Pho_UpdatePhoto1 (struct UsrData *UsrDat)
|
|||
Pho_UpdatePhotoName (UsrDat);
|
||||
|
||||
/* Remove the user from the list of users without photo */
|
||||
Usr_RemoveUsrFromTableClicksWithoutPhoto (UsrDat->UsrCod);
|
||||
Enr_RemoveUsrFromTableClicksWithoutPhoto (UsrDat->UsrCod);
|
||||
|
||||
Gbl.Error = false;
|
||||
}
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include "swad_action.h"
|
||||
#include "swad_config.h"
|
||||
#include "swad_database.h"
|
||||
#include "swad_enrollment.h"
|
||||
#include "swad_global.h"
|
||||
#include "swad_ID.h"
|
||||
#include "swad_network.h"
|
||||
|
@ -2338,7 +2339,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
|
|||
if (UsrDat->RoleInCurrentCrsDB < Rol_ROLE_STUDENT) // The other user does not belong to current course
|
||||
{
|
||||
/* If there is a request of this user, default role is the requested role */
|
||||
if ((DefaultRoleInCurrentCrs = Usr_GetRequestedRole (UsrDat->UsrCod)) == Rol_ROLE_UNKNOWN)
|
||||
if ((DefaultRoleInCurrentCrs = Enr_GetRequestedRole (UsrDat->UsrCod)) == Rol_ROLE_UNKNOWN)
|
||||
DefaultRoleInCurrentCrs = (UsrDat->Roles & (1 << Rol_ROLE_TEACHER)) ? Rol_ROLE_TEACHER :
|
||||
Rol_ROLE_STUDENT;
|
||||
}
|
||||
|
@ -2799,7 +2800,7 @@ void Rec_UpdateMyRecord (void)
|
|||
Rec_GetUsrExtraDataFromRecordForm (&Gbl.Usrs.Me.UsrDat);
|
||||
|
||||
/***** Update my data in database *****/
|
||||
Usr_UpdateUsrData (&Gbl.Usrs.Me.UsrDat);
|
||||
Enr_UpdateUsrData (&Gbl.Usrs.Me.UsrDat);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3215,7 +3216,7 @@ void Rec_ChgCountryOfMyInstitution (void)
|
|||
Gbl.Usrs.Me.UsrDat.InsCod = -1L;
|
||||
Gbl.Usrs.Me.UsrDat.Tch.CtrCod = -1L;
|
||||
Gbl.Usrs.Me.UsrDat.Tch.DptCod = -1L;
|
||||
Usr_UpdateInstitutionCentreDepartment ();
|
||||
Enr_UpdateInstitutionCentreDepartment ();
|
||||
|
||||
/***** Show form again *****/
|
||||
Rec_ShowFormMyInsCtrDpt ();
|
||||
|
@ -3246,7 +3247,7 @@ void Rec_UpdateMyInstitution (void)
|
|||
Gbl.Usrs.Me.UsrDat.InsCod = Ins.InsCod;
|
||||
Gbl.Usrs.Me.UsrDat.Tch.CtrCod = -1L;
|
||||
Gbl.Usrs.Me.UsrDat.Tch.DptCod = -1L;
|
||||
Usr_UpdateInstitutionCentreDepartment ();
|
||||
Enr_UpdateInstitutionCentreDepartment ();
|
||||
|
||||
/***** Show form again *****/
|
||||
Rec_ShowFormMyInsCtrDpt ();
|
||||
|
@ -3278,7 +3279,7 @@ void Rec_UpdateMyCentre (void)
|
|||
|
||||
/***** Update institution, centre and department *****/
|
||||
Gbl.Usrs.Me.UsrDat.Tch.CtrCod = Ctr.CtrCod;
|
||||
Usr_UpdateInstitutionCentreDepartment ();
|
||||
Enr_UpdateInstitutionCentreDepartment ();
|
||||
|
||||
/***** Show form again *****/
|
||||
Rec_ShowFormMyInsCtrDpt ();
|
||||
|
@ -3310,7 +3311,7 @@ void Rec_UpdateMyDepartment (void)
|
|||
|
||||
/***** Update institution, centre and department *****/
|
||||
Gbl.Usrs.Me.UsrDat.Tch.DptCod = Dpt.DptCod;
|
||||
Usr_UpdateInstitutionCentreDepartment ();
|
||||
Enr_UpdateInstitutionCentreDepartment ();
|
||||
|
||||
/***** Show form again *****/
|
||||
Rec_ShowFormMyInsCtrDpt ();
|
||||
|
|
4069
swad_user.c
4069
swad_user.c
File diff suppressed because it is too large
Load Diff
82
swad_user.h
82
swad_user.h
|
@ -103,20 +103,6 @@ typedef enum
|
|||
} Usr_ShowUsrsType_t;
|
||||
#define Usr_SHOW_USRS_TYPE_DEFAULT Usr_CLASS_PHOTO
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Usr_REPLACE_DATA,
|
||||
Usr_INSERT_NEW_DATA,
|
||||
} Usr_ReplaceInsert_t;
|
||||
|
||||
// Related with users adding or removing
|
||||
typedef enum
|
||||
{
|
||||
Usr_REQUEST_REMOVE_USR,
|
||||
Usr_REMOVE_USR,
|
||||
} Usr_ReqDelOrDelUsr_t;
|
||||
|
||||
|
||||
// Related with user's data
|
||||
struct UsrData
|
||||
{
|
||||
|
@ -200,16 +186,13 @@ struct ListUsrCods
|
|||
unsigned NumUsrs; // Number of users in the list
|
||||
};
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Usr_SET_ACCEPTED_TO_FALSE,
|
||||
Usr_SET_ACCEPTED_TO_TRUE,
|
||||
} Usr_KeepOrSetAccepted_t;
|
||||
|
||||
/*****************************************************************************/
|
||||
/****************************** Public prototypes ****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Usr_WriteSelectorRoles (unsigned Roles);
|
||||
void Usr_GetSelectedRoles (unsigned *Roles);
|
||||
|
||||
void Usr_InformAboutNumClicksBeforePhoto (void);
|
||||
|
||||
void Usr_UsrDataConstructor (struct UsrData *UsrDat);
|
||||
|
@ -228,8 +211,8 @@ Rol_Role_t Usr_GetMyMaxRoleInIns (long InsCod);
|
|||
Rol_Role_t Usr_GetMyMaxRoleInCtr (long CtrCod);
|
||||
Rol_Role_t Usr_GetMyMaxRoleInDeg (long DegCod);
|
||||
Rol_Role_t Usr_GetMyRoleInCrs (long CrsCod);
|
||||
Rol_Role_t Usr_GetRoleInCrs (long CrsCod,long UsrCod);
|
||||
unsigned Usr_GetRolesInAllCrss (long UsrCod);
|
||||
void Usr_AcceptUsrInCrs (long UsrCod);
|
||||
void Usr_BuildFullName (struct UsrData *UsrDat);
|
||||
|
||||
void Usr_RestrictLengthAndWriteName (struct UsrData *UsrDat,unsigned MaxChars);
|
||||
|
@ -253,11 +236,7 @@ unsigned long Usr_GetCtrsFromUsr (long UsrCod,long InsCod,MYSQL_RES **mysql_res)
|
|||
unsigned long Usr_GetDegsFromUsr (long UsrCod,long CtrCod,MYSQL_RES **mysql_res);
|
||||
unsigned long Usr_GetCrssFromUsr (long UsrCod,long DegCod,MYSQL_RES **mysql_res);
|
||||
|
||||
void Usr_AskRemoveOldUsrs (void);
|
||||
void Usr_RemoveOldUsrs (void);
|
||||
|
||||
void Usr_ReqAcceptRegisterInCrs (void);
|
||||
void Usr_AcceptRegisterMeInCrs (void);
|
||||
bool Usr_ChkIfEncryptedUsrCodExists (const char *EncryptedUsrCod);
|
||||
|
||||
void Usr_WriteFormLoginLogout (void);
|
||||
void Usr_Logout (void);
|
||||
|
@ -267,6 +246,7 @@ void Usr_PutFormLogIn (void);
|
|||
void Usr_WriteLoggedUsrHead (void);
|
||||
void Usr_PutFormLogOut (void);
|
||||
void Usr_GetParamUsrIdLogin (void);
|
||||
unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *ListUsrCods);
|
||||
void Usr_PutParamOtherUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1]);
|
||||
void Usr_GetParamOtherUsrCodEncrypted (void);
|
||||
bool Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (void);
|
||||
|
@ -278,33 +258,12 @@ void Usr_ChangeMyRole (void);
|
|||
void Usr_ShowFormsRoleAndLogout (void);
|
||||
|
||||
unsigned Usr_UpdateMyClicksWithoutPhoto (void);
|
||||
void Usr_RemoveUsrFromTableClicksWithoutPhoto (long UsrCod);
|
||||
|
||||
void Usr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction);
|
||||
|
||||
void Usr_AfterCreationNewAccount (void);
|
||||
void Usr_ShowFormAccount (void);
|
||||
void Usr_ShowFormChangeMyAccount (void);
|
||||
|
||||
bool Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (struct UsrData *UsrDat);
|
||||
bool Usr_GetIfUserHasAcceptedEnrollmentInCurrentCrs (long UsrCod);
|
||||
void Usr_UpdateMyLastData (void);
|
||||
void Usr_InsertMyLastCrsTabAndTime (void);
|
||||
|
||||
void Usr_CreatAndShowNewUsrRecordAndRegInCrs (void);
|
||||
void Usr_ModifAndShowUsrCardAndRegInCrsAndGrps (void);
|
||||
void Usr_GetNotifEnrollment (char *SummaryStr,
|
||||
long CrsCod,long UsrCod,
|
||||
unsigned MaxChars);
|
||||
void Usr_CreateNewUsr (struct UsrData *UsrDat);
|
||||
void Usr_UpdateUsrData (struct UsrData *UsrDat);
|
||||
void Usr_UpdateInstitutionCentreDepartment (void);
|
||||
void Usr_RegisterUsrInCurrentCrs (struct UsrData *UsrDat,Rol_Role_t NewRole,
|
||||
Cns_QuietOrVerbose_t QuietOrVerbose,
|
||||
Usr_KeepOrSetAccepted_t KeepOrSetAccepted);
|
||||
|
||||
void Usr_RemoveUsrBriefcase (struct UsrData *UsrDat);
|
||||
|
||||
void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutCheckboxToSelectUsr);
|
||||
void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GrpNames);
|
||||
void Usr_WriteRowTchAllData (struct UsrData *UsrDat);
|
||||
|
@ -369,34 +328,7 @@ void Usr_SeeStdClassPhotoPrn (void);
|
|||
void Usr_SeeTchClassPhotoPrn (void);
|
||||
void Usr_PutSelectorNumColsClassPhoto (void);
|
||||
|
||||
void Usr_ShowFormRegRemSeveralUsrs (void);
|
||||
void Usr_ReceiveFormUsrsCrs (void);
|
||||
void Usr_AskRemAllStdsThisCrs (void);
|
||||
void Usr_RemAllStdsThisCrs (void);
|
||||
unsigned Usr_RemAllStdsInCrs (struct Course *Crs);
|
||||
void Usr_ReqSignUpInCrs (void);
|
||||
void Usr_SignUpInCrs (void);
|
||||
void Usr_GetNotifEnrollmentRequest (char *SummaryStr,char **ContentStr,
|
||||
long ReqCod,unsigned MaxChars,bool GetContent);
|
||||
void Usr_AskIfRejectSignUp (void);
|
||||
void Usr_RejectSignUp (void);
|
||||
void Usr_ShowEnrollmentRequests (void);
|
||||
void Usr_WriteSelectorRoles (unsigned Roles);
|
||||
void Usr_GetSelectedRoles (unsigned *Roles);
|
||||
Rol_Role_t Usr_GetRequestedRole (long UsrCod);
|
||||
void Usr_ReqRegRemUsr (void);
|
||||
void Usr_AskIfRegRemAnotherUsr (void);
|
||||
void Usr_AddAdmToDeg (void);
|
||||
|
||||
void Usr_ReqRemMeFromCrs (void);
|
||||
void Usr_ReqRemUsrFromCrs (void);
|
||||
void Usr_RemUsrFromCrs (void);
|
||||
void Usr_ReqRemOrRemUsrFromCrs (Usr_ReqDelOrDelUsr_t ReqDelOrDelUsr);
|
||||
void Usr_ReqRemUsrGbl (void);
|
||||
void Usr_RemAdm (void);
|
||||
void Usr_RemUsrGbl (void);
|
||||
void Usr_ReqDelOrDelUsrGbl (Usr_ReqDelOrDelUsr_t ReqDelOrDelUsr);
|
||||
void Usr_AskIfRemAdmFromDeg (bool ItsMe);
|
||||
void Usr_ConstructPathUsr (long UsrCod,char *PathUsr);
|
||||
bool Usr_ChkIfUsrCodExists (long UsrCod);
|
||||
|
||||
void Usr_ShowWarningNoUsersFound (Rol_Role_t Role);
|
||||
|
|
Loading…
Reference in New Issue
Block a user