From 146beb3edfea2ef4e2f1d17d24e08b70435966b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 16 Sep 2015 20:27:25 +0200 Subject: [PATCH] Version 14.132.3 --- swad_action.c | 14 ++++++-- swad_action.h | 84 +++++++++++++++++++++++++----------------------- swad_changelog.h | 9 +++++- swad_photo.c | 4 ++- 4 files changed, 65 insertions(+), 46 deletions(-) diff --git a/swad_action.c b/swad_action.c index 5e9e80ae2..738b8661d 100644 --- a/swad_action.c +++ b/swad_action.c @@ -932,7 +932,9 @@ Users: 765b. ActDetGstPho Receive other user's photo and detect faces on it 765c. ActDetStdPho Receive other user's photo and detect faces on it 765d. ActDetTchPho Receive other user's photo and detect faces on it - 766. ActUpdUsrPho Update other user's photo + 766b. ActUpdGstPho Update other user's photo + 766c. ActUpdStdPho Update other user's photo + 766d. ActUpdTchPho Update other user's photo 767. ActRemUsrPho Remove the photo of otro user 768. ActCreOthUsrDat Insertar a new user in this course 769b. ActUpdOthGst Update another user's data and groups @@ -2335,7 +2337,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActDetUsrPho */{1436,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL}, /* ActDetUsrPho */{1437,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL}, - /* ActUpdUsrPho */{ 374,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL}, + /* ActUpdGstPho */{1438,-1,TabUsr,ActLstGst ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL}, + /* ActUpdStdPho */{1439,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL}, + /* ActUpdTchPho */{1440,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL}, + /* ActRemUsrPho */{ 429,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_RemoveUsrPhoto ,NULL}, /* ActCreOthUsrDat */{ 440,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_CreateNewUsr ,NULL}, @@ -3089,7 +3094,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq ActEditorSylPra, // #371 ActEditorSylLec, // #372 -1, // #373 (obsolete action) - ActUpdUsrPho, // #374 + -1, // #374 (obsolete action) -1, // #375 (obsolete action) ActEditorBib, // #376 ActPlaTxtEdiBib, // #377 @@ -4156,6 +4161,9 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq ActDetGstPho, // #1435 ActDetStdPho, // #1436 ActDetTchPho, // #1437 + ActUpdGstPho, // #1438 + ActUpdStdPho, // #1439 + ActUpdTchPho, // #1440 }; /*****************************************************************************/ diff --git a/swad_action.h b/swad_action.h index bd5a2d29a..eab072233 100644 --- a/swad_action.h +++ b/swad_action.h @@ -69,9 +69,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 (7+52+15+90+73+68+204+182+125+168+28+79) +#define Act_NUM_ACTIONS (7+52+15+90+73+68+204+182+127+168+28+79) -#define Act_MAX_ACTION_COD 1437 +#define Act_MAX_ACTION_COD 1440 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20 @@ -960,53 +960,55 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica #define ActDetGstPho (ActChgNumRowFooGrp+ 84) #define ActDetStdPho (ActChgNumRowFooGrp+ 85) #define ActDetTchPho (ActChgNumRowFooGrp+ 86) -#define ActUpdUsrPho (ActChgNumRowFooGrp+ 87) -#define ActRemUsrPho (ActChgNumRowFooGrp+ 88) -#define ActCreOthUsrDat (ActChgNumRowFooGrp+ 89) -#define ActUpdOthGst (ActChgNumRowFooGrp+ 90) -#define ActUpdOthStd (ActChgNumRowFooGrp+ 91) -#define ActUpdOthTch (ActChgNumRowFooGrp+ 92) -#define ActUpdOthAdm (ActChgNumRowFooGrp+ 93) +#define ActUpdGstPho (ActChgNumRowFooGrp+ 87) +#define ActUpdStdPho (ActChgNumRowFooGrp+ 88) +#define ActUpdTchPho (ActChgNumRowFooGrp+ 89) +#define ActRemUsrPho (ActChgNumRowFooGrp+ 90) +#define ActCreOthUsrDat (ActChgNumRowFooGrp+ 91) +#define ActUpdOthGst (ActChgNumRowFooGrp+ 92) +#define ActUpdOthStd (ActChgNumRowFooGrp+ 93) +#define ActUpdOthTch (ActChgNumRowFooGrp+ 94) +#define ActUpdOthAdm (ActChgNumRowFooGrp+ 95) -#define ActReqAccEnrCrs (ActChgNumRowFooGrp+ 94) -#define ActAccEnrCrs (ActChgNumRowFooGrp+ 95) -#define ActRemMeCrs (ActChgNumRowFooGrp+ 96) +#define ActReqAccEnrCrs (ActChgNumRowFooGrp+ 96) +#define ActAccEnrCrs (ActChgNumRowFooGrp+ 97) +#define ActRemMeCrs (ActChgNumRowFooGrp+ 98) -#define ActNewAdmIns (ActChgNumRowFooGrp+ 97) -#define ActRemAdmIns (ActChgNumRowFooGrp+ 98) -#define ActNewAdmCtr (ActChgNumRowFooGrp+ 99) -#define ActRemAdmCtr (ActChgNumRowFooGrp+100) -#define ActNewAdmDeg (ActChgNumRowFooGrp+101) -#define ActRemAdmDeg (ActChgNumRowFooGrp+102) +#define ActNewAdmIns (ActChgNumRowFooGrp+ 99) +#define ActRemAdmIns (ActChgNumRowFooGrp+100) +#define ActNewAdmCtr (ActChgNumRowFooGrp+101) +#define ActRemAdmCtr (ActChgNumRowFooGrp+102) +#define ActNewAdmDeg (ActChgNumRowFooGrp+103) +#define ActRemAdmDeg (ActChgNumRowFooGrp+104) -#define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp+103) -#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp+104) +#define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp+105) +#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp+106) -#define ActFrmIDsOthUsr (ActChgNumRowFooGrp+105) -#define ActRemIDOth (ActChgNumRowFooGrp+106) -#define ActNewIDOth (ActChgNumRowFooGrp+107) -#define ActFrmPwdOthUsr (ActChgNumRowFooGrp+108) -#define ActChgPwdOthUsr (ActChgNumRowFooGrp+109) -#define ActRemUsrCrs (ActChgNumRowFooGrp+110) -#define ActRemUsrGbl (ActChgNumRowFooGrp+111) +#define ActFrmIDsOthUsr (ActChgNumRowFooGrp+107) +#define ActRemIDOth (ActChgNumRowFooGrp+108) +#define ActNewIDOth (ActChgNumRowFooGrp+109) +#define ActFrmPwdOthUsr (ActChgNumRowFooGrp+110) +#define ActChgPwdOthUsr (ActChgNumRowFooGrp+111) +#define ActRemUsrCrs (ActChgNumRowFooGrp+112) +#define ActRemUsrGbl (ActChgNumRowFooGrp+113) -#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+112) -#define ActRemAllStdCrs (ActChgNumRowFooGrp+113) +#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+114) +#define ActRemAllStdCrs (ActChgNumRowFooGrp+115) -#define ActReqRemOldUsr (ActChgNumRowFooGrp+114) -#define ActRemOldUsr (ActChgNumRowFooGrp+115) +#define ActReqRemOldUsr (ActChgNumRowFooGrp+116) +#define ActRemOldUsr (ActChgNumRowFooGrp+117) -#define ActSeePubPrf (ActChgNumRowFooGrp+116) -#define ActCal1stClkTim (ActChgNumRowFooGrp+117) -#define ActCalNumClk (ActChgNumRowFooGrp+118) -#define ActCalNumFilVie (ActChgNumRowFooGrp+119) -#define ActCalNumForPst (ActChgNumRowFooGrp+120) -#define ActCalNumMsgSnt (ActChgNumRowFooGrp+121) +#define ActSeePubPrf (ActChgNumRowFooGrp+118) +#define ActCal1stClkTim (ActChgNumRowFooGrp+119) +#define ActCalNumClk (ActChgNumRowFooGrp+120) +#define ActCalNumFilVie (ActChgNumRowFooGrp+121) +#define ActCalNumForPst (ActChgNumRowFooGrp+122) +#define ActCalNumMsgSnt (ActChgNumRowFooGrp+123) -#define ActFolUsr (ActChgNumRowFooGrp+122) -#define ActUnfUsr (ActChgNumRowFooGrp+123) -#define ActSeeFlg (ActChgNumRowFooGrp+124) -#define ActSeeFlr (ActChgNumRowFooGrp+125) +#define ActFolUsr (ActChgNumRowFooGrp+124) +#define ActUnfUsr (ActChgNumRowFooGrp+125) +#define ActSeeFlg (ActChgNumRowFooGrp+126) +#define ActSeeFlr (ActChgNumRowFooGrp+127) /*****************************************************************************/ /******************************* Messages tab ********************************/ diff --git a/swad_changelog.h b/swad_changelog.h index d4e61b0c0..c69514d93 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -98,11 +98,18 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.132.2 (2015/09/16)" +#define Log_PLATFORM_VERSION "SWAD 14.132.3 (2015/09/16)" // 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 14.132.3: Sep 16, 2015 Changes in user enrollment. (184518 lines) + 4 changes necessary in database: +UPDATE actions SET Obsolete='Y' WHERE ActCod='374'; +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1438','es','N','Cambiar foto otro usr.'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1439','es','N','Cambiar foto estudiante'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1440','es','N','Cambiar foto profesor'); + Version 14.132.2: Sep 16, 2015 Changes in user enrollment. (184501 lines) 4 changes necessary in database: UPDATE actions SET Obsolete='Y' WHERE ActCod='695'; diff --git a/swad_photo.c b/swad_photo.c index f26311e0d..85c61b8c0 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -540,7 +540,9 @@ void Pho_ReceivePhotoAndDetectFaces (bool ItsMe,const struct UsrData *UsrDat) { NumFacesGreen++; Act_FormStart (ItsMe ? ActUpdMyPho : - ActUpdUsrPho); + (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActUpdStdPho : + (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActUpdTchPho : + ActUpdGstPho))); // Guest, visitor or admin if (!ItsMe) Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Par_PutHiddenParamString ("FileName",StrFileName);