Version 15.103

This commit is contained in:
Antonio Cañas Vargas 2016-01-08 15:08:30 +01:00
parent 0a7264c775
commit 575ee9cc0f
5 changed files with 261 additions and 285 deletions

View File

@ -1002,7 +1002,6 @@ Social:
837. ActSeeFor Show the level superior of the forums
838. ActSeeChtRms Show the chat rooms
839. ActReqSocPstGbl Write a public social post to be displayed in the timeline (global)
840. ActRcvSocPstGbl Receive a public social post to be displayed in the timeline (global)
NEW!!!!!!!!. ActRcvSocComGbl Comment a social note in the timeline (global)
NEW!!!!!!!!. ActShaSocNotGbl Share a social publishing in the timeline (global)
@ -1012,7 +1011,6 @@ NEW!!!!!!!!. ActUnsSocPubGbl Unshare a previously shared social publishing in t
NEW!!!!!!!!. ActReqRemSocComGbl Request the removal of a comment in a social note (global)
NEW!!!!!!!!. ActRemSocComGbl Remove of a comment in a social note (global)
NEW!!!!!!!!. ActReqSocPstUsr Write a public social post to be displayed in the timeline (user)
NEW!!!!!!!!. ActRcvSocPstUsr Receive a public social post to be displayed in the timeline (user)
NEW!!!!!!!!. ActRcvSocComUsr Comment a social note in the timeline (user)
NEW!!!!!!!!. ActShaSocNotUsr Share a social note in the timeline (user)
@ -2329,23 +2327,21 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeFor */{ 95, 2,TabSoc,ActSeeFor ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,For_ShowForumList ,"forum64x64.gif" },
/* ActSeeChtRms */{ 51, 3,TabSoc,ActSeeChtRms ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cht_ShowChatRooms ,"chat64x64.gif" },
/* ActReqSocPstGbl */{1491,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostGbl ,NULL},
/* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActRcvSocComUsr */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocPubGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteGbl ,NULL},
/* ActRemSocPubGbl */{1493,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteGbl ,NULL},
/* ActRemSocPubGbl */{1493,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteGbl ,NULL},
/* ActReqRemSocComGbl*/{1505,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialComGbl ,NULL},
/* ActRemSocComGbl */{1507,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialComGbl ,NULL},
/* ActReqSocPstUsr */{1497,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostUsr ,NULL},
/* ActRcvSocPstUsr */{1498,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL},
/* ActRcvSocComUsr */{1504,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentUsr ,NULL},
/* ActShaSocNotUsr */{1499,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL},
/* ActUnsSocPubUsr */{1500,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubUsr ,NULL},
/* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteUsr ,NULL},
/* ActRemSocPubUsr */{1502,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteUsr ,NULL},
/* ActRemSocPubUsr */{1502,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteUsr ,NULL},
/* ActReqRemSocComGbl*/{1506,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialComUsr ,NULL},
/* ActRemSocComGbl */{1508,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialComUsr ,NULL},
@ -4186,13 +4182,13 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActAskRemOldBrf, // #1488
ActRemOldBrf, // #1489
ActSeeSocTmlGbl, // #1490
ActReqSocPstGbl, // #1491
-1, // #1491 (obsolete action)
ActRcvSocPstGbl, // #1492
ActRemSocPubGbl, // #1493
ActReqRemSocPubGbl, // #1494
ActShaSocNotGbl, // #1495
ActUnsSocPubGbl, // #1496
ActReqSocPstUsr, // #1497
-1, // #1497 (obsolete action)
ActRcvSocPstUsr, // #1498
ActShaSocNotUsr, // #1499
ActUnsSocPubUsr, // #1500

View File

@ -71,7 +71,7 @@ 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+72+67+205+183+143+165+36+27+82)
#define Act_NUM_ACTIONS (7+52+15+90+72+67+205+183+143+163+36+27+82)
#define Act_MAX_ACTION_COD 1508
@ -1041,172 +1041,170 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica
#define ActSeeFor (ActLstClk+ 3)
#define ActSeeChtRms (ActLstClk+ 4)
// Secondary actions
#define ActReqSocPstGbl (ActLstClk+ 5)
#define ActRcvSocPstGbl (ActLstClk+ 6)
#define ActRcvSocComGbl (ActLstClk+ 7)
#define ActShaSocNotGbl (ActLstClk+ 8)
#define ActUnsSocPubGbl (ActLstClk+ 9)
#define ActReqRemSocPubGbl (ActLstClk+ 10)
#define ActRemSocPubGbl (ActLstClk+ 11)
#define ActReqRemSocComGbl (ActLstClk+ 12)
#define ActRemSocComGbl (ActLstClk+ 13)
#define ActRcvSocPstGbl (ActLstClk+ 5)
#define ActRcvSocComGbl (ActLstClk+ 6)
#define ActShaSocNotGbl (ActLstClk+ 7)
#define ActUnsSocPubGbl (ActLstClk+ 8)
#define ActReqRemSocPubGbl (ActLstClk+ 9)
#define ActRemSocPubGbl (ActLstClk+ 10)
#define ActReqRemSocComGbl (ActLstClk+ 11)
#define ActRemSocComGbl (ActLstClk+ 12)
#define ActReqSocPstUsr (ActLstClk+ 14)
#define ActRcvSocPstUsr (ActLstClk+ 15)
#define ActRcvSocComUsr (ActLstClk+ 16)
#define ActShaSocNotUsr (ActLstClk+ 17)
#define ActUnsSocPubUsr (ActLstClk+ 18)
#define ActReqRemSocPubUsr (ActLstClk+ 19)
#define ActRemSocPubUsr (ActLstClk+ 20)
#define ActReqRemSocComUsr (ActLstClk+ 21)
#define ActRemSocComUsr (ActLstClk+ 22)
#define ActRcvSocPstUsr (ActLstClk+ 13)
#define ActRcvSocComUsr (ActLstClk+ 14)
#define ActShaSocNotUsr (ActLstClk+ 15)
#define ActUnsSocPubUsr (ActLstClk+ 16)
#define ActReqRemSocPubUsr (ActLstClk+ 17)
#define ActRemSocPubUsr (ActLstClk+ 18)
#define ActReqRemSocComUsr (ActLstClk+ 19)
#define ActRemSocComUsr (ActLstClk+ 20)
#define ActSeePubPrf (ActLstClk+ 23)
#define ActCal1stClkTim (ActLstClk+ 24)
#define ActCalNumClk (ActLstClk+ 25)
#define ActCalNumFilVie (ActLstClk+ 26)
#define ActCalNumForPst (ActLstClk+ 27)
#define ActCalNumMsgSnt (ActLstClk+ 28)
#define ActSeePubPrf (ActLstClk+ 21)
#define ActCal1stClkTim (ActLstClk+ 22)
#define ActCalNumClk (ActLstClk+ 23)
#define ActCalNumFilVie (ActLstClk+ 24)
#define ActCalNumForPst (ActLstClk+ 25)
#define ActCalNumMsgSnt (ActLstClk+ 26)
#define ActFolUsr (ActLstClk+ 29)
#define ActUnfUsr (ActLstClk+ 30)
#define ActSeeFlg (ActLstClk+ 31)
#define ActSeeFlr (ActLstClk+ 32)
#define ActFolUsr (ActLstClk+ 27)
#define ActUnfUsr (ActLstClk+ 28)
#define ActSeeFlg (ActLstClk+ 29)
#define ActSeeFlr (ActLstClk+ 30)
#define ActSeeForCrsUsr (ActLstClk+ 33)
#define ActSeeForCrsTch (ActLstClk+ 34)
#define ActSeeForDegUsr (ActLstClk+ 35)
#define ActSeeForDegTch (ActLstClk+ 36)
#define ActSeeForCtrUsr (ActLstClk+ 37)
#define ActSeeForCtrTch (ActLstClk+ 38)
#define ActSeeForInsUsr (ActLstClk+ 39)
#define ActSeeForInsTch (ActLstClk+ 40)
#define ActSeeForGenUsr (ActLstClk+ 41)
#define ActSeeForGenTch (ActLstClk+ 42)
#define ActSeeForSWAUsr (ActLstClk+ 43)
#define ActSeeForSWATch (ActLstClk+ 44)
#define ActSeePstForCrsUsr (ActLstClk+ 45)
#define ActSeePstForCrsTch (ActLstClk+ 46)
#define ActSeePstForDegUsr (ActLstClk+ 47)
#define ActSeePstForDegTch (ActLstClk+ 48)
#define ActSeePstForCtrUsr (ActLstClk+ 49)
#define ActSeePstForCtrTch (ActLstClk+ 50)
#define ActSeePstForInsUsr (ActLstClk+ 51)
#define ActSeePstForInsTch (ActLstClk+ 52)
#define ActSeePstForGenUsr (ActLstClk+ 53)
#define ActSeePstForGenTch (ActLstClk+ 54)
#define ActSeePstForSWAUsr (ActLstClk+ 55)
#define ActSeePstForSWATch (ActLstClk+ 56)
#define ActRcvThrForCrsUsr (ActLstClk+ 57)
#define ActRcvThrForCrsTch (ActLstClk+ 58)
#define ActRcvThrForDegUsr (ActLstClk+ 59)
#define ActRcvThrForDegTch (ActLstClk+ 60)
#define ActRcvThrForCtrUsr (ActLstClk+ 61)
#define ActRcvThrForCtrTch (ActLstClk+ 62)
#define ActRcvThrForInsUsr (ActLstClk+ 63)
#define ActRcvThrForInsTch (ActLstClk+ 64)
#define ActRcvThrForGenUsr (ActLstClk+ 65)
#define ActRcvThrForGenTch (ActLstClk+ 66)
#define ActRcvThrForSWAUsr (ActLstClk+ 67)
#define ActRcvThrForSWATch (ActLstClk+ 68)
#define ActRcvRepForCrsUsr (ActLstClk+ 69)
#define ActRcvRepForCrsTch (ActLstClk+ 70)
#define ActRcvRepForDegUsr (ActLstClk+ 71)
#define ActRcvRepForDegTch (ActLstClk+ 72)
#define ActRcvRepForCtrUsr (ActLstClk+ 73)
#define ActRcvRepForCtrTch (ActLstClk+ 74)
#define ActRcvRepForInsUsr (ActLstClk+ 75)
#define ActRcvRepForInsTch (ActLstClk+ 76)
#define ActRcvRepForGenUsr (ActLstClk+ 77)
#define ActRcvRepForGenTch (ActLstClk+ 78)
#define ActRcvRepForSWAUsr (ActLstClk+ 79)
#define ActRcvRepForSWATch (ActLstClk+ 80)
#define ActReqDelThrCrsUsr (ActLstClk+ 81)
#define ActReqDelThrCrsTch (ActLstClk+ 82)
#define ActReqDelThrDegUsr (ActLstClk+ 83)
#define ActReqDelThrDegTch (ActLstClk+ 84)
#define ActReqDelThrCtrUsr (ActLstClk+ 85)
#define ActReqDelThrCtrTch (ActLstClk+ 86)
#define ActReqDelThrInsUsr (ActLstClk+ 87)
#define ActReqDelThrInsTch (ActLstClk+ 88)
#define ActReqDelThrGenUsr (ActLstClk+ 89)
#define ActReqDelThrGenTch (ActLstClk+ 90)
#define ActReqDelThrSWAUsr (ActLstClk+ 91)
#define ActReqDelThrSWATch (ActLstClk+ 92)
#define ActDelThrForCrsUsr (ActLstClk+ 93)
#define ActDelThrForCrsTch (ActLstClk+ 94)
#define ActDelThrForDegUsr (ActLstClk+ 95)
#define ActDelThrForDegTch (ActLstClk+ 96)
#define ActDelThrForCtrUsr (ActLstClk+ 97)
#define ActDelThrForCtrTch (ActLstClk+ 98)
#define ActDelThrForInsUsr (ActLstClk+ 99)
#define ActDelThrForInsTch (ActLstClk+100)
#define ActDelThrForGenUsr (ActLstClk+101)
#define ActDelThrForGenTch (ActLstClk+102)
#define ActDelThrForSWAUsr (ActLstClk+103)
#define ActDelThrForSWATch (ActLstClk+104)
#define ActCutThrForCrsUsr (ActLstClk+105)
#define ActCutThrForCrsTch (ActLstClk+106)
#define ActCutThrForDegUsr (ActLstClk+107)
#define ActCutThrForDegTch (ActLstClk+108)
#define ActCutThrForCtrUsr (ActLstClk+109)
#define ActCutThrForCtrTch (ActLstClk+110)
#define ActCutThrForInsUsr (ActLstClk+111)
#define ActCutThrForInsTch (ActLstClk+112)
#define ActCutThrForGenUsr (ActLstClk+113)
#define ActCutThrForGenTch (ActLstClk+114)
#define ActCutThrForSWAUsr (ActLstClk+115)
#define ActCutThrForSWATch (ActLstClk+116)
#define ActPasThrForCrsUsr (ActLstClk+117)
#define ActPasThrForCrsTch (ActLstClk+118)
#define ActPasThrForDegUsr (ActLstClk+119)
#define ActPasThrForDegTch (ActLstClk+120)
#define ActPasThrForCtrUsr (ActLstClk+121)
#define ActPasThrForCtrTch (ActLstClk+122)
#define ActPasThrForInsUsr (ActLstClk+123)
#define ActPasThrForInsTch (ActLstClk+124)
#define ActPasThrForGenUsr (ActLstClk+125)
#define ActPasThrForGenTch (ActLstClk+126)
#define ActPasThrForSWAUsr (ActLstClk+127)
#define ActPasThrForSWATch (ActLstClk+128)
#define ActDelPstForCrsUsr (ActLstClk+129)
#define ActDelPstForCrsTch (ActLstClk+130)
#define ActDelPstForDegUsr (ActLstClk+131)
#define ActDelPstForDegTch (ActLstClk+132)
#define ActDelPstForCtrUsr (ActLstClk+133)
#define ActDelPstForCtrTch (ActLstClk+134)
#define ActDelPstForInsUsr (ActLstClk+135)
#define ActDelPstForInsTch (ActLstClk+136)
#define ActDelPstForGenUsr (ActLstClk+137)
#define ActDelPstForGenTch (ActLstClk+138)
#define ActDelPstForSWAUsr (ActLstClk+139)
#define ActDelPstForSWATch (ActLstClk+140)
#define ActEnbPstForCrsUsr (ActLstClk+141)
#define ActEnbPstForCrsTch (ActLstClk+142)
#define ActEnbPstForDegUsr (ActLstClk+143)
#define ActEnbPstForDegTch (ActLstClk+144)
#define ActEnbPstForCtrUsr (ActLstClk+145)
#define ActEnbPstForCtrTch (ActLstClk+146)
#define ActEnbPstForInsUsr (ActLstClk+147)
#define ActEnbPstForInsTch (ActLstClk+148)
#define ActEnbPstForGenUsr (ActLstClk+149)
#define ActEnbPstForGenTch (ActLstClk+150)
#define ActEnbPstForSWAUsr (ActLstClk+151)
#define ActEnbPstForSWATch (ActLstClk+152)
#define ActDisPstForCrsUsr (ActLstClk+153)
#define ActDisPstForCrsTch (ActLstClk+154)
#define ActDisPstForDegUsr (ActLstClk+155)
#define ActDisPstForDegTch (ActLstClk+156)
#define ActDisPstForCtrUsr (ActLstClk+157)
#define ActDisPstForCtrTch (ActLstClk+158)
#define ActDisPstForInsUsr (ActLstClk+159)
#define ActDisPstForInsTch (ActLstClk+160)
#define ActDisPstForGenUsr (ActLstClk+161)
#define ActDisPstForGenTch (ActLstClk+162)
#define ActDisPstForSWAUsr (ActLstClk+163)
#define ActDisPstForSWATch (ActLstClk+164)
#define ActSeeForCrsUsr (ActLstClk+ 31)
#define ActSeeForCrsTch (ActLstClk+ 32)
#define ActSeeForDegUsr (ActLstClk+ 33)
#define ActSeeForDegTch (ActLstClk+ 34)
#define ActSeeForCtrUsr (ActLstClk+ 35)
#define ActSeeForCtrTch (ActLstClk+ 36)
#define ActSeeForInsUsr (ActLstClk+ 37)
#define ActSeeForInsTch (ActLstClk+ 38)
#define ActSeeForGenUsr (ActLstClk+ 39)
#define ActSeeForGenTch (ActLstClk+ 40)
#define ActSeeForSWAUsr (ActLstClk+ 41)
#define ActSeeForSWATch (ActLstClk+ 42)
#define ActSeePstForCrsUsr (ActLstClk+ 43)
#define ActSeePstForCrsTch (ActLstClk+ 44)
#define ActSeePstForDegUsr (ActLstClk+ 45)
#define ActSeePstForDegTch (ActLstClk+ 46)
#define ActSeePstForCtrUsr (ActLstClk+ 47)
#define ActSeePstForCtrTch (ActLstClk+ 48)
#define ActSeePstForInsUsr (ActLstClk+ 49)
#define ActSeePstForInsTch (ActLstClk+ 50)
#define ActSeePstForGenUsr (ActLstClk+ 51)
#define ActSeePstForGenTch (ActLstClk+ 52)
#define ActSeePstForSWAUsr (ActLstClk+ 53)
#define ActSeePstForSWATch (ActLstClk+ 54)
#define ActRcvThrForCrsUsr (ActLstClk+ 55)
#define ActRcvThrForCrsTch (ActLstClk+ 56)
#define ActRcvThrForDegUsr (ActLstClk+ 57)
#define ActRcvThrForDegTch (ActLstClk+ 58)
#define ActRcvThrForCtrUsr (ActLstClk+ 59)
#define ActRcvThrForCtrTch (ActLstClk+ 60)
#define ActRcvThrForInsUsr (ActLstClk+ 61)
#define ActRcvThrForInsTch (ActLstClk+ 62)
#define ActRcvThrForGenUsr (ActLstClk+ 63)
#define ActRcvThrForGenTch (ActLstClk+ 64)
#define ActRcvThrForSWAUsr (ActLstClk+ 65)
#define ActRcvThrForSWATch (ActLstClk+ 66)
#define ActRcvRepForCrsUsr (ActLstClk+ 67)
#define ActRcvRepForCrsTch (ActLstClk+ 68)
#define ActRcvRepForDegUsr (ActLstClk+ 69)
#define ActRcvRepForDegTch (ActLstClk+ 70)
#define ActRcvRepForCtrUsr (ActLstClk+ 71)
#define ActRcvRepForCtrTch (ActLstClk+ 72)
#define ActRcvRepForInsUsr (ActLstClk+ 73)
#define ActRcvRepForInsTch (ActLstClk+ 74)
#define ActRcvRepForGenUsr (ActLstClk+ 75)
#define ActRcvRepForGenTch (ActLstClk+ 76)
#define ActRcvRepForSWAUsr (ActLstClk+ 77)
#define ActRcvRepForSWATch (ActLstClk+ 78)
#define ActReqDelThrCrsUsr (ActLstClk+ 79)
#define ActReqDelThrCrsTch (ActLstClk+ 80)
#define ActReqDelThrDegUsr (ActLstClk+ 81)
#define ActReqDelThrDegTch (ActLstClk+ 82)
#define ActReqDelThrCtrUsr (ActLstClk+ 83)
#define ActReqDelThrCtrTch (ActLstClk+ 84)
#define ActReqDelThrInsUsr (ActLstClk+ 85)
#define ActReqDelThrInsTch (ActLstClk+ 86)
#define ActReqDelThrGenUsr (ActLstClk+ 87)
#define ActReqDelThrGenTch (ActLstClk+ 88)
#define ActReqDelThrSWAUsr (ActLstClk+ 89)
#define ActReqDelThrSWATch (ActLstClk+ 90)
#define ActDelThrForCrsUsr (ActLstClk+ 91)
#define ActDelThrForCrsTch (ActLstClk+ 92)
#define ActDelThrForDegUsr (ActLstClk+ 93)
#define ActDelThrForDegTch (ActLstClk+ 94)
#define ActDelThrForCtrUsr (ActLstClk+ 95)
#define ActDelThrForCtrTch (ActLstClk+ 96)
#define ActDelThrForInsUsr (ActLstClk+ 97)
#define ActDelThrForInsTch (ActLstClk+ 98)
#define ActDelThrForGenUsr (ActLstClk+ 99)
#define ActDelThrForGenTch (ActLstClk+100)
#define ActDelThrForSWAUsr (ActLstClk+101)
#define ActDelThrForSWATch (ActLstClk+102)
#define ActCutThrForCrsUsr (ActLstClk+103)
#define ActCutThrForCrsTch (ActLstClk+104)
#define ActCutThrForDegUsr (ActLstClk+105)
#define ActCutThrForDegTch (ActLstClk+106)
#define ActCutThrForCtrUsr (ActLstClk+107)
#define ActCutThrForCtrTch (ActLstClk+108)
#define ActCutThrForInsUsr (ActLstClk+109)
#define ActCutThrForInsTch (ActLstClk+110)
#define ActCutThrForGenUsr (ActLstClk+111)
#define ActCutThrForGenTch (ActLstClk+112)
#define ActCutThrForSWAUsr (ActLstClk+113)
#define ActCutThrForSWATch (ActLstClk+114)
#define ActPasThrForCrsUsr (ActLstClk+115)
#define ActPasThrForCrsTch (ActLstClk+116)
#define ActPasThrForDegUsr (ActLstClk+117)
#define ActPasThrForDegTch (ActLstClk+118)
#define ActPasThrForCtrUsr (ActLstClk+119)
#define ActPasThrForCtrTch (ActLstClk+120)
#define ActPasThrForInsUsr (ActLstClk+121)
#define ActPasThrForInsTch (ActLstClk+122)
#define ActPasThrForGenUsr (ActLstClk+123)
#define ActPasThrForGenTch (ActLstClk+124)
#define ActPasThrForSWAUsr (ActLstClk+125)
#define ActPasThrForSWATch (ActLstClk+126)
#define ActDelPstForCrsUsr (ActLstClk+127)
#define ActDelPstForCrsTch (ActLstClk+128)
#define ActDelPstForDegUsr (ActLstClk+129)
#define ActDelPstForDegTch (ActLstClk+130)
#define ActDelPstForCtrUsr (ActLstClk+131)
#define ActDelPstForCtrTch (ActLstClk+132)
#define ActDelPstForInsUsr (ActLstClk+133)
#define ActDelPstForInsTch (ActLstClk+134)
#define ActDelPstForGenUsr (ActLstClk+135)
#define ActDelPstForGenTch (ActLstClk+136)
#define ActDelPstForSWAUsr (ActLstClk+137)
#define ActDelPstForSWATch (ActLstClk+138)
#define ActEnbPstForCrsUsr (ActLstClk+139)
#define ActEnbPstForCrsTch (ActLstClk+140)
#define ActEnbPstForDegUsr (ActLstClk+141)
#define ActEnbPstForDegTch (ActLstClk+142)
#define ActEnbPstForCtrUsr (ActLstClk+143)
#define ActEnbPstForCtrTch (ActLstClk+144)
#define ActEnbPstForInsUsr (ActLstClk+145)
#define ActEnbPstForInsTch (ActLstClk+146)
#define ActEnbPstForGenUsr (ActLstClk+147)
#define ActEnbPstForGenTch (ActLstClk+148)
#define ActEnbPstForSWAUsr (ActLstClk+149)
#define ActEnbPstForSWATch (ActLstClk+150)
#define ActDisPstForCrsUsr (ActLstClk+151)
#define ActDisPstForCrsTch (ActLstClk+152)
#define ActDisPstForDegUsr (ActLstClk+153)
#define ActDisPstForDegTch (ActLstClk+154)
#define ActDisPstForCtrUsr (ActLstClk+155)
#define ActDisPstForCtrTch (ActLstClk+156)
#define ActDisPstForInsUsr (ActLstClk+157)
#define ActDisPstForInsTch (ActLstClk+158)
#define ActDisPstForGenUsr (ActLstClk+159)
#define ActDisPstForGenTch (ActLstClk+160)
#define ActDisPstForSWAUsr (ActLstClk+161)
#define ActDisPstForSWATch (ActLstClk+162)
#define ActCht (ActLstClk+165)
#define ActCht (ActLstClk+163)
/*****************************************************************************/
/******************************* Messages tab ********************************/

View File

@ -118,13 +118,17 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.102.4 (2016-01-08)"
#define Log_PLATFORM_VERSION "SWAD 15.103 (2016-01-08)"
#define CSS_FILE "swad15.102.css"
#define JS_FILE "swad15.100.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 15.103: Jan 08, 2016 Changes in the form to enter a new publishing. (191625 lines)
1 change necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod IN ('1491','1497');
Version 15.102.4: Jan 08, 2016 Text in icon to comment a social note. (191644 lines)
Version 15.102.3: Jan 08, 2016 The social notes of the user are shown in her/his global timeline even if he/she does not follow any user. (191603 lines)
Version 15.102.2: Jan 08, 2016 When a user is eliminated, all her/his social publshing are removed. (191606 lines)

View File

@ -192,17 +192,16 @@ static void Soc_GetNoteSummary (const struct SocialNote *SocNot,
char *SummaryStr,unsigned MaxChars);
static void Soc_PublishSocialNoteInTimeline (struct SocialPublishing *SocPub);
static void Soc_PutLinkToWriteANewPost (Act_Action_t Action,void (*FuncParams) ());
static void Soc_FormSocialPost (void);
static void Soc_PutHiddenFormToWriteNewPost (void);
static void Soc_ReceiveSocialPost (void);
static void Soc_PutIconToToggleCommentSocialNote (long NotCod,bool PutText);
static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod);
static unsigned long Soc_GetNumCommentsInSocialNote (long NotCod);
static void Soc_WriteCommentsInSocialNote (long NotCod);
static void Soc_WriteSocialComment (struct SocialComment *SocCom,
bool ShowAlone);
static void Soc_PutFormToRemoveComment (long ComCod);
static void Soc_PutHiddenFormToSendCommentToASocialNote (long NotCod);
static void Soc_PutDisabledIconShare (unsigned NumShared);
static void Soc_PutFormToShareSocialNote (long NotCod);
static void Soc_PutFormToUnshareSocialPublishing (long PubCod);
@ -254,11 +253,6 @@ void Soc_ShowTimelineUsr (void)
extern const char *Txt_Public_activity_OF_A_USER;
char Query[512];
/***** Link to write a new social post (public comment) *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod && // It's me
Gbl.CurrentAct != ActReqSocPstUsr) // Not writing a new post
Soc_PutLinkToWriteANewPost (ActReqSocPstUsr,Usr_PutParamOtherUsrCodEncrypted);
/***** Build query to show timeline with publishing of a unique user *****/
sprintf (Query,"SELECT PubCod,NotCod,PublisherCod,AuthorCod,UNIX_TIMESTAMP(TimePublish)"
" FROM social_timeline"
@ -282,10 +276,6 @@ void Soc_ShowTimelineGbl (void)
extern const char *Txt_You_dont_follow_any_user;
char Query[512];
/***** Link to write a new social post (public comment) *****/
if (Gbl.CurrentAct != ActReqSocPstGbl) // Not writing a new post
Soc_PutLinkToWriteANewPost (ActReqSocPstGbl,NULL);
/***** Show warning if I do not follow anyone *****/
if (!Fol_GetNumFollowing (Gbl.Usrs.Me.UsrDat.UsrCod))
Lay_ShowAlert (Lay_INFO,Txt_You_dont_follow_any_user);
@ -368,6 +358,11 @@ static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
/***** Start list *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
/***** Form to write a new post *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0 || // Global timeline
Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
Soc_PutHiddenFormToWriteNewPost ();
/***** List publishings in timeline one by one *****/
for (NumPub = 0;
NumPub < NumPublishings;
@ -626,8 +621,8 @@ static void Soc_WriteSocialNote (const struct SocialPublishing *SocPub,
/* Show current comments */
Soc_WriteCommentsInSocialNote (SocNot->NotCod);
/* Put hidden form to write comment */
Soc_PutHiddenFormToSendCommentToASocialNote (SocNot->NotCod);
/* Put hidden form to write a new comment */
Soc_PutHiddenFormToWriteNewCommentToSocialNote (SocNot->NotCod);
/* End of right part */
fprintf (Gbl.F.Out,"</div>");
@ -1067,63 +1062,42 @@ static void Soc_PublishSocialNoteInTimeline (struct SocialPublishing *SocPub)
}
/*****************************************************************************/
/***************** Put contextual link to write a new post *******************/
/****************** Form to write a new social publishing ********************/
/*****************************************************************************/
static void Soc_PutLinkToWriteANewPost (Act_Action_t Action,void (*FuncParams) ())
static void Soc_PutHiddenFormToWriteNewPost (void)
{
extern const char *Txt_New_comment;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLinkAnchor (Action,"timeline",
FuncParams,
"write64x64.gif",
Txt_New_comment,Txt_New_comment);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/****************** Form to write a new public comment ***********************/
/*****************************************************************************/
void Soc_FormSocialPostGbl (void)
{
/***** Form to write a new public comment *****/
Soc_FormSocialPost ();
/***** Write current timeline (global) *****/
Soc_ShowTimelineGbl ();
}
void Soc_FormSocialPostUsr (void)
{
/***** Get user whom profile is displayed *****/
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
/***** Show user's profile *****/
Prf_ShowUserProfile ();
/***** Start section *****/
fprintf (Gbl.F.Out,"<section id=\"timeline\">");
/***** Form to write a new public comment *****/
Soc_FormSocialPost ();
/***** Write current timeline (user) *****/
Soc_ShowTimelineUsr ();
/***** End section *****/
fprintf (Gbl.F.Out,"</section>");
}
static void Soc_FormSocialPost (void)
{
extern const char *Txt_New_comment;
extern const char *Txt_Send_comment;
bool ShowPhoto;
char PhotoURL[PATH_MAX+1];
char FullName[(Usr_MAX_BYTES_NAME+1)*3];
/***** Form to write a new public comment *****/
/* Start frame */
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Txt_New_comment);
/***** Start list item *****/
fprintf (Gbl.F.Out,"<li class=\"SOCIAL_PUB\">");
/***** Left: write author's photo *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_LEFT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO45x60",Pho_ZOOM);
fprintf (Gbl.F.Out,"</div>");
/***** Right: author's name, time, summary and buttons *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_CONTAINER\">");
/* Write author's full name and nickname */
strcpy (FullName,Gbl.Usrs.Me.UsrDat.FullName);
Str_LimitLengthHTMLStr (FullName,16);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_AUTHOR\">"
"<span class=\"DAT_N_BOLD\">%s</span>"
"<span class=\"DAT_LIGHT\"> @%s</span>"
"</div>",
FullName,Gbl.Usrs.Me.UsrDat.Nickname);
/***** Start container *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_FORM_COMMENT\">");
/* Start form to write the post */
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
@ -1135,18 +1109,24 @@ static void Soc_FormSocialPost (void)
Act_FormStart (ActRcvSocPstGbl);
/* Content of new post */
fprintf (Gbl.F.Out,"<textarea name=\"Content\" cols=\"50\" rows=\"5\">"
fprintf (Gbl.F.Out,"<textarea name=\"Content\" cols=\"45\" rows=\"3\">"
"</textarea>");
Lay_HelpPlainEditor ();
/* Send button */
Lay_PutCreateButton (Txt_Send_comment);
/***** Send button *****/
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CREATE\">"
"%s"
"</button>",
Txt_Send_comment);
/* End form */
/***** End form *****/
Act_FormEnd ();
/* End frame */
Lay_EndRoundFrame ();
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");
/***** End list item *****/
fprintf (Gbl.F.Out,"</li>");
}
/*****************************************************************************/
@ -1231,6 +1211,46 @@ static void Soc_PutIconToToggleCommentSocialNote (long NotCod,bool PutText)
"</div>");
}
/*****************************************************************************/
/******************* Form to comment a social publishing *********************/
/*****************************************************************************/
static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod)
{
extern const char *Txt_Send_comment;
/***** Start container *****/
fprintf (Gbl.F.Out,"<div id=\"div_comment_%ld\""
" class=\"SOCIAL_FORM_COMMENT\""
" style=\"display:none;\">",
NotCod);
/***** Start form to write the post *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
{
Act_FormStartAnchor (ActRcvSocComUsr,"timeline");
Usr_PutParamOtherUsrCodEncrypted ();
}
else
Act_FormStart (ActRcvSocComGbl);
Soc_PutHiddenParamNotCod (NotCod);
fprintf (Gbl.F.Out,"<textarea name=\"Comment%ld\" cols=\"45\" rows=\"3\">"
"</textarea>",
NotCod);
/***** Send button *****/
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CREATE\">"
"%s"
"</button>",
Txt_Send_comment);
/***** End form *****/
Act_FormEnd ();
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/****************** Get number of comments in a social note ******************/
/*****************************************************************************/
@ -1422,46 +1442,6 @@ static void Soc_PutFormToRemoveComment (long ComCod)
Act_FormEnd ();
}
/*****************************************************************************/
/******************* Form to comment a social publishing *********************/
/*****************************************************************************/
static void Soc_PutHiddenFormToSendCommentToASocialNote (long NotCod)
{
extern const char *Txt_Send_comment;
/***** Start container *****/
fprintf (Gbl.F.Out,"<div id=\"div_comment_%ld\""
" class=\"SOCIAL_FORM_COMMENT\""
" style=\"display:none;\">",
NotCod);
/***** Start form to write the post *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
{
Act_FormStartAnchor (ActRcvSocComUsr,"timeline");
Usr_PutParamOtherUsrCodEncrypted ();
}
else
Act_FormStart (ActRcvSocComGbl);
Soc_PutHiddenParamNotCod (NotCod);
fprintf (Gbl.F.Out,"<textarea name=\"Comment%ld\" cols=\"47\" rows=\"5\">"
"</textarea>",
NotCod);
/***** Send button *****/
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CREATE\">"
"%s"
"</button>",
Txt_Send_comment);
/***** End form *****/
Act_FormEnd ();
/***** En container *****/
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/*********************** Put disabled icon to share **************************/
/*****************************************************************************/

View File

@ -90,8 +90,6 @@ void Soc_MarkSocialNoteAsUnavailableUsingNoteTypeAndCod (Soc_NoteType_t NoteType
void Soc_MarkSocialNoteOneFileAsRemoved (const char *Path);
void Soc_MarkSocialNotesChildrenOfFolderAsUnavailable (const char *Path);
void Soc_FormSocialPostGbl (void);
void Soc_FormSocialPostUsr (void);
void Soc_ReceiveSocialPostGbl (void);
void Soc_ReceiveSocialPostUsr (void);