Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-07 09:15:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.134.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-09-17 23:41:51 +02:00
parent fa50ce6e35
commit aae7db4e8b
4 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swad_action.c
View File

@ -972,7 +972,9 @@ Users:
782c. ActNewID_Std Create a new user's ID for another user
782d. ActNewID_Tch Create a new user's ID for another user
783. ActFrmPwdOthUsr Show form to the change of the password of another user
783b. ActFrmPwdOth Show form to change the password of another user
783c. ActFrmPwdStd Show form to change the password of another user
783d. ActFrmPwdTch Show form to change the password of another user
784. ActChgPwdOthUsr Change the password of another user
785b. ActRemStdCrs Remove a student from the current course
785c. ActRemTchCrs Remove a teacher from the current course
@ -2400,10 +2402,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActNewID_Std */{1454,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActNewID_Tch */{1455,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActFrmPwdOthUsr */{ 598,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormOthPwd ,NULL},
/* ActFrmPwdOth */{1464,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormOthPwd ,NULL},
/* ActFrmPwdStd */{1465,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormOthPwd ,NULL},
/* ActFrmPwdTch */{1466,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormOthPwd ,NULL},
/* ActChgPwdOthUsr */{ 82,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pwd_UpdateOtherPwd1 ,Pwd_UpdateOtherPwd2 ,NULL},
/* ActRemStdCrs */{1462,-1,TabUsr,ActLstStd ,0x1E8,0x1E0,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemUsrFromCrs ,NULL},
/* ActRemStdCrs */{1462,-1,TabUsr,ActLstStd ,0x1F8,0x1E0,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemUsrFromCrs ,NULL},
/* ActRemTchCrs */{1463,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemUsrFromCrs ,NULL},
/* ActRemUsrGbl */{ 62,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Acc_RemUsrGbl ,NULL},
@ -3352,7 +3356,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActReqRemFilMrkCrs, // #595
ActFrmCreMrkCrs, // #596
ActFrmCreBrf, // #597
ActFrmPwdOthUsr, // #598
-1, // #598 (obsolete action)
ActRcvRepForCrsUsr, // #599
ActReqRemFilMrkGrp, // #600
ActFrmCreMrkGrp, // #601
@ -4221,6 +4225,9 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActRemMe_Tch, // #1461
ActRemStdCrs, // #1462
ActRemTchCrs, // #1463
ActFrmPwdOth, // #1464
ActFrmPwdStd, // #1465
ActFrmPwdTch, // #1466
};
/*****************************************************************************/

44
swad_action.h
View File

@ -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+138+168+28+79)
#define Act_NUM_ACTIONS (7+52+15+90+73+68+204+182+140+168+28+79)
#define Act_MAX_ACTION_COD 1463
#define Act_MAX_ACTION_COD 1466
#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20
@ -1000,29 +1000,31 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica
#define ActNewID_Oth (ActChgNumRowFooGrp+117)
#define ActNewID_Std (ActChgNumRowFooGrp+118)
#define ActNewID_Tch (ActChgNumRowFooGrp+119)
#define ActFrmPwdOthUsr (ActChgNumRowFooGrp+120)
#define ActChgPwdOthUsr (ActChgNumRowFooGrp+121)
#define ActRemStdCrs (ActChgNumRowFooGrp+122)
#define ActRemTchCrs (ActChgNumRowFooGrp+123)
#define ActRemUsrGbl (ActChgNumRowFooGrp+124)
#define ActFrmPwdOth (ActChgNumRowFooGrp+120)
#define ActFrmPwdStd (ActChgNumRowFooGrp+121)
#define ActFrmPwdTch (ActChgNumRowFooGrp+122)
#define ActChgPwdOthUsr (ActChgNumRowFooGrp+123)
#define ActRemStdCrs (ActChgNumRowFooGrp+124)
#define ActRemTchCrs (ActChgNumRowFooGrp+125)
#define ActRemUsrGbl (ActChgNumRowFooGrp+126)
#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+125)
#define ActRemAllStdCrs (ActChgNumRowFooGrp+126)
#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+127)
#define ActRemAllStdCrs (ActChgNumRowFooGrp+128)
#define ActReqRemOldUsr (ActChgNumRowFooGrp+127)
#define ActRemOldUsr (ActChgNumRowFooGrp+128)
#define ActReqRemOldUsr (ActChgNumRowFooGrp+129)
#define ActRemOldUsr (ActChgNumRowFooGrp+130)
#define ActSeePubPrf (ActChgNumRowFooGrp+129)
#define ActCal1stClkTim (ActChgNumRowFooGrp+130)
#define ActCalNumClk (ActChgNumRowFooGrp+131)
#define ActCalNumFilVie (ActChgNumRowFooGrp+132)
#define ActCalNumForPst (ActChgNumRowFooGrp+133)
#define ActCalNumMsgSnt (ActChgNumRowFooGrp+134)
#define ActSeePubPrf (ActChgNumRowFooGrp+131)
#define ActCal1stClkTim (ActChgNumRowFooGrp+132)
#define ActCalNumClk (ActChgNumRowFooGrp+133)
#define ActCalNumFilVie (ActChgNumRowFooGrp+134)
#define ActCalNumForPst (ActChgNumRowFooGrp+135)
#define ActCalNumMsgSnt (ActChgNumRowFooGrp+136)
#define ActFolUsr (ActChgNumRowFooGrp+135)
#define ActUnfUsr (ActChgNumRowFooGrp+136)
#define ActSeeFlg (ActChgNumRowFooGrp+137)
#define ActSeeFlr (ActChgNumRowFooGrp+138)
#define ActFolUsr (ActChgNumRowFooGrp+137)
#define ActUnfUsr (ActChgNumRowFooGrp+138)
#define ActSeeFlg (ActChgNumRowFooGrp+139)
#define ActSeeFlr (ActChgNumRowFooGrp+140)
/*****************************************************************************/
/******************************* Messages tab ********************************/

12
swad_changelog.h
View File

@ -98,12 +98,20 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.134.1 (2015/09/17)"
#define Log_PLATFORM_VERSION "SWAD 14.134.2 (2015/09/17)"
// 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.134.1: Sep 17, 2015 Changes in user enrollment. (184833 lines)
Version 14.134.2: Sep 17, 2015 Changes in user enrollment. (184852 lines)
4 changes necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod='598';
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1464','es','N','Solicitar cambio contraseña otro usuario');
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1465','es','N','Solicitar cambio contraseña estudiante');
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1466','es','N','Solicitar cambio contraseña profesor');
Version 14.134.1: Sep 17, 2015 Changes in user enrollment. (184834 lines)
3 changes necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod='58';
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1462','es','N','Eliminar estudiante asignatura');
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1463','es','N','Eliminar profesor asignatura');

5
swad_password.c
View File

@ -834,7 +834,10 @@ void Pwd_PutLinkToChangeOtherUsrPassword (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
Pwd_PutLinkToChangeMyPassword ();
else // Not me
Act_PutContextualLink (ActFrmPwdOthUsr,Usr_PutParamOtherUsrCodEncrypted,
Act_PutContextualLink ( Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmPwdStd :
(Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch :
ActFrmPwdOth),
Usr_PutParamOtherUsrCodEncrypted,
"key",Txt_Change_password);
}