From bdb9ab0bf9ad7c186dcd27071a5d88bdfebbf74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 4 Dec 2016 04:22:36 +0100 Subject: [PATCH] Version 16.86.1 --- swad_action.c | 9 +- swad_action.h | 217 ++++++++++++++++++++++++----------------------- swad_agenda.c | 25 +++++- swad_agenda.h | 3 +- swad_changelog.h | 11 ++- swad_parameter.c | 8 +- swad_user.c | 6 +- 7 files changed, 154 insertions(+), 125 deletions(-) diff --git a/swad_action.c b/swad_action.c index 4ecdf526..b965eebc 100644 --- a/swad_action.c +++ b/swad_action.c @@ -956,7 +956,8 @@ Users: 795. ActChgVisFie Request change in visibility of a record field 796. ActRcvRecCrs Receive and update fields of my record in this course - NEW. ActLogInSeeUsrAgd Log in to show another user's public agenda + NEW. ActFrmLogInUsrAgd Put form to log in to show another user's public agenda + NEW. ActLogInUsrAgd Show another user's public agenda after log in NEW. ActSeeUsrAgd Show another user's public agenda 797. ActReqEnrSevStd Request the enrollment/removing of several users to / from current course @@ -2367,7 +2368,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgVisFie */{ 297,-1,TabUnk,ActLstStd ,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ChangeVisibilityField ,NULL}, /* ActRcvRecCrs */{ 301,-1,TabUnk,ActLstStd ,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_UpdateAndShowMyCrsRecord ,NULL}, - /* ActLogInSeeUsrAgd */{1614,-1,TabUnk,ActLstTch ,0x001,0x001,0x001,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_LogInToShowUsrAgenda ,NULL}, + /* ActFrmLogInUsrAgd */{1614,-1,TabUnk,ActLstTch ,0x001,0x001,0x001,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_PutFormLogInToShowUsrAgenda,NULL}, + /* ActLogInUsrAgd */{1615,-1,TabUnk,ActLstTch ,0x1FC,0x1FC,0x1FC,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowUsrAgendaAfterLogIn ,NULL}, /* ActSeeUsrAgd */{1611,-1,TabUnk,ActLstTch ,0x1FC,0x1FC,0x1FC,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowUsrAgenda ,NULL}, /* ActReqEnrSevStd */{1426,-1,TabUnk,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminStds ,NULL}, @@ -4513,7 +4515,8 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq ActSeeUsrAgd, // #1611 ActHidEvtMyAgd, // #1612 ActShoEvtMyAgd, // #1613 - ActLogInSeeUsrAgd, // #1614 + ActFrmLogInUsrAgd, // #1614 + ActLogInUsrAgd, // #1615 }; /*****************************************************************************/ diff --git a/swad_action.h b/swad_action.h index 1c09f63c..acf72261 100644 --- a/swad_action.h +++ b/swad_action.h @@ -55,9 +55,9 @@ typedef enum typedef int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action -#define Act_NUM_ACTIONS (1+9+51+14+93+73+70+249+186+157+172+36+31+95) +#define Act_NUM_ACTIONS (1+9+51+14+93+73+70+249+186+158+172+36+31+95) -#define Act_MAX_ACTION_COD 1614 +#define Act_MAX_ACTION_COD 1615 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 11 @@ -972,128 +972,129 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica #define ActChgVisFie (ActChgNumRowFooGrp+ 50) #define ActRcvRecCrs (ActChgNumRowFooGrp+ 51) -#define ActLogInSeeUsrAgd (ActChgNumRowFooGrp+ 52) -#define ActSeeUsrAgd (ActChgNumRowFooGrp+ 53) +#define ActFrmLogInUsrAgd (ActChgNumRowFooGrp+ 52) +#define ActLogInUsrAgd (ActChgNumRowFooGrp+ 53) +#define ActSeeUsrAgd (ActChgNumRowFooGrp+ 54) -#define ActReqEnrSevStd (ActChgNumRowFooGrp+ 54) -#define ActReqEnrSevTch (ActChgNumRowFooGrp+ 55) +#define ActReqEnrSevStd (ActChgNumRowFooGrp+ 55) +#define ActReqEnrSevTch (ActChgNumRowFooGrp+ 56) -#define ActReqLstStdAtt (ActChgNumRowFooGrp+ 56) -#define ActSeeLstMyAtt (ActChgNumRowFooGrp+ 57) -#define ActPrnLstMyAtt (ActChgNumRowFooGrp+ 58) -#define ActSeeLstStdAtt (ActChgNumRowFooGrp+ 59) -#define ActPrnLstStdAtt (ActChgNumRowFooGrp+ 60) -#define ActFrmNewAtt (ActChgNumRowFooGrp+ 61) -#define ActEdiOneAtt (ActChgNumRowFooGrp+ 62) -#define ActNewAtt (ActChgNumRowFooGrp+ 63) -#define ActChgAtt (ActChgNumRowFooGrp+ 64) -#define ActReqRemAtt (ActChgNumRowFooGrp+ 65) -#define ActRemAtt (ActChgNumRowFooGrp+ 66) -#define ActHidAtt (ActChgNumRowFooGrp+ 67) -#define ActShoAtt (ActChgNumRowFooGrp+ 68) -#define ActSeeOneAtt (ActChgNumRowFooGrp+ 69) -#define ActRecAttStd (ActChgNumRowFooGrp+ 70) -#define ActRecAttMe (ActChgNumRowFooGrp+ 71) +#define ActReqLstStdAtt (ActChgNumRowFooGrp+ 57) +#define ActSeeLstMyAtt (ActChgNumRowFooGrp+ 58) +#define ActPrnLstMyAtt (ActChgNumRowFooGrp+ 59) +#define ActSeeLstStdAtt (ActChgNumRowFooGrp+ 60) +#define ActPrnLstStdAtt (ActChgNumRowFooGrp+ 61) +#define ActFrmNewAtt (ActChgNumRowFooGrp+ 62) +#define ActEdiOneAtt (ActChgNumRowFooGrp+ 63) +#define ActNewAtt (ActChgNumRowFooGrp+ 64) +#define ActChgAtt (ActChgNumRowFooGrp+ 65) +#define ActReqRemAtt (ActChgNumRowFooGrp+ 66) +#define ActRemAtt (ActChgNumRowFooGrp+ 67) +#define ActHidAtt (ActChgNumRowFooGrp+ 68) +#define ActShoAtt (ActChgNumRowFooGrp+ 69) +#define ActSeeOneAtt (ActChgNumRowFooGrp+ 70) +#define ActRecAttStd (ActChgNumRowFooGrp+ 71) +#define ActRecAttMe (ActChgNumRowFooGrp+ 72) -#define ActSignUp (ActChgNumRowFooGrp+ 72) -#define ActUpdSignUpReq (ActChgNumRowFooGrp+ 73) -#define ActReqRejSignUp (ActChgNumRowFooGrp+ 74) -#define ActRejSignUp (ActChgNumRowFooGrp+ 75) +#define ActSignUp (ActChgNumRowFooGrp+ 73) +#define ActUpdSignUpReq (ActChgNumRowFooGrp+ 74) +#define ActReqRejSignUp (ActChgNumRowFooGrp+ 75) +#define ActRejSignUp (ActChgNumRowFooGrp+ 76) -#define ActReqMdfOneOth (ActChgNumRowFooGrp+ 76) -#define ActReqMdfOneStd (ActChgNumRowFooGrp+ 77) -#define ActReqMdfOneTch (ActChgNumRowFooGrp+ 78) +#define ActReqMdfOneOth (ActChgNumRowFooGrp+ 77) +#define ActReqMdfOneStd (ActChgNumRowFooGrp+ 78) +#define ActReqMdfOneTch (ActChgNumRowFooGrp+ 79) -#define ActReqMdfOth (ActChgNumRowFooGrp+ 79) -#define ActReqMdfStd (ActChgNumRowFooGrp+ 80) -#define ActReqMdfTch (ActChgNumRowFooGrp+ 81) +#define ActReqMdfOth (ActChgNumRowFooGrp+ 80) +#define ActReqMdfStd (ActChgNumRowFooGrp+ 81) +#define ActReqMdfTch (ActChgNumRowFooGrp+ 82) -#define ActReqOthPho (ActChgNumRowFooGrp+ 82) -#define ActReqStdPho (ActChgNumRowFooGrp+ 83) -#define ActReqTchPho (ActChgNumRowFooGrp+ 84) -#define ActDetOthPho (ActChgNumRowFooGrp+ 85) -#define ActDetStdPho (ActChgNumRowFooGrp+ 86) -#define ActDetTchPho (ActChgNumRowFooGrp+ 87) -#define ActUpdOthPho (ActChgNumRowFooGrp+ 88) -#define ActUpdStdPho (ActChgNumRowFooGrp+ 89) -#define ActUpdTchPho (ActChgNumRowFooGrp+ 90) -#define ActReqRemOthPho (ActChgNumRowFooGrp+ 91) -#define ActReqRemStdPho (ActChgNumRowFooGrp+ 92) -#define ActReqRemTchPho (ActChgNumRowFooGrp+ 93) -#define ActRemOthPho (ActChgNumRowFooGrp+ 94) -#define ActRemStdPho (ActChgNumRowFooGrp+ 95) -#define ActRemTchPho (ActChgNumRowFooGrp+ 96) -#define ActCreOth (ActChgNumRowFooGrp+ 97) -#define ActCreStd (ActChgNumRowFooGrp+ 98) -#define ActCreTch (ActChgNumRowFooGrp+ 99) -#define ActUpdOth (ActChgNumRowFooGrp+100) -#define ActUpdStd (ActChgNumRowFooGrp+101) -#define ActUpdTch (ActChgNumRowFooGrp+102) +#define ActReqOthPho (ActChgNumRowFooGrp+ 83) +#define ActReqStdPho (ActChgNumRowFooGrp+ 84) +#define ActReqTchPho (ActChgNumRowFooGrp+ 85) +#define ActDetOthPho (ActChgNumRowFooGrp+ 86) +#define ActDetStdPho (ActChgNumRowFooGrp+ 87) +#define ActDetTchPho (ActChgNumRowFooGrp+ 88) +#define ActUpdOthPho (ActChgNumRowFooGrp+ 89) +#define ActUpdStdPho (ActChgNumRowFooGrp+ 90) +#define ActUpdTchPho (ActChgNumRowFooGrp+ 91) +#define ActReqRemOthPho (ActChgNumRowFooGrp+ 92) +#define ActReqRemStdPho (ActChgNumRowFooGrp+ 93) +#define ActReqRemTchPho (ActChgNumRowFooGrp+ 94) +#define ActRemOthPho (ActChgNumRowFooGrp+ 95) +#define ActRemStdPho (ActChgNumRowFooGrp+ 96) +#define ActRemTchPho (ActChgNumRowFooGrp+ 97) +#define ActCreOth (ActChgNumRowFooGrp+ 98) +#define ActCreStd (ActChgNumRowFooGrp+ 99) +#define ActCreTch (ActChgNumRowFooGrp+100) +#define ActUpdOth (ActChgNumRowFooGrp+101) +#define ActUpdStd (ActChgNumRowFooGrp+102) +#define ActUpdTch (ActChgNumRowFooGrp+103) -#define ActReqAccEnrStd (ActChgNumRowFooGrp+103) -#define ActReqAccEnrTch (ActChgNumRowFooGrp+104) -#define ActAccEnrStd (ActChgNumRowFooGrp+105) -#define ActAccEnrTch (ActChgNumRowFooGrp+106) -#define ActRemMe_Std (ActChgNumRowFooGrp+107) -#define ActRemMe_Tch (ActChgNumRowFooGrp+108) +#define ActReqAccEnrStd (ActChgNumRowFooGrp+104) +#define ActReqAccEnrTch (ActChgNumRowFooGrp+105) +#define ActAccEnrStd (ActChgNumRowFooGrp+106) +#define ActAccEnrTch (ActChgNumRowFooGrp+107) +#define ActRemMe_Std (ActChgNumRowFooGrp+108) +#define ActRemMe_Tch (ActChgNumRowFooGrp+109) -#define ActNewAdmIns (ActChgNumRowFooGrp+109) -#define ActRemAdmIns (ActChgNumRowFooGrp+110) -#define ActNewAdmCtr (ActChgNumRowFooGrp+111) -#define ActRemAdmCtr (ActChgNumRowFooGrp+112) -#define ActNewAdmDeg (ActChgNumRowFooGrp+113) -#define ActRemAdmDeg (ActChgNumRowFooGrp+114) +#define ActNewAdmIns (ActChgNumRowFooGrp+110) +#define ActRemAdmIns (ActChgNumRowFooGrp+111) +#define ActNewAdmCtr (ActChgNumRowFooGrp+112) +#define ActRemAdmCtr (ActChgNumRowFooGrp+113) +#define ActNewAdmDeg (ActChgNumRowFooGrp+114) +#define ActRemAdmDeg (ActChgNumRowFooGrp+115) -#define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp+115) -#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp+116) +#define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp+116) +#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp+117) -#define ActReqCnfID_Oth (ActChgNumRowFooGrp+117) -#define ActReqCnfID_Std (ActChgNumRowFooGrp+118) -#define ActReqCnfID_Tch (ActChgNumRowFooGrp+119) -#define ActCnfID_Oth (ActChgNumRowFooGrp+120) -#define ActCnfID_Std (ActChgNumRowFooGrp+121) -#define ActCnfID_Tch (ActChgNumRowFooGrp+122) +#define ActReqCnfID_Oth (ActChgNumRowFooGrp+118) +#define ActReqCnfID_Std (ActChgNumRowFooGrp+119) +#define ActReqCnfID_Tch (ActChgNumRowFooGrp+120) +#define ActCnfID_Oth (ActChgNumRowFooGrp+121) +#define ActCnfID_Std (ActChgNumRowFooGrp+122) +#define ActCnfID_Tch (ActChgNumRowFooGrp+123) -#define ActFrmIDsOth (ActChgNumRowFooGrp+123) -#define ActFrmIDsStd (ActChgNumRowFooGrp+124) -#define ActFrmIDsTch (ActChgNumRowFooGrp+125) -#define ActRemID_Oth (ActChgNumRowFooGrp+126) -#define ActRemID_Std (ActChgNumRowFooGrp+127) -#define ActRemID_Tch (ActChgNumRowFooGrp+128) -#define ActNewID_Oth (ActChgNumRowFooGrp+129) -#define ActNewID_Std (ActChgNumRowFooGrp+130) -#define ActNewID_Tch (ActChgNumRowFooGrp+131) -#define ActFrmPwdOth (ActChgNumRowFooGrp+132) -#define ActFrmPwdStd (ActChgNumRowFooGrp+133) -#define ActFrmPwdTch (ActChgNumRowFooGrp+134) -#define ActChgPwdOth (ActChgNumRowFooGrp+135) -#define ActChgPwdStd (ActChgNumRowFooGrp+136) -#define ActChgPwdTch (ActChgNumRowFooGrp+137) -#define ActFrmMaiOth (ActChgNumRowFooGrp+138) -#define ActFrmMaiStd (ActChgNumRowFooGrp+139) -#define ActFrmMaiTch (ActChgNumRowFooGrp+140) -#define ActRemMaiOth (ActChgNumRowFooGrp+141) -#define ActRemMaiStd (ActChgNumRowFooGrp+142) -#define ActRemMaiTch (ActChgNumRowFooGrp+143) -#define ActNewMaiOth (ActChgNumRowFooGrp+144) -#define ActNewMaiStd (ActChgNumRowFooGrp+145) -#define ActNewMaiTch (ActChgNumRowFooGrp+146) +#define ActFrmIDsOth (ActChgNumRowFooGrp+124) +#define ActFrmIDsStd (ActChgNumRowFooGrp+125) +#define ActFrmIDsTch (ActChgNumRowFooGrp+126) +#define ActRemID_Oth (ActChgNumRowFooGrp+127) +#define ActRemID_Std (ActChgNumRowFooGrp+128) +#define ActRemID_Tch (ActChgNumRowFooGrp+129) +#define ActNewID_Oth (ActChgNumRowFooGrp+130) +#define ActNewID_Std (ActChgNumRowFooGrp+131) +#define ActNewID_Tch (ActChgNumRowFooGrp+132) +#define ActFrmPwdOth (ActChgNumRowFooGrp+133) +#define ActFrmPwdStd (ActChgNumRowFooGrp+134) +#define ActFrmPwdTch (ActChgNumRowFooGrp+135) +#define ActChgPwdOth (ActChgNumRowFooGrp+136) +#define ActChgPwdStd (ActChgNumRowFooGrp+137) +#define ActChgPwdTch (ActChgNumRowFooGrp+138) +#define ActFrmMaiOth (ActChgNumRowFooGrp+139) +#define ActFrmMaiStd (ActChgNumRowFooGrp+140) +#define ActFrmMaiTch (ActChgNumRowFooGrp+141) +#define ActRemMaiOth (ActChgNumRowFooGrp+142) +#define ActRemMaiStd (ActChgNumRowFooGrp+143) +#define ActRemMaiTch (ActChgNumRowFooGrp+144) +#define ActNewMaiOth (ActChgNumRowFooGrp+145) +#define ActNewMaiStd (ActChgNumRowFooGrp+146) +#define ActNewMaiTch (ActChgNumRowFooGrp+147) -#define ActRemStdCrs (ActChgNumRowFooGrp+147) -#define ActRemTchCrs (ActChgNumRowFooGrp+148) -#define ActRemUsrGbl (ActChgNumRowFooGrp+149) +#define ActRemStdCrs (ActChgNumRowFooGrp+148) +#define ActRemTchCrs (ActChgNumRowFooGrp+149) +#define ActRemUsrGbl (ActChgNumRowFooGrp+150) -#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+150) -#define ActRemAllStdCrs (ActChgNumRowFooGrp+151) +#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+151) +#define ActRemAllStdCrs (ActChgNumRowFooGrp+152) -#define ActReqRemOldUsr (ActChgNumRowFooGrp+152) -#define ActRemOldUsr (ActChgNumRowFooGrp+153) +#define ActReqRemOldUsr (ActChgNumRowFooGrp+153) +#define ActRemOldUsr (ActChgNumRowFooGrp+154) -#define ActLstDupUsr (ActChgNumRowFooGrp+154) -#define ActLstSimUsr (ActChgNumRowFooGrp+155) -#define ActRemDupUsr (ActChgNumRowFooGrp+156) +#define ActLstDupUsr (ActChgNumRowFooGrp+155) +#define ActLstSimUsr (ActChgNumRowFooGrp+156) +#define ActRemDupUsr (ActChgNumRowFooGrp+157) -#define ActLstClk (ActChgNumRowFooGrp+157) +#define ActLstClk (ActChgNumRowFooGrp+158) /*****************************************************************************/ /******************************** Social tab *********************************/ diff --git a/swad_agenda.c b/swad_agenda.c index 2072d1c0..1ecd6e54 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -92,18 +92,35 @@ static void Agd_CreateEvent (struct AgendaEvent *AgdEvent,const char *Txt); static void Agd_UpdateEvent (struct AgendaEvent *AgdEvent,const char *Txt); /*****************************************************************************/ -/************************ Show another user's agenda *************************/ +/********** Put form to log in and then show another user's agenda ***********/ /*****************************************************************************/ -void Agd_LogInToShowUsrAgenda (void) +void Agd_PutFormLogInToShowUsrAgenda (void) { - /***** Check if user exists and get her/his data *****/ + /***** Get encrypted user code from user code *****/ Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat); /***** Form to log in *****/ /* Put the form to log in always, even if user does not exist, to not give clues about whether a user exists or not */ - Usr_WriteFormLogin (ActSeeUsrAgd,Usr_PutParamOtherUsrCodEncrypted); + Usr_WriteFormLogin (ActLogInUsrAgd,Usr_PutParamOtherUsrCodEncrypted); + } + +/*****************************************************************************/ +/***************** Show another user's agenda after log in *******************/ +/*****************************************************************************/ + +void Agd_ShowUsrAgendaAfterLogIn (void) + { + extern const char *Txt_User_not_found_or_you_do_not_have_permission_; + + /***** Get user *****/ + /* User code is already got */ + if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat)) // Existing user + /***** Show all the visible events in the user's agenda *****/ + Agd_ShowEvents (Agd_USR_AGENDA); + else + Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ diff --git a/swad_agenda.h b/swad_agenda.h index 189405a7..09391470 100644 --- a/swad_agenda.h +++ b/swad_agenda.h @@ -74,7 +74,8 @@ typedef enum /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Agd_LogInToShowUsrAgenda (void); +void Agd_PutFormLogInToShowUsrAgenda (void); +void Agd_ShowUsrAgendaAfterLogIn (void); void Agd_ShowUsrAgenda (void); void Agd_ShowMyAgenda (void); diff --git a/swad_changelog.h b/swad_changelog.h index c6e136c1..4385e9c8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -183,14 +183,21 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.86 (2016-12-04)" +#define Log_PLATFORM_VERSION "SWAD 16.86.1 (2016-12-04)" #define CSS_FILE "swad16.82.2.css" #define JS_FILE "swad16.84.2.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.86: Dec 04, 2016 New action to log in and show another user's agenda when not logged. (209781 lines) + Version 16.86.1: Dec 04, 2016 New action to show another user's agenda after log in. (209806 lines) + 4 changes necessary in database: +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1612','es','N','Ocultar evento agenda'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1613','es','N','Mostrar evento agenda'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1614','es','N','Formulario log in para ver agenda'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1615','es','N','Ver agenda otro usuario tras log in'); + + Version 16.86: Dec 04, 2016 New action to put form to log in and show another user's agenda. (209781 lines) Version 16.85.1: Dec 03, 2016 Changed title of public agenda. (209722 lines) Version 16.85: Dec 03, 2016 Form to choice between all events / only public events in agenda. (209721 lines) Version 16.84.2: Dec 03, 2016 Only hours and minutes (seconds = 0) in agenda events. (209606 lines) diff --git a/swad_parameter.c b/swad_parameter.c index 4e630340..374f76a0 100644 --- a/swad_parameter.c +++ b/swad_parameter.c @@ -691,7 +691,7 @@ void Par_GetMainParameters (void) // This user's code is used to go to public agenda // If user does not exist ==> UsrCod = -1 Gbl.Usrs.Other.UsrDat.UsrCod = Nck_GetUsrCodFromNickname (Nickname); - Gbl.Action.Act = ActLogInSeeUsrAgd; // Set default action if no other is specified + Gbl.Action.Act = ActFrmLogInUsrAgd; // Set default action if no other is specified } } @@ -720,7 +720,7 @@ void Par_GetMainParameters (void) Gbl.Action.Act == ActRefOldSocPubGbl || Gbl.Action.Act == ActRefOldSocPubUsr) Gbl.Action.UsesAJAX = true; - else if (Gbl.Action.Act == ActSeeUsrAgd) + else if (Gbl.Action.Act == ActLogInUsrAgd) // It's necessary to do this here when log in to view user's agenda fails Usr_GetParamOtherUsrCodEncrypted (&Gbl.Usrs.Other.UsrDat); @@ -758,8 +758,8 @@ void Par_GetMainParameters (void) switch (Gbl.Action.Act) { case ActAutUsrInt: - case ActLogInSeeUsrAgd: - case ActSeeUsrAgd: + case ActFrmLogInUsrAgd: + case ActLogInUsrAgd: // This action is necessary here when log in fails Pwd_GetParamUsrPwdLogin (); // no break; case ActReqSndNewPwd: diff --git a/swad_user.c b/swad_user.c index c43654bd..db72efda 100644 --- a/swad_user.c +++ b/swad_user.c @@ -2269,7 +2269,7 @@ void Usr_ChkUsrAndGetUsrData (void) FormLogin.PutForm = true; } else if (Gbl.Action.Act == ActAutUsrInt || - Gbl.Action.Act == ActSeeUsrAgd) // Login using @nickname, email or ID from form + Gbl.Action.Act == ActLogInUsrAgd) // Login using @nickname, email or ID from form { if (Usr_ChkUsrAndGetUsrDataFromDirectLogin ()) // User logged in { @@ -2284,9 +2284,9 @@ void Usr_ChkUsrAndGetUsrData (void) else { FormLogin.PutForm = true; - if (Gbl.Action.Act == ActSeeUsrAgd) + if (Gbl.Action.Act == ActLogInUsrAgd) { - FormLogin.Action = ActSeeUsrAgd; + FormLogin.Action = ActLogInUsrAgd; FormLogin.FuncParams = Usr_PutParamOtherUsrCodEncrypted; } }