mirror of https://github.com/acanas/swad-core.git
Version 16.139
This commit is contained in:
parent
e273a739f4
commit
b7515fc1d7
|
@ -2621,7 +2621,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
||||||
/* ActReqRemSocComGbl*/{1506,-1,TabUnk,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Soc_RequestRemSocialComUsr ,NULL},
|
/* ActReqRemSocComGbl*/{1506,-1,TabUnk,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Soc_RequestRemSocialComUsr ,NULL},
|
||||||
/* ActRemSocComGbl */{1508,-1,TabUnk,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Soc_RemoveSocialComUsr ,NULL},
|
/* ActRemSocComGbl */{1508,-1,TabUnk,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Soc_RemoveSocialComUsr ,NULL},
|
||||||
|
|
||||||
/* ActSeeMyPubPrf */{1637,-1,TabUnk,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_ShowMyProfile ,NULL},
|
|
||||||
/* ActSeeOthPubPrf */{1402,-1,TabUnk,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_GetUsrDatAndShowUserProfile,NULL},
|
/* ActSeeOthPubPrf */{1402,-1,TabUnk,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_GetUsrDatAndShowUserProfile,NULL},
|
||||||
/* ActCal1stClkTim */{1405,-1,TabUnk,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_CalculateFigures ,NULL},
|
/* ActCal1stClkTim */{1405,-1,TabUnk,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_CalculateFigures ,NULL},
|
||||||
/* ActCalNumClk */{1406,-1,TabUnk,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_CalculateFigures ,NULL},
|
/* ActCalNumClk */{1406,-1,TabUnk,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Prf_CalculateFigures ,NULL},
|
||||||
|
@ -4623,7 +4622,6 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un
|
||||||
ActSeeCalDeg, // #1634
|
ActSeeCalDeg, // #1634
|
||||||
ActPrnCalDeg, // #1635
|
ActPrnCalDeg, // #1635
|
||||||
ActChgCalDeg1stDay, // #1636
|
ActChgCalDeg1stDay, // #1636
|
||||||
ActSeeMyPubPrf, // #1637
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
291
swad_action.h
291
swad_action.h
|
@ -55,9 +55,9 @@ typedef enum
|
||||||
|
|
||||||
typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
|
typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
|
||||||
|
|
||||||
#define Act_NUM_ACTIONS (1 + 9 + 54 + 17 + 47 + 27 + 24 + 115 + 54 + 416 + 159 + 173 + 36 + 31 + 97)
|
#define Act_NUM_ACTIONS (1 + 9 + 54 + 17 + 47 + 27 + 24 + 115 + 54 + 416 + 159 + 172 + 36 + 31 + 97)
|
||||||
|
|
||||||
#define Act_MAX_ACTION_COD 1637
|
#define Act_MAX_ACTION_COD 1636
|
||||||
|
|
||||||
#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 12
|
#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 12
|
||||||
|
|
||||||
|
@ -1165,153 +1165,152 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
|
||||||
#define ActReqRemSocComUsr (ActLstClk + 28)
|
#define ActReqRemSocComUsr (ActLstClk + 28)
|
||||||
#define ActRemSocComUsr (ActLstClk + 29)
|
#define ActRemSocComUsr (ActLstClk + 29)
|
||||||
|
|
||||||
#define ActSeeMyPubPrf (ActLstClk + 30)
|
#define ActSeeOthPubPrf (ActLstClk + 30)
|
||||||
#define ActSeeOthPubPrf (ActLstClk + 31)
|
#define ActCal1stClkTim (ActLstClk + 31)
|
||||||
#define ActCal1stClkTim (ActLstClk + 32)
|
#define ActCalNumClk (ActLstClk + 32)
|
||||||
#define ActCalNumClk (ActLstClk + 33)
|
#define ActCalNumFilVie (ActLstClk + 33)
|
||||||
#define ActCalNumFilVie (ActLstClk + 34)
|
#define ActCalNumForPst (ActLstClk + 34)
|
||||||
#define ActCalNumForPst (ActLstClk + 35)
|
#define ActCalNumMsgSnt (ActLstClk + 35)
|
||||||
#define ActCalNumMsgSnt (ActLstClk + 36)
|
|
||||||
|
|
||||||
#define ActFolUsr (ActLstClk + 37)
|
#define ActFolUsr (ActLstClk + 36)
|
||||||
#define ActUnfUsr (ActLstClk + 38)
|
#define ActUnfUsr (ActLstClk + 37)
|
||||||
#define ActSeeFlg (ActLstClk + 39)
|
#define ActSeeFlg (ActLstClk + 38)
|
||||||
#define ActSeeFlr (ActLstClk + 40)
|
#define ActSeeFlr (ActLstClk + 39)
|
||||||
|
|
||||||
#define ActSeeForCrsUsr (ActLstClk + 41)
|
#define ActSeeForCrsUsr (ActLstClk + 40)
|
||||||
#define ActSeeForCrsTch (ActLstClk + 42)
|
#define ActSeeForCrsTch (ActLstClk + 41)
|
||||||
#define ActSeeForDegUsr (ActLstClk + 43)
|
#define ActSeeForDegUsr (ActLstClk + 42)
|
||||||
#define ActSeeForDegTch (ActLstClk + 44)
|
#define ActSeeForDegTch (ActLstClk + 43)
|
||||||
#define ActSeeForCtrUsr (ActLstClk + 45)
|
#define ActSeeForCtrUsr (ActLstClk + 44)
|
||||||
#define ActSeeForCtrTch (ActLstClk + 46)
|
#define ActSeeForCtrTch (ActLstClk + 45)
|
||||||
#define ActSeeForInsUsr (ActLstClk + 47)
|
#define ActSeeForInsUsr (ActLstClk + 46)
|
||||||
#define ActSeeForInsTch (ActLstClk + 48)
|
#define ActSeeForInsTch (ActLstClk + 47)
|
||||||
#define ActSeeForGenUsr (ActLstClk + 49)
|
#define ActSeeForGenUsr (ActLstClk + 48)
|
||||||
#define ActSeeForGenTch (ActLstClk + 50)
|
#define ActSeeForGenTch (ActLstClk + 49)
|
||||||
#define ActSeeForSWAUsr (ActLstClk + 51)
|
#define ActSeeForSWAUsr (ActLstClk + 50)
|
||||||
#define ActSeeForSWATch (ActLstClk + 52)
|
#define ActSeeForSWATch (ActLstClk + 51)
|
||||||
#define ActSeePstForCrsUsr (ActLstClk + 53)
|
#define ActSeePstForCrsUsr (ActLstClk + 52)
|
||||||
#define ActSeePstForCrsTch (ActLstClk + 54)
|
#define ActSeePstForCrsTch (ActLstClk + 53)
|
||||||
#define ActSeePstForDegUsr (ActLstClk + 55)
|
#define ActSeePstForDegUsr (ActLstClk + 54)
|
||||||
#define ActSeePstForDegTch (ActLstClk + 56)
|
#define ActSeePstForDegTch (ActLstClk + 55)
|
||||||
#define ActSeePstForCtrUsr (ActLstClk + 57)
|
#define ActSeePstForCtrUsr (ActLstClk + 56)
|
||||||
#define ActSeePstForCtrTch (ActLstClk + 58)
|
#define ActSeePstForCtrTch (ActLstClk + 57)
|
||||||
#define ActSeePstForInsUsr (ActLstClk + 59)
|
#define ActSeePstForInsUsr (ActLstClk + 58)
|
||||||
#define ActSeePstForInsTch (ActLstClk + 60)
|
#define ActSeePstForInsTch (ActLstClk + 59)
|
||||||
#define ActSeePstForGenUsr (ActLstClk + 61)
|
#define ActSeePstForGenUsr (ActLstClk + 60)
|
||||||
#define ActSeePstForGenTch (ActLstClk + 62)
|
#define ActSeePstForGenTch (ActLstClk + 61)
|
||||||
#define ActSeePstForSWAUsr (ActLstClk + 63)
|
#define ActSeePstForSWAUsr (ActLstClk + 62)
|
||||||
#define ActSeePstForSWATch (ActLstClk + 64)
|
#define ActSeePstForSWATch (ActLstClk + 63)
|
||||||
#define ActRcvThrForCrsUsr (ActLstClk + 65)
|
#define ActRcvThrForCrsUsr (ActLstClk + 64)
|
||||||
#define ActRcvThrForCrsTch (ActLstClk + 66)
|
#define ActRcvThrForCrsTch (ActLstClk + 65)
|
||||||
#define ActRcvThrForDegUsr (ActLstClk + 67)
|
#define ActRcvThrForDegUsr (ActLstClk + 66)
|
||||||
#define ActRcvThrForDegTch (ActLstClk + 68)
|
#define ActRcvThrForDegTch (ActLstClk + 67)
|
||||||
#define ActRcvThrForCtrUsr (ActLstClk + 69)
|
#define ActRcvThrForCtrUsr (ActLstClk + 68)
|
||||||
#define ActRcvThrForCtrTch (ActLstClk + 70)
|
#define ActRcvThrForCtrTch (ActLstClk + 69)
|
||||||
#define ActRcvThrForInsUsr (ActLstClk + 71)
|
#define ActRcvThrForInsUsr (ActLstClk + 70)
|
||||||
#define ActRcvThrForInsTch (ActLstClk + 72)
|
#define ActRcvThrForInsTch (ActLstClk + 71)
|
||||||
#define ActRcvThrForGenUsr (ActLstClk + 73)
|
#define ActRcvThrForGenUsr (ActLstClk + 72)
|
||||||
#define ActRcvThrForGenTch (ActLstClk + 74)
|
#define ActRcvThrForGenTch (ActLstClk + 73)
|
||||||
#define ActRcvThrForSWAUsr (ActLstClk + 75)
|
#define ActRcvThrForSWAUsr (ActLstClk + 74)
|
||||||
#define ActRcvThrForSWATch (ActLstClk + 76)
|
#define ActRcvThrForSWATch (ActLstClk + 75)
|
||||||
#define ActRcvRepForCrsUsr (ActLstClk + 77)
|
#define ActRcvRepForCrsUsr (ActLstClk + 76)
|
||||||
#define ActRcvRepForCrsTch (ActLstClk + 78)
|
#define ActRcvRepForCrsTch (ActLstClk + 77)
|
||||||
#define ActRcvRepForDegUsr (ActLstClk + 79)
|
#define ActRcvRepForDegUsr (ActLstClk + 78)
|
||||||
#define ActRcvRepForDegTch (ActLstClk + 80)
|
#define ActRcvRepForDegTch (ActLstClk + 79)
|
||||||
#define ActRcvRepForCtrUsr (ActLstClk + 81)
|
#define ActRcvRepForCtrUsr (ActLstClk + 80)
|
||||||
#define ActRcvRepForCtrTch (ActLstClk + 82)
|
#define ActRcvRepForCtrTch (ActLstClk + 81)
|
||||||
#define ActRcvRepForInsUsr (ActLstClk + 83)
|
#define ActRcvRepForInsUsr (ActLstClk + 82)
|
||||||
#define ActRcvRepForInsTch (ActLstClk + 84)
|
#define ActRcvRepForInsTch (ActLstClk + 83)
|
||||||
#define ActRcvRepForGenUsr (ActLstClk + 85)
|
#define ActRcvRepForGenUsr (ActLstClk + 84)
|
||||||
#define ActRcvRepForGenTch (ActLstClk + 86)
|
#define ActRcvRepForGenTch (ActLstClk + 85)
|
||||||
#define ActRcvRepForSWAUsr (ActLstClk + 87)
|
#define ActRcvRepForSWAUsr (ActLstClk + 86)
|
||||||
#define ActRcvRepForSWATch (ActLstClk + 88)
|
#define ActRcvRepForSWATch (ActLstClk + 87)
|
||||||
#define ActReqDelThrCrsUsr (ActLstClk + 89)
|
#define ActReqDelThrCrsUsr (ActLstClk + 88)
|
||||||
#define ActReqDelThrCrsTch (ActLstClk + 90)
|
#define ActReqDelThrCrsTch (ActLstClk + 89)
|
||||||
#define ActReqDelThrDegUsr (ActLstClk + 91)
|
#define ActReqDelThrDegUsr (ActLstClk + 90)
|
||||||
#define ActReqDelThrDegTch (ActLstClk + 92)
|
#define ActReqDelThrDegTch (ActLstClk + 91)
|
||||||
#define ActReqDelThrCtrUsr (ActLstClk + 93)
|
#define ActReqDelThrCtrUsr (ActLstClk + 92)
|
||||||
#define ActReqDelThrCtrTch (ActLstClk + 94)
|
#define ActReqDelThrCtrTch (ActLstClk + 93)
|
||||||
#define ActReqDelThrInsUsr (ActLstClk + 95)
|
#define ActReqDelThrInsUsr (ActLstClk + 94)
|
||||||
#define ActReqDelThrInsTch (ActLstClk + 96)
|
#define ActReqDelThrInsTch (ActLstClk + 95)
|
||||||
#define ActReqDelThrGenUsr (ActLstClk + 97)
|
#define ActReqDelThrGenUsr (ActLstClk + 96)
|
||||||
#define ActReqDelThrGenTch (ActLstClk + 98)
|
#define ActReqDelThrGenTch (ActLstClk + 97)
|
||||||
#define ActReqDelThrSWAUsr (ActLstClk + 99)
|
#define ActReqDelThrSWAUsr (ActLstClk + 98)
|
||||||
#define ActReqDelThrSWATch (ActLstClk + 100)
|
#define ActReqDelThrSWATch (ActLstClk + 99)
|
||||||
#define ActDelThrForCrsUsr (ActLstClk + 101)
|
#define ActDelThrForCrsUsr (ActLstClk + 100)
|
||||||
#define ActDelThrForCrsTch (ActLstClk + 102)
|
#define ActDelThrForCrsTch (ActLstClk + 101)
|
||||||
#define ActDelThrForDegUsr (ActLstClk + 103)
|
#define ActDelThrForDegUsr (ActLstClk + 102)
|
||||||
#define ActDelThrForDegTch (ActLstClk + 104)
|
#define ActDelThrForDegTch (ActLstClk + 103)
|
||||||
#define ActDelThrForCtrUsr (ActLstClk + 105)
|
#define ActDelThrForCtrUsr (ActLstClk + 104)
|
||||||
#define ActDelThrForCtrTch (ActLstClk + 106)
|
#define ActDelThrForCtrTch (ActLstClk + 105)
|
||||||
#define ActDelThrForInsUsr (ActLstClk + 107)
|
#define ActDelThrForInsUsr (ActLstClk + 106)
|
||||||
#define ActDelThrForInsTch (ActLstClk + 108)
|
#define ActDelThrForInsTch (ActLstClk + 107)
|
||||||
#define ActDelThrForGenUsr (ActLstClk + 109)
|
#define ActDelThrForGenUsr (ActLstClk + 108)
|
||||||
#define ActDelThrForGenTch (ActLstClk + 110)
|
#define ActDelThrForGenTch (ActLstClk + 109)
|
||||||
#define ActDelThrForSWAUsr (ActLstClk + 111)
|
#define ActDelThrForSWAUsr (ActLstClk + 110)
|
||||||
#define ActDelThrForSWATch (ActLstClk + 112)
|
#define ActDelThrForSWATch (ActLstClk + 111)
|
||||||
#define ActCutThrForCrsUsr (ActLstClk + 113)
|
#define ActCutThrForCrsUsr (ActLstClk + 112)
|
||||||
#define ActCutThrForCrsTch (ActLstClk + 114)
|
#define ActCutThrForCrsTch (ActLstClk + 113)
|
||||||
#define ActCutThrForDegUsr (ActLstClk + 115)
|
#define ActCutThrForDegUsr (ActLstClk + 114)
|
||||||
#define ActCutThrForDegTch (ActLstClk + 116)
|
#define ActCutThrForDegTch (ActLstClk + 115)
|
||||||
#define ActCutThrForCtrUsr (ActLstClk + 117)
|
#define ActCutThrForCtrUsr (ActLstClk + 116)
|
||||||
#define ActCutThrForCtrTch (ActLstClk + 118)
|
#define ActCutThrForCtrTch (ActLstClk + 117)
|
||||||
#define ActCutThrForInsUsr (ActLstClk + 119)
|
#define ActCutThrForInsUsr (ActLstClk + 118)
|
||||||
#define ActCutThrForInsTch (ActLstClk + 120)
|
#define ActCutThrForInsTch (ActLstClk + 119)
|
||||||
#define ActCutThrForGenUsr (ActLstClk + 121)
|
#define ActCutThrForGenUsr (ActLstClk + 120)
|
||||||
#define ActCutThrForGenTch (ActLstClk + 122)
|
#define ActCutThrForGenTch (ActLstClk + 121)
|
||||||
#define ActCutThrForSWAUsr (ActLstClk + 123)
|
#define ActCutThrForSWAUsr (ActLstClk + 122)
|
||||||
#define ActCutThrForSWATch (ActLstClk + 124)
|
#define ActCutThrForSWATch (ActLstClk + 123)
|
||||||
#define ActPasThrForCrsUsr (ActLstClk + 125)
|
#define ActPasThrForCrsUsr (ActLstClk + 124)
|
||||||
#define ActPasThrForCrsTch (ActLstClk + 126)
|
#define ActPasThrForCrsTch (ActLstClk + 125)
|
||||||
#define ActPasThrForDegUsr (ActLstClk + 127)
|
#define ActPasThrForDegUsr (ActLstClk + 126)
|
||||||
#define ActPasThrForDegTch (ActLstClk + 128)
|
#define ActPasThrForDegTch (ActLstClk + 127)
|
||||||
#define ActPasThrForCtrUsr (ActLstClk + 129)
|
#define ActPasThrForCtrUsr (ActLstClk + 128)
|
||||||
#define ActPasThrForCtrTch (ActLstClk + 130)
|
#define ActPasThrForCtrTch (ActLstClk + 129)
|
||||||
#define ActPasThrForInsUsr (ActLstClk + 131)
|
#define ActPasThrForInsUsr (ActLstClk + 130)
|
||||||
#define ActPasThrForInsTch (ActLstClk + 132)
|
#define ActPasThrForInsTch (ActLstClk + 131)
|
||||||
#define ActPasThrForGenUsr (ActLstClk + 133)
|
#define ActPasThrForGenUsr (ActLstClk + 132)
|
||||||
#define ActPasThrForGenTch (ActLstClk + 134)
|
#define ActPasThrForGenTch (ActLstClk + 133)
|
||||||
#define ActPasThrForSWAUsr (ActLstClk + 135)
|
#define ActPasThrForSWAUsr (ActLstClk + 134)
|
||||||
#define ActPasThrForSWATch (ActLstClk + 136)
|
#define ActPasThrForSWATch (ActLstClk + 135)
|
||||||
#define ActDelPstForCrsUsr (ActLstClk + 137)
|
#define ActDelPstForCrsUsr (ActLstClk + 136)
|
||||||
#define ActDelPstForCrsTch (ActLstClk + 138)
|
#define ActDelPstForCrsTch (ActLstClk + 137)
|
||||||
#define ActDelPstForDegUsr (ActLstClk + 139)
|
#define ActDelPstForDegUsr (ActLstClk + 138)
|
||||||
#define ActDelPstForDegTch (ActLstClk + 140)
|
#define ActDelPstForDegTch (ActLstClk + 139)
|
||||||
#define ActDelPstForCtrUsr (ActLstClk + 141)
|
#define ActDelPstForCtrUsr (ActLstClk + 140)
|
||||||
#define ActDelPstForCtrTch (ActLstClk + 142)
|
#define ActDelPstForCtrTch (ActLstClk + 141)
|
||||||
#define ActDelPstForInsUsr (ActLstClk + 143)
|
#define ActDelPstForInsUsr (ActLstClk + 142)
|
||||||
#define ActDelPstForInsTch (ActLstClk + 144)
|
#define ActDelPstForInsTch (ActLstClk + 143)
|
||||||
#define ActDelPstForGenUsr (ActLstClk + 145)
|
#define ActDelPstForGenUsr (ActLstClk + 144)
|
||||||
#define ActDelPstForGenTch (ActLstClk + 146)
|
#define ActDelPstForGenTch (ActLstClk + 145)
|
||||||
#define ActDelPstForSWAUsr (ActLstClk + 147)
|
#define ActDelPstForSWAUsr (ActLstClk + 146)
|
||||||
#define ActDelPstForSWATch (ActLstClk + 148)
|
#define ActDelPstForSWATch (ActLstClk + 147)
|
||||||
#define ActEnbPstForCrsUsr (ActLstClk + 149)
|
#define ActEnbPstForCrsUsr (ActLstClk + 148)
|
||||||
#define ActEnbPstForCrsTch (ActLstClk + 150)
|
#define ActEnbPstForCrsTch (ActLstClk + 149)
|
||||||
#define ActEnbPstForDegUsr (ActLstClk + 151)
|
#define ActEnbPstForDegUsr (ActLstClk + 150)
|
||||||
#define ActEnbPstForDegTch (ActLstClk + 152)
|
#define ActEnbPstForDegTch (ActLstClk + 151)
|
||||||
#define ActEnbPstForCtrUsr (ActLstClk + 153)
|
#define ActEnbPstForCtrUsr (ActLstClk + 152)
|
||||||
#define ActEnbPstForCtrTch (ActLstClk + 154)
|
#define ActEnbPstForCtrTch (ActLstClk + 153)
|
||||||
#define ActEnbPstForInsUsr (ActLstClk + 155)
|
#define ActEnbPstForInsUsr (ActLstClk + 154)
|
||||||
#define ActEnbPstForInsTch (ActLstClk + 156)
|
#define ActEnbPstForInsTch (ActLstClk + 155)
|
||||||
#define ActEnbPstForGenUsr (ActLstClk + 157)
|
#define ActEnbPstForGenUsr (ActLstClk + 156)
|
||||||
#define ActEnbPstForGenTch (ActLstClk + 158)
|
#define ActEnbPstForGenTch (ActLstClk + 157)
|
||||||
#define ActEnbPstForSWAUsr (ActLstClk + 159)
|
#define ActEnbPstForSWAUsr (ActLstClk + 158)
|
||||||
#define ActEnbPstForSWATch (ActLstClk + 160)
|
#define ActEnbPstForSWATch (ActLstClk + 159)
|
||||||
#define ActDisPstForCrsUsr (ActLstClk + 161)
|
#define ActDisPstForCrsUsr (ActLstClk + 160)
|
||||||
#define ActDisPstForCrsTch (ActLstClk + 162)
|
#define ActDisPstForCrsTch (ActLstClk + 161)
|
||||||
#define ActDisPstForDegUsr (ActLstClk + 163)
|
#define ActDisPstForDegUsr (ActLstClk + 162)
|
||||||
#define ActDisPstForDegTch (ActLstClk + 164)
|
#define ActDisPstForDegTch (ActLstClk + 163)
|
||||||
#define ActDisPstForCtrUsr (ActLstClk + 165)
|
#define ActDisPstForCtrUsr (ActLstClk + 164)
|
||||||
#define ActDisPstForCtrTch (ActLstClk + 166)
|
#define ActDisPstForCtrTch (ActLstClk + 165)
|
||||||
#define ActDisPstForInsUsr (ActLstClk + 167)
|
#define ActDisPstForInsUsr (ActLstClk + 166)
|
||||||
#define ActDisPstForInsTch (ActLstClk + 168)
|
#define ActDisPstForInsTch (ActLstClk + 167)
|
||||||
#define ActDisPstForGenUsr (ActLstClk + 169)
|
#define ActDisPstForGenUsr (ActLstClk + 168)
|
||||||
#define ActDisPstForGenTch (ActLstClk + 170)
|
#define ActDisPstForGenTch (ActLstClk + 169)
|
||||||
#define ActDisPstForSWAUsr (ActLstClk + 171)
|
#define ActDisPstForSWAUsr (ActLstClk + 170)
|
||||||
#define ActDisPstForSWATch (ActLstClk + 172)
|
#define ActDisPstForSWATch (ActLstClk + 171)
|
||||||
|
|
||||||
#define ActCht (ActLstClk + 173)
|
#define ActCht (ActLstClk + 172)
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/******************************* Messages tab ********************************/
|
/******************************* Messages tab ********************************/
|
||||||
|
|
|
@ -199,13 +199,17 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.138 (2017-02-17)"
|
#define Log_PLATFORM_VERSION "SWAD 16.139 (2017-02-17)"
|
||||||
#define CSS_FILE "swad16.136.css"
|
#define CSS_FILE "swad16.136.css"
|
||||||
#define JS_FILE "swad16.123.js"
|
#define JS_FILE "swad16.123.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 16.139: Feb 17, 2017 Fixed bugs showing my public profile. (? lines)
|
||||||
|
1 change necessary in database:
|
||||||
|
DELETE FROM actions WHERE ActCod='1637';
|
||||||
|
|
||||||
Version 16.138: Feb 17, 2017 On right column show only users to follow with visible photo. (212873 lines)
|
Version 16.138: Feb 17, 2017 On right column show only users to follow with visible photo. (212873 lines)
|
||||||
Version 16.137: Feb 17, 2017 Link to view my public profile. (212808 lines)
|
Version 16.137: Feb 17, 2017 Link to view my public profile. (212808 lines)
|
||||||
1 change necessary in database:
|
1 change necessary in database:
|
||||||
|
|
|
@ -692,7 +692,10 @@ void Par_GetMainParameters (void)
|
||||||
// and to refresh old publishings in user's timeline
|
// and to refresh old publishings in user's timeline
|
||||||
// If user does not exist ==> UsrCod = -1
|
// If user does not exist ==> UsrCod = -1
|
||||||
Gbl.Usrs.Other.UsrDat.UsrCod = Nck_GetUsrCodFromNickname (Gbl.Usrs.Other.UsrDat.Nickname);
|
Gbl.Usrs.Other.UsrDat.UsrCod = Nck_GetUsrCodFromNickname (Gbl.Usrs.Other.UsrDat.Nickname);
|
||||||
Gbl.Action.Act = ActSeeOthPubPrf; // Set default action if no other is specified
|
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat))
|
||||||
|
Gbl.Action.Act = ActSeeOthPubPrf; // Set default action if no other is specified
|
||||||
|
else
|
||||||
|
Gbl.Usrs.Other.UsrDat.UsrCod = -1L;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (Par_GetParToText ("agd",Nickname,Nck_MAX_BYTES_NICKNAME_FROM_FORM))
|
else if (Par_GetParToText ("agd",Nickname,Nck_MAX_BYTES_NICKNAME_FROM_FORM))
|
||||||
|
|
24
swad_photo.c
24
swad_photo.c
|
@ -1121,32 +1121,20 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
|
||||||
Zoom == Pho_ZOOM && // Make zoom
|
Zoom == Pho_ZOOM && // Make zoom
|
||||||
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW; // Only in main window
|
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW; // Only in main window
|
||||||
char IdCaption[Act_MAX_LENGTH_ID];
|
char IdCaption[Act_MAX_LENGTH_ID];
|
||||||
bool ItsMe = (Gbl.Usrs.Me.Logged &&
|
|
||||||
UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
|
|
||||||
|
|
||||||
/***** Start form to go to public profile *****/
|
/***** Start form to go to public profile *****/
|
||||||
if (PutLinkToPublicProfile)
|
if (PutLinkToPublicProfile)
|
||||||
{
|
{
|
||||||
if (FormUnique)
|
if (FormUnique)
|
||||||
{
|
{
|
||||||
if (ItsMe)
|
Act_FormStartUnique (ActSeeOthPubPrf);
|
||||||
Act_FormStartUnique (ActSeeMyPubPrf);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
else
|
Act_LinkFormSubmitUnique (NULL,NULL);
|
||||||
{
|
}
|
||||||
Act_FormStartUnique (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
}
|
|
||||||
Act_LinkFormSubmitUnique (NULL,NULL);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (ItsMe)
|
Act_FormStart (ActSeeOthPubPrf);
|
||||||
Act_FormStart (ActSeeMyPubPrf);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStart (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
}
|
|
||||||
Act_LinkFormSubmit (NULL,NULL,NULL);
|
Act_LinkFormSubmit (NULL,NULL,NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,6 +73,8 @@ extern struct Globals Gbl;
|
||||||
|
|
||||||
static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickname);
|
static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickname);
|
||||||
|
|
||||||
|
static void Prf_ShowUserProfileAndTimeline (void);
|
||||||
|
|
||||||
static void Prf_PutLinkToUpdateAction (Act_Action_t Action,const char *EncryptedUsrCod);
|
static void Prf_PutLinkToUpdateAction (Act_Action_t Action,const char *EncryptedUsrCod);
|
||||||
|
|
||||||
static unsigned long Prf_GetRankingFigure (long UsrCod,const char *FieldName);
|
static unsigned long Prf_GetRankingFigure (long UsrCod,const char *FieldName);
|
||||||
|
@ -131,7 +133,8 @@ void Prf_PutLinkMyPublicProfile (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_My_public_profile;
|
extern const char *Txt_My_public_profile;
|
||||||
|
|
||||||
Lay_PutContextualLink (ActSeeMyPubPrf,NULL,
|
Lay_PutContextualLink (ActSeeOthPubPrf,
|
||||||
|
Usr_PutParamMyUsrCodEncrypted,
|
||||||
"usr64x64.gif",
|
"usr64x64.gif",
|
||||||
Txt_My_public_profile,Txt_My_public_profile,
|
Txt_My_public_profile,Txt_My_public_profile,
|
||||||
NULL);
|
NULL);
|
||||||
|
@ -207,19 +210,6 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
|
||||||
/************************** Show my public profile ***************************/
|
|
||||||
/*****************************************************************************/
|
|
||||||
|
|
||||||
void Prf_ShowMyProfile (void)
|
|
||||||
{
|
|
||||||
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
|
|
||||||
|
|
||||||
if (!Prf_ShowUserProfile (&Gbl.Usrs.Me.UsrDat))
|
|
||||||
/* Show error message */
|
|
||||||
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/******************** Get user and show a user's profile *********************/
|
/******************** Get user and show a user's profile *********************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -227,46 +217,56 @@ void Prf_ShowMyProfile (void)
|
||||||
|
|
||||||
void Prf_GetUsrDatAndShowUserProfile (void)
|
void Prf_GetUsrDatAndShowUserProfile (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
|
|
||||||
bool Error;
|
|
||||||
|
|
||||||
/***** Get user's data *****/
|
/***** Get user's data *****/
|
||||||
if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0)
|
if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0)
|
||||||
Usr_GetParamOtherUsrCodEncryptedAndGetListIDs ();
|
Usr_GetParamOtherUsrCodEncryptedAndGetListIDs ();
|
||||||
Error = !Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat);
|
|
||||||
|
|
||||||
/***** Show profile and timeline *****/
|
/***** Show profile and timeline *****/
|
||||||
if (!Error)
|
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat))
|
||||||
/* Show profile */
|
/* Show profile */
|
||||||
Error = !Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat);
|
Prf_ShowUserProfileAndTimeline ();
|
||||||
|
|
||||||
if (Error)
|
|
||||||
{
|
|
||||||
/* Show error message */
|
|
||||||
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
|
|
||||||
|
|
||||||
/* Request nickname again */
|
|
||||||
Prf_RequestUserProfileWithDefaultNickname ("");
|
|
||||||
}
|
|
||||||
else if (Gbl.Usrs.Me.Logged) // Timeline visible only by logged users
|
|
||||||
{
|
|
||||||
/* Start section */
|
|
||||||
fprintf (Gbl.F.Out,"<section id=\"timeline\">");
|
|
||||||
|
|
||||||
/* Show public social activity (timeline) of this user */
|
|
||||||
Soc_ShowTimelineUsr ();
|
|
||||||
|
|
||||||
/* End section */
|
|
||||||
fprintf (Gbl.F.Out,"</section>");
|
|
||||||
}
|
|
||||||
|
|
||||||
/***** If it's not me, mark possible notification as seen *****/
|
/***** If it's not me, mark possible notification as seen *****/
|
||||||
if (Gbl.Usrs.Other.UsrDat.UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod)
|
if (Gbl.Usrs.Other.UsrDat.UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod) // Not me
|
||||||
Ntf_MarkNotifAsSeen (Ntf_EVENT_FOLLOWER,
|
Ntf_MarkNotifAsSeen (Ntf_EVENT_FOLLOWER,
|
||||||
Gbl.Usrs.Other.UsrDat.UsrCod,-1L,
|
Gbl.Usrs.Other.UsrDat.UsrCod,-1L,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod);
|
Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************* Show a user's profile followed by his/her timeline ************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Prf_ShowUserProfileAndTimeline (void)
|
||||||
|
{
|
||||||
|
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
|
||||||
|
|
||||||
|
/***** Show profile *****/
|
||||||
|
if (Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat))
|
||||||
|
{
|
||||||
|
if (Gbl.Usrs.Me.Logged) // Timeline visible only by logged users
|
||||||
|
{
|
||||||
|
/***** Show timeline *****/
|
||||||
|
/* Start section */
|
||||||
|
fprintf (Gbl.F.Out,"<section id=\"timeline\">");
|
||||||
|
|
||||||
|
/* Show public social activity (timeline) of this user */
|
||||||
|
Soc_ShowTimelineUsr ();
|
||||||
|
|
||||||
|
/* End section */
|
||||||
|
fprintf (Gbl.F.Out,"</section>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Show error message */
|
||||||
|
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
|
||||||
|
|
||||||
|
/* Request nickname */
|
||||||
|
Prf_RequestUserProfileWithDefaultNickname ("");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/*************************** Show a user's profile ***************************/
|
/*************************** Show a user's profile ***************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -1524,8 +1524,6 @@ void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
|
||||||
bool ShowPhoto;
|
bool ShowPhoto;
|
||||||
char PhotoURL[PATH_MAX + 1];
|
char PhotoURL[PATH_MAX + 1];
|
||||||
bool Visible = Pri_ShowingIsAllowed (UsrDat->ProfileVisibility,UsrDat);
|
bool Visible = Pri_ShowingIsAllowed (UsrDat->ProfileVisibility,UsrDat);
|
||||||
bool ItsMe = (Gbl.Usrs.Me.Logged &&
|
|
||||||
UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
|
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"RANK RIGHT_MIDDLE COLOR%u\""
|
fprintf (Gbl.F.Out,"<td class=\"RANK RIGHT_MIDDLE COLOR%u\""
|
||||||
" style=\"height:50px;\">"
|
" style=\"height:50px;\">"
|
||||||
|
@ -1554,13 +1552,8 @@ void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
|
||||||
/***** Put form to go to public profile *****/
|
/***** Put form to go to public profile *****/
|
||||||
if (Visible)
|
if (Visible)
|
||||||
{
|
{
|
||||||
if (ItsMe)
|
Act_FormStart (ActSeeOthPubPrf);
|
||||||
Act_FormStart (ActSeeMyPubPrf);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStart (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
}
|
|
||||||
Act_LinkFormSubmit (Txt_Another_user_s_profile,"DAT_SMALL",NULL);
|
Act_LinkFormSubmit (Txt_Another_user_s_profile,"DAT_SMALL",NULL);
|
||||||
Usr_RestrictLengthAndWriteName (UsrDat,8);
|
Usr_RestrictLengthAndWriteName (UsrDat,8);
|
||||||
fprintf (Gbl.F.Out,"</a>");
|
fprintf (Gbl.F.Out,"</a>");
|
||||||
|
|
|
@ -55,7 +55,6 @@ char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba);
|
||||||
void Prf_PutLinkMyPublicProfile (void);
|
void Prf_PutLinkMyPublicProfile (void);
|
||||||
void Prf_PutLinkRequestAnotherUserProfile (void);
|
void Prf_PutLinkRequestAnotherUserProfile (void);
|
||||||
void Prf_RequestUserProfile (void);
|
void Prf_RequestUserProfile (void);
|
||||||
void Prf_ShowMyProfile (void);
|
|
||||||
void Prf_GetUsrDatAndShowUserProfile (void);
|
void Prf_GetUsrDatAndShowUserProfile (void);
|
||||||
|
|
||||||
bool Prf_ShowUserProfile (struct UsrData *UsrDat);
|
bool Prf_ShowUserProfile (struct UsrData *UsrDat);
|
||||||
|
|
|
@ -2362,23 +2362,18 @@ static void Rec_PutIconsCommands (void)
|
||||||
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO\">");
|
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO\">");
|
||||||
|
|
||||||
if (ItsMe)
|
if (ItsMe)
|
||||||
{
|
/***** Button to edit my record card *****/
|
||||||
/***** Buttons to edit my record card and to view my profile *****/
|
|
||||||
Lay_PutContextualLink (ActReqEdiRecCom,NULL,
|
Lay_PutContextualLink (ActReqEdiRecCom,NULL,
|
||||||
"edit64x64.png",
|
"edit64x64.png",
|
||||||
Txt_Edit_my_personal_data,NULL,
|
Txt_Edit_my_personal_data,NULL,
|
||||||
NULL);
|
NULL);
|
||||||
Lay_PutContextualLink (ActSeeMyPubPrf,NULL,
|
if (ICanViewUsrProfile)
|
||||||
"usr64x64.gif",
|
/***** Button to view user's profile *****/
|
||||||
Txt_My_public_profile,NULL,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
else if (ICanViewUsrProfile)
|
|
||||||
/***** Button to view another user's profile *****/
|
|
||||||
Lay_PutContextualLink (ActSeeOthPubPrf,
|
Lay_PutContextualLink (ActSeeOthPubPrf,
|
||||||
Rec_PutParamUsrCodEncrypted,
|
Rec_PutParamUsrCodEncrypted,
|
||||||
"usr64x64.gif",
|
"usr64x64.gif",
|
||||||
Txt_Another_user_s_profile,NULL,
|
ItsMe ? Txt_My_public_profile :
|
||||||
|
Txt_Another_user_s_profile,NULL,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
/***** Button to view user's record card *****/
|
/***** Button to view user's record card *****/
|
||||||
|
@ -2637,17 +2632,11 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
|
||||||
/* Put form to go to public profile */
|
/* Put form to go to public profile */
|
||||||
ItsMe = (Gbl.Usrs.Me.Logged &&
|
ItsMe = (Gbl.Usrs.Me.Logged &&
|
||||||
UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
|
UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||||
if (ItsMe)
|
Act_FormStart (ActSeeOthPubPrf);
|
||||||
{
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
Act_FormStart (ActSeeMyPubPrf);
|
Act_LinkFormSubmit (ItsMe ? Txt_My_public_profile :
|
||||||
Act_LinkFormSubmit (Txt_My_public_profile,"REC_NICK",NULL);
|
Txt_Another_user_s_profile,
|
||||||
}
|
"REC_NICK",NULL);
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStart (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
Act_LinkFormSubmit (Txt_Another_user_s_profile,"REC_NICK",NULL);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
fprintf (Gbl.F.Out,"@%s",UsrDat->Nickname);
|
fprintf (Gbl.F.Out,"@%s",UsrDat->Nickname);
|
||||||
if (PutFormLinks)
|
if (PutFormLinks)
|
||||||
|
|
108
swad_social.c
108
swad_social.c
|
@ -347,7 +347,9 @@ static void Soc_ShowTimelineGblHighlightingNot (long NotCod)
|
||||||
if (!Fol_GetNumFollowing (Gbl.Usrs.Me.UsrDat.UsrCod))
|
if (!Fol_GetNumFollowing (Gbl.Usrs.Me.UsrDat.UsrCod))
|
||||||
{
|
{
|
||||||
/***** Put link to show users to follow *****/
|
/***** Put link to show users to follow *****/
|
||||||
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
Fol_PutLinkWhoToFollow ();
|
Fol_PutLinkWhoToFollow ();
|
||||||
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
|
|
||||||
/***** Show warning if I do not follow anyone *****/
|
/***** Show warning if I do not follow anyone *****/
|
||||||
Lay_ShowAlert (Lay_WARNING,Txt_You_dont_follow_any_user);
|
Lay_ShowAlert (Lay_WARNING,Txt_You_dont_follow_any_user);
|
||||||
|
@ -1374,38 +1376,24 @@ static void Soc_WriteTopMessage (Soc_TopMessage_t TopMessage,long UsrCod)
|
||||||
struct UsrData UsrDat;
|
struct UsrData UsrDat;
|
||||||
bool ItsMe = (Gbl.Usrs.Me.Logged &&
|
bool ItsMe = (Gbl.Usrs.Me.Logged &&
|
||||||
UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
|
UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||||
bool UsrOK;
|
|
||||||
|
|
||||||
if (TopMessage != Soc_TOP_MESSAGE_NONE)
|
if (TopMessage != Soc_TOP_MESSAGE_NONE)
|
||||||
{
|
{
|
||||||
if (ItsMe)
|
/***** Initialize structure with user's data *****/
|
||||||
UsrOK = true;
|
Usr_UsrDataConstructor (&UsrDat);
|
||||||
else
|
|
||||||
{
|
|
||||||
/***** Initialize structure with user's data *****/
|
|
||||||
Usr_UsrDataConstructor (&UsrDat);
|
|
||||||
|
|
||||||
/***** Get user's data *****/
|
/***** Get user's data *****/
|
||||||
UsrDat.UsrCod = UsrCod;
|
UsrDat.UsrCod = UsrCod;
|
||||||
UsrOK = Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); // Really we only need EncryptedUsrCod and FullName
|
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Really we only need EncryptedUsrCod and FullName
|
||||||
}
|
|
||||||
|
|
||||||
if (UsrOK)
|
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_TOP_CONTAINER SOCIAL_TOP_PUBLISHER\">");
|
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_TOP_CONTAINER SOCIAL_TOP_PUBLISHER\">");
|
||||||
|
|
||||||
/***** Show user's name inside form to go to user's public profile *****/
|
/***** Show user's name inside form to go to user's public profile *****/
|
||||||
if (ItsMe)
|
Act_FormStartUnique (ActSeeOthPubPrf);
|
||||||
{
|
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
|
||||||
Act_FormStartUnique (ActSeeMyPubPrf);
|
Act_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
|
||||||
Act_LinkFormSubmitUnique (Txt_My_public_profile,"SOCIAL_TOP_PUBLISHER");
|
Txt_Another_user_s_profile,
|
||||||
}
|
"SOCIAL_TOP_PUBLISHER");
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStartUnique (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
|
|
||||||
Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"SOCIAL_TOP_PUBLISHER");
|
|
||||||
}
|
|
||||||
Str_LimitLengthHTMLStr (UsrDat.FullName,40);
|
Str_LimitLengthHTMLStr (UsrDat.FullName,40);
|
||||||
fprintf (Gbl.F.Out,"%s</a>",UsrDat.FullName);
|
fprintf (Gbl.F.Out,"%s</a>",UsrDat.FullName);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
|
@ -1415,9 +1403,8 @@ static void Soc_WriteTopMessage (Soc_TopMessage_t TopMessage,long UsrCod)
|
||||||
Txt_SOCIAL_NOTE_TOP_MESSAGES[TopMessage]);
|
Txt_SOCIAL_NOTE_TOP_MESSAGES[TopMessage]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ItsMe)
|
/***** Free memory used for user's data *****/
|
||||||
/***** Free memory used for user's data *****/
|
Usr_UsrDataDestructor (&UsrDat);
|
||||||
Usr_UsrDataDestructor (&UsrDat);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1436,33 +1423,21 @@ static void Soc_WriteAuthorNote (struct UsrData *UsrDat)
|
||||||
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_AUTHOR\">");
|
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_AUTHOR\">");
|
||||||
|
|
||||||
/***** Show user's name inside form to go to user's public profile *****/
|
/***** Show user's name inside form to go to user's public profile *****/
|
||||||
if (ItsMe)
|
Act_FormStartUnique (ActSeeOthPubPrf);
|
||||||
{
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
Act_FormStartUnique (ActSeeMyPubPrf);
|
Act_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
|
||||||
Act_LinkFormSubmitUnique (Txt_My_public_profile,"DAT_N_BOLD");
|
Txt_Another_user_s_profile,
|
||||||
}
|
"DAT_N_BOLD");
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStartUnique (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"DAT_N_BOLD");
|
|
||||||
}
|
|
||||||
Str_LimitLengthHTMLStr (UsrDat->FullName,16);
|
Str_LimitLengthHTMLStr (UsrDat->FullName,16);
|
||||||
fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
|
fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
|
|
||||||
/***** Show user's nickname inside form to go to user's public profile *****/
|
/***** Show user's nickname inside form to go to user's public profile *****/
|
||||||
if (ItsMe)
|
Act_FormStartUnique (ActSeeOthPubPrf);
|
||||||
{
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
Act_FormStartUnique (ActSeeMyPubPrf);
|
Act_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
|
||||||
Act_LinkFormSubmitUnique (Txt_My_public_profile,"DAT_N_BOLD");
|
Txt_Another_user_s_profile,
|
||||||
}
|
"DAT_LIGHT");
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStartUnique (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"DAT_LIGHT");
|
|
||||||
}
|
|
||||||
fprintf (Gbl.F.Out," @%s</a>",UsrDat->Nickname);
|
fprintf (Gbl.F.Out," @%s</a>",UsrDat->Nickname);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
|
|
||||||
|
@ -2500,33 +2475,24 @@ static void Soc_WriteAuthorComment (struct UsrData *UsrDat)
|
||||||
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_RIGHT_AUTHOR\">");
|
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_RIGHT_AUTHOR\">");
|
||||||
|
|
||||||
/***** Show user's name inside form to go to user's public profile *****/
|
/***** Show user's name inside form to go to user's public profile *****/
|
||||||
if (ItsMe)
|
Act_FormStartUnique (ActSeeOthPubPrf);
|
||||||
{
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
Act_FormStartUnique (ActSeeMyPubPrf);
|
Act_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
|
||||||
Act_LinkFormSubmitUnique (Txt_My_public_profile,"DAT_N_BOLD");
|
Txt_Another_user_s_profile,
|
||||||
}
|
"DAT_BOLD");
|
||||||
else
|
|
||||||
{
|
|
||||||
Act_FormStartUnique (ActSeeOthPubPrf);
|
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"DAT_BOLD");
|
|
||||||
}
|
|
||||||
Str_LimitLengthHTMLStr (UsrDat->FullName,12);
|
Str_LimitLengthHTMLStr (UsrDat->FullName,12);
|
||||||
fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
|
fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
|
|
||||||
/***** Show user's nickname inside form to go to user's public profile *****/
|
/***** Show user's nickname inside form to go to user's public profile *****/
|
||||||
if (ItsMe)
|
Act_FormStartUnique (ActSeeOthPubPrf);
|
||||||
{
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
Act_FormStartUnique (ActSeeMyPubPrf);
|
Act_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
|
||||||
Act_LinkFormSubmitUnique (Txt_My_public_profile,"DAT_LIGHT");
|
Txt_Another_user_s_profile,
|
||||||
}
|
"DAT_LIGHT");
|
||||||
else
|
Str_LimitLengthHTMLStr (UsrDat->FullName,12);
|
||||||
{
|
fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
|
||||||
Act_FormStartUnique (ActSeeOthPubPrf);
|
Act_FormEnd ();
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
|
||||||
Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"DAT_LIGHT");
|
|
||||||
}
|
|
||||||
fprintf (Gbl.F.Out," @%s</a>",UsrDat->Nickname);
|
fprintf (Gbl.F.Out," @%s</a>",UsrDat->Nickname);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
|
|
||||||
|
|
|
@ -2426,6 +2426,11 @@ unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *Lis
|
||||||
/********* Put hidden parameter encrypted user's code of other user **********/
|
/********* Put hidden parameter encrypted user's code of other user **********/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Usr_PutParamMyUsrCodEncrypted (void)
|
||||||
|
{
|
||||||
|
Usr_PutParamUsrCodEncrypted (Gbl.Usrs.Me.UsrDat.EncryptedUsrCod);
|
||||||
|
}
|
||||||
|
|
||||||
void Usr_PutParamOtherUsrCodEncrypted (void)
|
void Usr_PutParamOtherUsrCodEncrypted (void)
|
||||||
{
|
{
|
||||||
Usr_PutParamUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
|
Usr_PutParamUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
|
||||||
|
|
|
@ -300,6 +300,7 @@ void Usr_PutFormLogOut (void);
|
||||||
void Usr_GetParamUsrIdLogin (void);
|
void Usr_GetParamUsrIdLogin (void);
|
||||||
unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *ListUsrCods);
|
unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *ListUsrCods);
|
||||||
|
|
||||||
|
void Usr_PutParamMyUsrCodEncrypted (void);
|
||||||
void Usr_PutParamOtherUsrCodEncrypted (void);
|
void Usr_PutParamOtherUsrCodEncrypted (void);
|
||||||
void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
|
void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
|
||||||
void Usr_GetParamOtherUsrCodEncrypted (struct UsrData *UsrDat);
|
void Usr_GetParamOtherUsrCodEncrypted (struct UsrData *UsrDat);
|
||||||
|
|
Loading…
Reference in New Issue