Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.160

This commit is contained in:
Antonio Cañas Vargas 2017-03-21 14:52:07 +01:00
parent 27835064bd
commit 0ce7ef16d0
7 changed files with 224 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
swad_action.c
View File

@ -82,7 +82,7 @@ extern struct Globals Gbl;
/************************ Internal global variables **************************/ /************************ Internal global variables **************************/
/*****************************************************************************/ /*****************************************************************************/
/* /*
1259 actions in one CGI: 1258 actions in one CGI:
0. ActAll Any action (used for statistics) 0. ActAll Any action (used for statistics)
1. ActUnk Unknown action 1. ActUnk Unknown action
2. ActHom Show home menu 2. ActHom Show home menu
@ -1370,110 +1370,109 @@ Profile:
1165. ActMyCrs Select one of my courses 1165. ActMyCrs Select one of my courses
1166. ActSeeMyTT Show the timetable of all courses of the logged user 1166. ActSeeMyTT Show the timetable of all courses of the logged user
1167. ActSeeMyAgd Show my full agenda (personal organizer) 1167. ActSeeMyAgd Show my full agenda (personal organizer)
1168. ActSeeMyPubAgd Show my public agenda (personal organizer) 1168. ActFrmMyAcc Show form to the creation or change of user's account
1169. ActFrmMyAcc Show form to the creation or change of user's account 1169. ActReqEdiRecCom Request the edition of the record with the personal data of the user
1170. ActReqEdiRecCom Request the edition of the record with the personal data of the user 1170. ActEdiPrf Show forms to edit preferences
1171. ActEdiPrf Show forms to edit preferences 1171. ActAdmBrf Show the briefcase of private archives
1172. ActAdmBrf Show the briefcase of private archives
1173. ActReqSndNewPwd Show form to send a new password via email 1172. ActReqSndNewPwd Show form to send a new password via email
1174. ActSndNewPwd Send a new password via email 1173. ActSndNewPwd Send a new password via email
1175. ActLogOut Close session 1174. ActLogOut Close session
1176. ActLogIn Authentify user internally (directly from the platform) 1175. ActLogIn Authentify user internally (directly from the platform)
1177. ActLogInNew Authentify user internally (directly from the platform, only if user has not password) 1176. ActLogInNew Authentify user internally (directly from the platform, only if user has not password)
1178. ActLogInLan Change language to my language just after authentication 1177. ActLogInLan Change language to my language just after authentication
1179. ActAnnSee Mark announcement as seen 1178. ActAnnSee Mark announcement as seen
1180. ActChgMyRol Change type of logged user 1179. ActChgMyRol Change type of logged user
1181. ActFrmNewEvtMyAgd Form to create a new event in my agenda 1180. ActFrmNewEvtMyAgd Form to create a new event in my agenda
1182. ActEdiOneEvtMyAgd Edit one event from my agenda 1181. ActEdiOneEvtMyAgd Edit one event from my agenda
1183. ActNewEvtMyAgd Create a new event in my agenda 1182. ActNewEvtMyAgd Create a new event in my agenda
1184. ActChgEvtMyAgd Modify data of an event from my agenda 1183. ActChgEvtMyAgd Modify data of an event from my agenda
1185. ActReqRemEvtMyAgd Request the removal of an event from my agenda 1184. ActReqRemEvtMyAgd Request the removal of an event from my agenda
1186. ActRemEvtMyAgd Remove an event from my agenda 1185. ActRemEvtMyAgd Remove an event from my agenda
1187. ActHidEvtMyAgd Hide an event from my agenda 1186. ActHidEvtMyAgd Hide an event from my agenda
1188. ActShoEvtMyAgd Show an event from my agenda 1187. ActShoEvtMyAgd Show an event from my agenda
1189. ActPrvEvtMyAgd Make private an event from my agenda 1188. ActPrvEvtMyAgd Make private an event from my agenda
1190. ActPubEvtMyAgd Make public an event from my agenda 1189. ActPubEvtMyAgd Make public an event from my agenda
1191. ActPrnAgdQR Show agenda QR code ready to print 1190. ActPrnAgdQR Show agenda QR code ready to print
1192. ActChkUsrAcc Check if already exists a new account without password associated to a ID 1191. ActChkUsrAcc Check if already exists a new account without password associated to a ID
1193. ActCreUsrAcc Create new user account 1192. ActCreUsrAcc Create new user account
1194. ActRemID_Me Remove one of my user's IDs 1193. ActRemID_Me Remove one of my user's IDs
1195. ActNewIDMe Create a new user's ID for me 1194. ActNewIDMe Create a new user's ID for me
1196. ActRemOldNic Remove one of my old nicknames 1195. ActRemOldNic Remove one of my old nicknames
1197. ActChgNic Change my nickname 1196. ActChgNic Change my nickname
1198. ActRemMaiMe Remove one of my old emails 1197. ActRemMaiMe Remove one of my old emails
1199. ActNewMaiMe Change my email address 1198. ActNewMaiMe Change my email address
1200. ActCnfMai Confirm email address 1199. ActCnfMai Confirm email address
1201. ActFrmChgMyPwd Show form to the change of the password 1200. ActFrmChgMyPwd Show form to the change of the password
1202. ActChgPwd Change the password 1201. ActChgPwd Change the password
1203. ActReqRemMyAcc Request the removal of my account 1202. ActReqRemMyAcc Request the removal of my account
1204. ActRemMyAcc Remove my account 1203. ActRemMyAcc Remove my account
1205. ActChgMyData Update my personal data 1204. ActChgMyData Update my personal data
1206. ActReqMyPho Show form to send my photo 1205. ActReqMyPho Show form to send my photo
1207. ActDetMyPho Receive my photo and detect faces on it 1206. ActDetMyPho Receive my photo and detect faces on it
1208. ActUpdMyPho Update my photo 1207. ActUpdMyPho Update my photo
1209. ActReqRemMyPho Request the removal of my photo 1208. ActReqRemMyPho Request the removal of my photo
1210. ActRemMyPho Remove my photo 1209. ActRemMyPho Remove my photo
1211. ActEdiPri Edit my privacy 1210. ActEdiPri Edit my privacy
1212. ActChgPriPho Change privacy of my photo 1211. ActChgPriPho Change privacy of my photo
1213. ActChgPriPrf Change privacy of my public profile 1212. ActChgPriPrf Change privacy of my public profile
1214. ActReqEdiMyIns Request the edition of my institution, centre and department 1213. ActReqEdiMyIns Request the edition of my institution, centre and department
1215. ActChgCtyMyIns Change the country of my institution 1214. ActChgCtyMyIns Change the country of my institution
1216. ActChgMyIns Change my institution 1215. ActChgMyIns Change my institution
1217. ActChgMyCtr Change my centre 1216. ActChgMyCtr Change my centre
1218. ActChgMyDpt Change my department 1217. ActChgMyDpt Change my department
1219. ActChgMyOff Change my office 1218. ActChgMyOff Change my office
1220. ActChgMyOffPho Change my office phone 1219. ActChgMyOffPho Change my office phone
1221. ActReqEdiMyNet Request the edition of my social networks 1220. ActReqEdiMyNet Request the edition of my social networks
1222. ActChgMyNet Change my web and social networks 1221. ActChgMyNet Change my web and social networks
1223. ActChgThe Change theme 1222. ActChgThe Change theme
1224. ActReqChgLan Ask if change language 1223. ActReqChgLan Ask if change language
1225. ActChgLan Change language 1224. ActChgLan Change language
1226. ActChg1stDay Change first day of the week 1225. ActChg1stDay Change first day of the week
1227. ActChgCol Change side columns 1226. ActChgCol Change side columns
1228. ActHidLftCol Hide left side column 1227. ActHidLftCol Hide left side column
1229. ActHidRgtCol Hide right side column 1228. ActHidRgtCol Hide right side column
1230. ActShoLftCol Show left side column 1229. ActShoLftCol Show left side column
1231. ActShoRgtCol Show right side column 1230. ActShoRgtCol Show right side column
1232. ActChgIco Change icon set 1231. ActChgIco Change icon set
1233. ActChgMnu Change menu 1232. ActChgMnu Change menu
1234. ActChgNtfPrf Change whether to notify by email new messages 1233. ActChgNtfPrf Change whether to notify by email new messages
1235. ActPrnUsrQR Show my QR code ready to print 1234. ActPrnUsrQR Show my QR code ready to print
1236. ActPrnMyTT Show the timetable listo to impresión of all my courses 1235. ActPrnMyTT Show the timetable listo to impresión of all my courses
1237. ActEdiTut Edit the timetable of tutorías 1236. ActEdiTut Edit the timetable of tutorías
1238. ActChgTut Modify the timetable of tutorías 1237. ActChgTut Modify the timetable of tutorías
1239. ActChgMyTT1stDay Change first day of week and show timetable of the course 1238. ActChgMyTT1stDay Change first day of week and show timetable of the course
1240. ActReqRemFilBrf Request removal of a file of the briefcase 1239. ActReqRemFilBrf Request removal of a file of the briefcase
1241. ActRemFilBrf Remove a file of the briefcase 1240. ActRemFilBrf Remove a file of the briefcase
1242. ActRemFolBrf Remove a folder empty of the briefcase 1241. ActRemFolBrf Remove a folder empty of the briefcase
1243. ActCopBrf Set source of copy in the briefcase 1242. ActCopBrf Set source of copy in the briefcase
1244. ActPasBrf Paste a folder or file in the briefcase 1243. ActPasBrf Paste a folder or file in the briefcase
1245. ActRemTreBrf Remove a folder no empty of the briefcase 1244. ActRemTreBrf Remove a folder no empty of the briefcase
1246. ActFrmCreBrf Form to crear a folder or file in the briefcase 1245. ActFrmCreBrf Form to crear a folder or file in the briefcase
1247. ActCreFolBrf Create a new folder in the briefcase 1246. ActCreFolBrf Create a new folder in the briefcase
1248. ActCreLnkBrf Create a new link in the briefcase 1247. ActCreLnkBrf Create a new link in the briefcase
1249. ActRenFolBrf Rename a folder of the briefcase 1248. ActRenFolBrf Rename a folder of the briefcase
1250. ActRcvFilBrfDZ Receive a file in the briefcase using Dropzone.js 1249. ActRcvFilBrfDZ Receive a file in the briefcase using Dropzone.js
1251. ActRcvFilBrfCla Receive a file in the briefcase using the classic way 1250. ActRcvFilBrfCla Receive a file in the briefcase using the classic way
1252. ActExpBrf Expand a folder in briefcase 1251. ActExpBrf Expand a folder in briefcase
1253. ActConBrf Contract a folder in briefcase 1252. ActConBrf Contract a folder in briefcase
1254. ActZIPBrf Compress a folder in briefcase 1253. ActZIPBrf Compress a folder in briefcase
1255. ActReqDatBrf Ask for metadata of a file in the briefcase 1254. ActReqDatBrf Ask for metadata of a file in the briefcase
1256. ActChgDatBrf Change metadata of a file in the briefcase 1255. ActChgDatBrf Change metadata of a file in the briefcase
1257. ActDowBrf Download a file in the briefcase 1256. ActDowBrf Download a file in the briefcase
1258. ActReqRemOldBrf Ask for removing old files in the briefcase 1257. ActReqRemOldBrf Ask for removing old files in the briefcase
1259. ActRemOldBrf Remove old files in the briefcase 1258. ActRemOldBrf Remove old files in the briefcase
*/ */
/* /*
@ -2896,7 +2895,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActShoEvtMyAgd */{1613,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_UnhideEvent ,NULL}, /* ActShoEvtMyAgd */{1613,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_UnhideEvent ,NULL},
/* ActPrvEvtMyAgd */{1609,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_MakeEventPrivate ,NULL}, /* ActPrvEvtMyAgd */{1609,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_MakeEventPrivate ,NULL},
/* ActPubEvtMyAgd */{1610,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_MakeEventPublic ,NULL}, /* ActPubEvtMyAgd */{1610,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_MakeEventPublic ,NULL},
/* ActSeeMyPubAgd */{1617,-1,TabUnk,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyPublicAgenda ,NULL},
/* ActPrnAgdQR */{1618,-1,TabUnk,ActSeeMyAgd ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,Agd_PrintAgdQRCode ,NULL}, /* ActPrnAgdQR */{1618,-1,TabUnk,ActSeeMyAgd ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,Agd_PrintAgdQRCode ,NULL},
/* ActChkUsrAcc */{1584,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_CheckIfEmptyAccountExists ,NULL}, /* ActChkUsrAcc */{1584,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_CheckIfEmptyAccountExists ,NULL},
@ -4602,7 +4600,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un
ActFrmLogInUsrAgd, // #1614 ActFrmLogInUsrAgd, // #1614
ActLogInUsrAgd, // #1615 ActLogInUsrAgd, // #1615
ActLogInUsrAgdLan, // #1616 ActLogInUsrAgdLan, // #1616
ActSeeMyPubAgd, // #1617 -1, // #1617 (obsolete action)
ActPrnAgdQR, // #1618 ActPrnAgdQR, // #1618
ActReqRemExaAnn, // #1619 ActReqRemExaAnn, // #1619
ActHidExaAnn, // #1620 ActHidExaAnn, // #1620

141
swad_action.h
View File

@ -57,7 +57,7 @@ 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 + 172 + 36 + 31 + 97) #define Act_NUM_ACTIONS (1 + 9 + 54 + 17 + 47 + 27 + 24 + 115 + 54 + 416 + 159 + 172 + 36 + 31 + 96)
#define Act_MAX_ACTION_COD 1636 #define Act_MAX_ACTION_COD 1636
@ -1428,87 +1428,86 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
#define ActShoEvtMyAgd (ActSeeMyUsgRep + 25) #define ActShoEvtMyAgd (ActSeeMyUsgRep + 25)
#define ActPrvEvtMyAgd (ActSeeMyUsgRep + 26) #define ActPrvEvtMyAgd (ActSeeMyUsgRep + 26)
#define ActPubEvtMyAgd (ActSeeMyUsgRep + 27) #define ActPubEvtMyAgd (ActSeeMyUsgRep + 27)
#define ActSeeMyPubAgd (ActSeeMyUsgRep + 28) #define ActPrnAgdQR (ActSeeMyUsgRep + 28)
#define ActPrnAgdQR (ActSeeMyUsgRep + 29)
#define ActChkUsrAcc (ActSeeMyUsgRep + 30) #define ActChkUsrAcc (ActSeeMyUsgRep + 29)
#define ActCreUsrAcc (ActSeeMyUsgRep + 31) #define ActCreUsrAcc (ActSeeMyUsgRep + 30)
#define ActRemID_Me (ActSeeMyUsgRep + 32) #define ActRemID_Me (ActSeeMyUsgRep + 31)
#define ActNewIDMe (ActSeeMyUsgRep + 33) #define ActNewIDMe (ActSeeMyUsgRep + 32)
#define ActRemOldNic (ActSeeMyUsgRep + 34) #define ActRemOldNic (ActSeeMyUsgRep + 33)
#define ActChgNic (ActSeeMyUsgRep + 35) #define ActChgNic (ActSeeMyUsgRep + 34)
#define ActRemMaiMe (ActSeeMyUsgRep + 36) #define ActRemMaiMe (ActSeeMyUsgRep + 35)
#define ActNewMaiMe (ActSeeMyUsgRep + 37) #define ActNewMaiMe (ActSeeMyUsgRep + 36)
#define ActCnfMai (ActSeeMyUsgRep + 38) #define ActCnfMai (ActSeeMyUsgRep + 37)
#define ActFrmChgMyPwd (ActSeeMyUsgRep + 39) #define ActFrmChgMyPwd (ActSeeMyUsgRep + 38)
#define ActChgPwd (ActSeeMyUsgRep + 40) #define ActChgPwd (ActSeeMyUsgRep + 39)
#define ActReqRemMyAcc (ActSeeMyUsgRep + 41) #define ActReqRemMyAcc (ActSeeMyUsgRep + 40)
#define ActRemMyAcc (ActSeeMyUsgRep + 42) #define ActRemMyAcc (ActSeeMyUsgRep + 41)
#define ActChgMyData (ActSeeMyUsgRep + 43) #define ActChgMyData (ActSeeMyUsgRep + 42)
#define ActReqMyPho (ActSeeMyUsgRep + 44) #define ActReqMyPho (ActSeeMyUsgRep + 43)
#define ActDetMyPho (ActSeeMyUsgRep + 45) #define ActDetMyPho (ActSeeMyUsgRep + 44)
#define ActUpdMyPho (ActSeeMyUsgRep + 46) #define ActUpdMyPho (ActSeeMyUsgRep + 45)
#define ActReqRemMyPho (ActSeeMyUsgRep + 47) #define ActReqRemMyPho (ActSeeMyUsgRep + 46)
#define ActRemMyPho (ActSeeMyUsgRep + 48) #define ActRemMyPho (ActSeeMyUsgRep + 47)
#define ActEdiPri (ActSeeMyUsgRep + 49) #define ActEdiPri (ActSeeMyUsgRep + 48)
#define ActChgPriPho (ActSeeMyUsgRep + 50) #define ActChgPriPho (ActSeeMyUsgRep + 49)
#define ActChgPriPrf (ActSeeMyUsgRep + 51) #define ActChgPriPrf (ActSeeMyUsgRep + 50)
#define ActReqEdiMyIns (ActSeeMyUsgRep + 52) #define ActReqEdiMyIns (ActSeeMyUsgRep + 51)
#define ActChgCtyMyIns (ActSeeMyUsgRep + 53) #define ActChgCtyMyIns (ActSeeMyUsgRep + 52)
#define ActChgMyIns (ActSeeMyUsgRep + 54) #define ActChgMyIns (ActSeeMyUsgRep + 53)
#define ActChgMyCtr (ActSeeMyUsgRep + 55) #define ActChgMyCtr (ActSeeMyUsgRep + 54)
#define ActChgMyDpt (ActSeeMyUsgRep + 56) #define ActChgMyDpt (ActSeeMyUsgRep + 55)
#define ActChgMyOff (ActSeeMyUsgRep + 57) #define ActChgMyOff (ActSeeMyUsgRep + 56)
#define ActChgMyOffPho (ActSeeMyUsgRep + 58) #define ActChgMyOffPho (ActSeeMyUsgRep + 57)
#define ActReqEdiMyNet (ActSeeMyUsgRep + 59) #define ActReqEdiMyNet (ActSeeMyUsgRep + 58)
#define ActChgMyNet (ActSeeMyUsgRep + 60) #define ActChgMyNet (ActSeeMyUsgRep + 59)
#define ActChgThe (ActSeeMyUsgRep + 61) #define ActChgThe (ActSeeMyUsgRep + 60)
#define ActReqChgLan (ActSeeMyUsgRep + 62) #define ActReqChgLan (ActSeeMyUsgRep + 61)
#define ActChgLan (ActSeeMyUsgRep + 63) #define ActChgLan (ActSeeMyUsgRep + 62)
#define ActChg1stDay (ActSeeMyUsgRep + 64) #define ActChg1stDay (ActSeeMyUsgRep + 63)
#define ActChgCol (ActSeeMyUsgRep + 65) #define ActChgCol (ActSeeMyUsgRep + 64)
#define ActHidLftCol (ActSeeMyUsgRep + 66) #define ActHidLftCol (ActSeeMyUsgRep + 65)
#define ActHidRgtCol (ActSeeMyUsgRep + 67) #define ActHidRgtCol (ActSeeMyUsgRep + 66)
#define ActShoLftCol (ActSeeMyUsgRep + 68) #define ActShoLftCol (ActSeeMyUsgRep + 67)
#define ActShoRgtCol (ActSeeMyUsgRep + 69) #define ActShoRgtCol (ActSeeMyUsgRep + 68)
#define ActChgIco (ActSeeMyUsgRep + 70) #define ActChgIco (ActSeeMyUsgRep + 69)
#define ActChgMnu (ActSeeMyUsgRep + 71) #define ActChgMnu (ActSeeMyUsgRep + 70)
#define ActChgNtfPrf (ActSeeMyUsgRep + 72) #define ActChgNtfPrf (ActSeeMyUsgRep + 71)
#define ActPrnUsrQR (ActSeeMyUsgRep + 73) #define ActPrnUsrQR (ActSeeMyUsgRep + 72)
#define ActPrnMyTT (ActSeeMyUsgRep + 74) #define ActPrnMyTT (ActSeeMyUsgRep + 73)
#define ActEdiTut (ActSeeMyUsgRep + 75) #define ActEdiTut (ActSeeMyUsgRep + 74)
#define ActChgTut (ActSeeMyUsgRep + 76) #define ActChgTut (ActSeeMyUsgRep + 75)
#define ActChgMyTT1stDay (ActSeeMyUsgRep + 77) #define ActChgMyTT1stDay (ActSeeMyUsgRep + 76)
#define ActReqRemFilBrf (ActSeeMyUsgRep + 78) #define ActReqRemFilBrf (ActSeeMyUsgRep + 77)
#define ActRemFilBrf (ActSeeMyUsgRep + 79) #define ActRemFilBrf (ActSeeMyUsgRep + 78)
#define ActRemFolBrf (ActSeeMyUsgRep + 80) #define ActRemFolBrf (ActSeeMyUsgRep + 79)
#define ActCopBrf (ActSeeMyUsgRep + 81) #define ActCopBrf (ActSeeMyUsgRep + 80)
#define ActPasBrf (ActSeeMyUsgRep + 82) #define ActPasBrf (ActSeeMyUsgRep + 81)
#define ActRemTreBrf (ActSeeMyUsgRep + 83) #define ActRemTreBrf (ActSeeMyUsgRep + 82)
#define ActFrmCreBrf (ActSeeMyUsgRep + 84) #define ActFrmCreBrf (ActSeeMyUsgRep + 83)
#define ActCreFolBrf (ActSeeMyUsgRep + 85) #define ActCreFolBrf (ActSeeMyUsgRep + 84)
#define ActCreLnkBrf (ActSeeMyUsgRep + 86) #define ActCreLnkBrf (ActSeeMyUsgRep + 85)
#define ActRenFolBrf (ActSeeMyUsgRep + 87) #define ActRenFolBrf (ActSeeMyUsgRep + 86)
#define ActRcvFilBrfDZ (ActSeeMyUsgRep + 88) #define ActRcvFilBrfDZ (ActSeeMyUsgRep + 87)
#define ActRcvFilBrfCla (ActSeeMyUsgRep + 89) #define ActRcvFilBrfCla (ActSeeMyUsgRep + 88)
#define ActExpBrf (ActSeeMyUsgRep + 90) #define ActExpBrf (ActSeeMyUsgRep + 89)
#define ActConBrf (ActSeeMyUsgRep + 91) #define ActConBrf (ActSeeMyUsgRep + 90)
#define ActZIPBrf (ActSeeMyUsgRep + 92) #define ActZIPBrf (ActSeeMyUsgRep + 91)
#define ActReqDatBrf (ActSeeMyUsgRep + 93) #define ActReqDatBrf (ActSeeMyUsgRep + 92)
#define ActChgDatBrf (ActSeeMyUsgRep + 94) #define ActChgDatBrf (ActSeeMyUsgRep + 93)
#define ActDowBrf (ActSeeMyUsgRep + 95) #define ActDowBrf (ActSeeMyUsgRep + 94)
#define ActReqRemOldBrf (ActSeeMyUsgRep + 96) #define ActReqRemOldBrf (ActSeeMyUsgRep + 95)
#define ActRemOldBrf (ActSeeMyUsgRep + 97) #define ActRemOldBrf (ActSeeMyUsgRep + 96)
/*****************************************************************************/ /*****************************************************************************/
/******************************** Public types *******************************/ /******************************** Public types *******************************/

135
swad_agenda.c
View File

@ -60,15 +60,13 @@ static const char *ParamHiddenVisiblName = "HiddenVisibl";
/******************************* Private types *******************************/ /******************************* Private types *******************************/
/*****************************************************************************/ /*****************************************************************************/
#define Agd_NUM_AGENDA_TYPES 6 #define Agd_NUM_AGENDA_TYPES 4
typedef enum typedef enum
{ {
Agd_MY_FULL_AGENDA_TODAY, Agd_MY_AGENDA_TODAY,
Agd_MY_FULL_AGENDA, Agd_MY_AGENDA,
Agd_MY_PUBLIC_AGENDA_TODAY, Agd_ANOTHER_AGENDA_TODAY,
Agd_MY_PUBLIC_AGENDA, Agd_ANOTHER_AGENDA,
Agd_OTHER_PUBLIC_AGENDA_TODAY,
Agd_OTHER_PUBLIC_AGENDA,
} Agd_AgendaType_t; } Agd_AgendaType_t;
/*****************************************************************************/ /*****************************************************************************/
@ -96,7 +94,6 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType);
static void Agd_PutIconsMyFullAgenda (void); static void Agd_PutIconsMyFullAgenda (void);
static void Agd_PutIconsMyPublicAgenda (void); static void Agd_PutIconsMyPublicAgenda (void);
static void Agd_PutIconToViewMyPublicAgenda (void);
static void Agd_PutIconToCreateNewEvent (void); static void Agd_PutIconToCreateNewEvent (void);
static void Agd_PutIconToViewEditMyFullAgenda (void); static void Agd_PutIconToViewEditMyFullAgenda (void);
static void Agd_PutIconToShowQR (void); static void Agd_PutIconToShowQR (void);
@ -147,7 +144,7 @@ void Agd_ShowMyAgenda (void)
extern const char *Txt_My_agenda; extern const char *Txt_My_agenda;
/***** Get parameters *****/ /***** Get parameters *****/
Agd_GetParams (Agd_MY_FULL_AGENDA); Agd_GetParams (Agd_MY_AGENDA);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_My_agenda, Lay_StartRoundFrame ("100%",Txt_My_agenda,
@ -159,10 +156,10 @@ void Agd_ShowMyAgenda (void)
Agd_ShowFormToSelHiddenVisiblEvents (); Agd_ShowFormToSelHiddenVisiblEvents ();
/***** Show the current events in the user's agenda *****/ /***** Show the current events in the user's agenda *****/
Agd_ShowEventsToday (Agd_MY_FULL_AGENDA_TODAY); Agd_ShowEventsToday (Agd_MY_AGENDA_TODAY);
/***** Show all my events *****/ /***** Show all my events *****/
Agd_ShowEvents (Agd_MY_FULL_AGENDA); Agd_ShowEvents (Agd_MY_AGENDA);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -350,30 +347,6 @@ static void Agd_GetParamsHiddenVisiblEvents (void)
Agd_DEFAULT_VISIBL_EVENTS); Agd_DEFAULT_VISIBL_EVENTS);
} }
/*****************************************************************************/
/*************************** Show my public agenda ***************************/
/*****************************************************************************/
void Agd_ShowMyPublicAgenda (void)
{
extern const char *Hlp_PROFILE_Agenda;
extern const char *Txt_Public_agenda_USER;
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Me.UsrDat.FullName);
Lay_StartRoundFrame ("100%",Gbl.Title,
Agd_PutIconsMyPublicAgenda,Hlp_PROFILE_Agenda);
/***** Show the current events in the user's agenda *****/
Agd_ShowEventsToday (Agd_MY_PUBLIC_AGENDA_TODAY);
/***** Show all my events *****/
Agd_ShowEvents (Agd_MY_PUBLIC_AGENDA);
/***** End frame *****/
Lay_EndRoundFrame ();
}
/*****************************************************************************/ /*****************************************************************************/
/************************ Show another user's agenda *************************/ /************************ Show another user's agenda *************************/
/*****************************************************************************/ /*****************************************************************************/
@ -401,10 +374,10 @@ void Agd_ShowUsrAgenda (void)
Hlp_PROFILE_Agenda_public_agenda); Hlp_PROFILE_Agenda_public_agenda);
/***** Show the current events in the user's agenda *****/ /***** Show the current events in the user's agenda *****/
Agd_ShowEventsToday (Agd_OTHER_PUBLIC_AGENDA_TODAY); Agd_ShowEventsToday (Agd_ANOTHER_AGENDA_TODAY);
/***** Show all the visible events in the user's agenda *****/ /***** Show all the visible events in the user's agenda *****/
Agd_ShowEvents (Agd_OTHER_PUBLIC_AGENDA); Agd_ShowEvents (Agd_ANOTHER_AGENDA);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -444,10 +417,10 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
Hlp_PROFILE_Agenda_public_agenda); Hlp_PROFILE_Agenda_public_agenda);
/***** Show the current events in the user's agenda *****/ /***** Show the current events in the user's agenda *****/
Agd_ShowEventsToday (Agd_OTHER_PUBLIC_AGENDA_TODAY); Agd_ShowEventsToday (Agd_ANOTHER_AGENDA_TODAY);
/***** Show all the visible events in the user's agenda *****/ /***** Show all the visible events in the user's agenda *****/
Agd_ShowEvents (Agd_OTHER_PUBLIC_AGENDA); Agd_ShowEvents (Agd_ANOTHER_AGENDA);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -476,12 +449,10 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
unsigned NumEvent; unsigned NumEvent;
Pag_WhatPaginate_t WhatPaginate[Agd_NUM_AGENDA_TYPES] = Pag_WhatPaginate_t WhatPaginate[Agd_NUM_AGENDA_TYPES] =
{ {
Pag_MY_FULL_AGENDA, // Agd_MY_FULL_AGENDA_TODAY, not used Pag_MY_AGENDA, // Agd_MY_AGENDA_TODAY, not used
Pag_MY_FULL_AGENDA, // Agd_MY_FULL_AGENDA Pag_MY_AGENDA, // Agd_MY_AGENDA
Pag_MY_PUBLIC_AGENDA, // Agd_MY_PUBLIC_AGENDA_TODAY, not used Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA_TODAY, not used
Pag_MY_PUBLIC_AGENDA, // Agd_MY_PUBLIC_AGENDA Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA
Pag_OTHER_PUBLIC_AGENDA, // Agd_OTHER_PUBLIC_AGENDA_TODAY, not used
Pag_OTHER_PUBLIC_AGENDA, // Agd_OTHER_PUBLIC_AGENDA
}; };
/***** Get parameters *****/ /***** Get parameters *****/
@ -525,7 +496,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
Pag_WriteLinksToPagesCentered (WhatPaginate[AgendaType],0,&Pagination); Pag_WriteLinksToPagesCentered (WhatPaginate[AgendaType],0,&Pagination);
/***** Button to create a new event *****/ /***** Button to create a new event *****/
if (AgendaType == Agd_MY_FULL_AGENDA) if (AgendaType == Agd_MY_AGENDA)
Agd_PutButtonToCreateNewEvent (); Agd_PutButtonToCreateNewEvent ();
/***** Free list of events *****/ /***** Free list of events *****/
@ -557,14 +528,13 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
/***** Start frame *****/ /***** Start frame *****/
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_FULL_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
case Agd_MY_PUBLIC_AGENDA_TODAY:
Lay_StartRoundFrameTableShadow (NULL,Txt_Today, Lay_StartRoundFrameTableShadow (NULL,Txt_Today,
NULL, NULL,
Hlp_PROFILE_Agenda, Hlp_PROFILE_Agenda,
2); 2);
break; break;
case Agd_OTHER_PUBLIC_AGENDA_TODAY: case Agd_ANOTHER_AGENDA_TODAY:
Lay_StartRoundFrameTableShadow (NULL,Txt_Today, Lay_StartRoundFrameTableShadow (NULL,Txt_Today,
NULL, NULL,
Hlp_PROFILE_Agenda_public_agenda, Hlp_PROFILE_Agenda_public_agenda,
@ -612,16 +582,12 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType)
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"); fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_FULL_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
case Agd_MY_FULL_AGENDA: case Agd_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
break; break;
case Agd_MY_PUBLIC_AGENDA_TODAY: case Agd_ANOTHER_AGENDA_TODAY:
case Agd_MY_PUBLIC_AGENDA: case Agd_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
break;
case Agd_OTHER_PUBLIC_AGENDA_TODAY:
case Agd_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Usr_PutParamOtherUsrCodEncrypted (); Usr_PutParamOtherUsrCodEncrypted ();
break; break;
@ -655,9 +621,6 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType)
static void Agd_PutIconsMyFullAgenda (void) static void Agd_PutIconsMyFullAgenda (void)
{ {
/***** Put icon to create a new event *****/
Agd_PutIconToViewMyPublicAgenda ();
/***** Put icon to create a new event *****/ /***** Put icon to create a new event *****/
Agd_PutIconToCreateNewEvent (); Agd_PutIconToCreateNewEvent ();
@ -674,18 +637,6 @@ static void Agd_PutIconsMyPublicAgenda (void)
Agd_PutIconToShowQR (); Agd_PutIconToShowQR ();
} }
static void Agd_PutIconToViewMyPublicAgenda (void)
{
extern const char *Txt_Public_agenda_USER;
/***** Put form to view my public agenda *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Me.UsrDat.FullName);
Lay_PutContextualLink (ActSeeMyPubAgd,NULL,
"eye-on64x64.png",
Gbl.Title,NULL,
NULL);
}
static void Agd_PutIconToCreateNewEvent (void) static void Agd_PutIconToCreateNewEvent (void)
{ {
extern const char *Txt_New_event; extern const char *Txt_New_event;
@ -789,14 +740,12 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
AgdEvent.AgdCod = AgdCod; AgdEvent.AgdCod = AgdCod;
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_FULL_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
case Agd_MY_FULL_AGENDA: case Agd_MY_AGENDA:
case Agd_MY_PUBLIC_AGENDA_TODAY:
case Agd_MY_PUBLIC_AGENDA:
AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod; AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
break; break;
case Agd_OTHER_PUBLIC_AGENDA_TODAY: case Agd_ANOTHER_AGENDA_TODAY:
case Agd_OTHER_PUBLIC_AGENDA: case Agd_ANOTHER_AGENDA:
AgdEvent.UsrCod = Gbl.Usrs.Other.UsrDat.UsrCod; AgdEvent.UsrCod = Gbl.Usrs.Other.UsrDat.UsrCod;
break; break;
} }
@ -861,8 +810,8 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
/* Forms to remove/edit this event */ /* Forms to remove/edit this event */
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_FULL_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
case Agd_MY_FULL_AGENDA: case Agd_MY_AGENDA:
Agd_PutFormsToRemEditOneEvent (&AgdEvent); Agd_PutFormsToRemEditOneEvent (&AgdEvent);
break; break;
default: default:
@ -995,15 +944,13 @@ static void Agd_GetParams (Agd_AgendaType_t AgendaType)
{ {
Pag_WhatPaginate_t WhatPaginate[Agd_NUM_AGENDA_TYPES] = Pag_WhatPaginate_t WhatPaginate[Agd_NUM_AGENDA_TYPES] =
{ {
Pag_MY_FULL_AGENDA, // Agd_MY_FULL_AGENDA_TODAY, not used Pag_MY_AGENDA, // Agd_MY_AGENDA_TODAY, not used
Pag_MY_FULL_AGENDA, // Agd_MY_FULL_AGENDA Pag_MY_AGENDA, // Agd_MY_AGENDA
Pag_MY_PUBLIC_AGENDA, // Agd_MY_PUBLIC_AGENDA_TODAY, not used Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA_TODAY, not used
Pag_MY_PUBLIC_AGENDA, // Agd_MY_PUBLIC_AGENDA Pag_ANOTHER_AGENDA, // Agd_ANOTHER_AGENDA
Pag_OTHER_PUBLIC_AGENDA, // Agd_OTHER_PUBLIC_AGENDA_TODAY, not used
Pag_OTHER_PUBLIC_AGENDA, // Agd_OTHER_PUBLIC_AGENDA
}; };
if (AgendaType == Agd_MY_FULL_AGENDA) if (AgendaType == Agd_MY_AGENDA)
{ {
Agd_GetParamsPast__FutureEvents (); Agd_GetParamsPast__FutureEvents ();
Agd_GetParamsPrivatPublicEvents (); Agd_GetParamsPrivatPublicEvents ();
@ -1076,7 +1023,7 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
} }
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_FULL_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld'" " WHERE UsrCod='%ld'"
" AND DATE(StartTime)<=CURDATE()" " AND DATE(StartTime)<=CURDATE()"
@ -1084,12 +1031,13 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
" ORDER BY %s", " ORDER BY %s",
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery); Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery);
break; break;
case Agd_MY_FULL_AGENDA: case Agd_MY_AGENDA:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld'" " WHERE UsrCod='%ld'"
" ORDER BY %s", " ORDER BY %s",
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery); Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery);
break; break;
/*
case Agd_MY_PUBLIC_AGENDA_TODAY: case Agd_MY_PUBLIC_AGENDA_TODAY:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'" " WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'"
@ -1105,7 +1053,8 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
" ORDER BY %s", " ORDER BY %s",
Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery); Gbl.Usrs.Me.UsrDat.UsrCod,OrderBySubQuery);
break; break;
case Agd_OTHER_PUBLIC_AGENDA_TODAY: */
case Agd_ANOTHER_AGENDA_TODAY:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'" " WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'"
" AND DATE(StartTime)<=CURDATE()" " AND DATE(StartTime)<=CURDATE()"
@ -1113,7 +1062,7 @@ static void Agd_GetListEvents (Agd_AgendaType_t AgendaType)
" ORDER BY %s", " ORDER BY %s",
Gbl.Usrs.Other.UsrDat.UsrCod,OrderBySubQuery); Gbl.Usrs.Other.UsrDat.UsrCod,OrderBySubQuery);
break; break;
case Agd_OTHER_PUBLIC_AGENDA: case Agd_ANOTHER_AGENDA:
sprintf (Query,"SELECT AgdCod FROM agendas" sprintf (Query,"SELECT AgdCod FROM agendas"
" WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'" " WHERE UsrCod='%ld' AND Public='Y' AND Hidden='N'"
" AND DATE(EndTime)>=CURDATE()" // Only today and future events " AND DATE(EndTime)>=CURDATE()" // Only today and future events
@ -1306,7 +1255,7 @@ void Agd_AskRemEvent (void)
struct AgendaEvent AgdEvent; struct AgendaEvent AgdEvent;
/***** Get parameters *****/ /***** Get parameters *****/
Agd_GetParams (Agd_MY_FULL_AGENDA); Agd_GetParams (Agd_MY_AGENDA);
/***** Get event code *****/ /***** Get event code *****/
if ((AgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L) if ((AgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L)
@ -1515,7 +1464,7 @@ void Agd_RequestCreatOrEditEvent (void)
char Txt[Cns_MAX_BYTES_TEXT + 1]; char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get parameters *****/ /***** Get parameters *****/
Agd_GetParams (Agd_MY_FULL_AGENDA); Agd_GetParams (Agd_MY_AGENDA);
/***** Get the code of the event *****/ /***** Get the code of the event *****/
ItsANewEvent = ((AgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L); ItsANewEvent = ((AgdEvent.AgdCod = Agd_GetParamAgdCod ()) == -1L);

1
swad_agenda.h
View File

@ -99,7 +99,6 @@ void Agd_PutFormLogInToShowUsrAgenda (void);
void Agd_PutParamAgd (void); void Agd_PutParamAgd (void);
void Agd_ShowMyAgenda (void); void Agd_ShowMyAgenda (void);
void Agd_ShowMyPublicAgenda (void);
void Agd_ShowUsrAgenda (void); void Agd_ShowUsrAgenda (void);
void Agd_ShowOtherAgendaAfterLogIn (void); void Agd_ShowOtherAgendaAfterLogIn (void);

6
swad_changelog.h
View File

@ -210,13 +210,17 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.159 (2017-03-21)" #define Log_PLATFORM_VERSION "SWAD 16.160 (2017-03-21)"
#define CSS_FILE "swad16.157.css" #define CSS_FILE "swad16.157.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.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.160: Mar 21, 2017 Changes in agenda. Not finished. (217413 lines)
1 change necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod='1617';
Version 16.159: Mar 21, 2017 Changes in agenda. Not finished. (217511 lines) Version 16.159: Mar 21, 2017 Changes in agenda. Not finished. (217511 lines)
Version 16.158.1: Mar 21, 2017 Changes in agenda. Not finished. (217395 lines) Version 16.158.1: Mar 21, 2017 Changes in agenda. Not finished. (217395 lines)
Version 16.158: Mar 21, 2017 Changes in agenda. Not finished. Version 16.158: Mar 21, 2017 Changes in agenda. Not finished.

78
swad_pagination.c
View File

@ -164,7 +164,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrder (); Asg_PutHiddenParamAsgOrder ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
break; break;
case Pag_MY_FULL_AGENDA: case Pag_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents, Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.PrivatPublicEvents,
@ -173,16 +173,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
-1L, -1L,
1); 1);
break; break;
case Pag_MY_PUBLIC_AGENDA: case Pag_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents,
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.SelectedOrder,
-1L,
1);
break;
case Pag_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Agd_PutHiddenParamEventsOrder (); Agd_PutHiddenParamEventsOrder ();
Pag_PutHiddenParamPagNum (1); Pag_PutHiddenParamPagNum (1);
@ -265,7 +256,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrder (); Asg_PutHiddenParamAsgOrder ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
break; break;
case Pag_MY_FULL_AGENDA: case Pag_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents, Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.PrivatPublicEvents,
@ -274,16 +265,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
-1L, -1L,
1); 1);
break; break;
case Pag_MY_PUBLIC_AGENDA: case Pag_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents,
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.SelectedOrder,
-1L,
1);
break;
case Pag_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Agd_PutHiddenParamEventsOrder (); Agd_PutHiddenParamEventsOrder ();
Pag_PutHiddenParamPagNum (1); Pag_PutHiddenParamPagNum (1);
@ -349,7 +331,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrder (); Asg_PutHiddenParamAsgOrder ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
break; break;
case Pag_MY_FULL_AGENDA: case Pag_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents, Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.PrivatPublicEvents,
@ -358,16 +340,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
-1L, -1L,
Pagination->LeftPage); Pagination->LeftPage);
break; break;
case Pag_MY_PUBLIC_AGENDA: case Pag_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents,
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.SelectedOrder,
-1L,
Pagination->LeftPage);
break;
case Pag_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Agd_PutHiddenParamEventsOrder (); Agd_PutHiddenParamEventsOrder ();
Pag_PutHiddenParamPagNum (Pagination->LeftPage); Pag_PutHiddenParamPagNum (Pagination->LeftPage);
@ -440,7 +413,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrder (); Asg_PutHiddenParamAsgOrder ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
break; break;
case Pag_MY_FULL_AGENDA: case Pag_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents, Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.PrivatPublicEvents,
@ -449,16 +422,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
-1L, -1L,
NumPage); NumPage);
break; break;
case Pag_MY_PUBLIC_AGENDA: case Pag_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents,
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.SelectedOrder,
-1L,
NumPage);
break;
case Pag_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Agd_PutHiddenParamEventsOrder (); Agd_PutHiddenParamEventsOrder ();
Pag_PutHiddenParamPagNum (NumPage); Pag_PutHiddenParamPagNum (NumPage);
@ -527,7 +491,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrder (); Asg_PutHiddenParamAsgOrder ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
break; break;
case Pag_MY_FULL_AGENDA: case Pag_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents, Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.PrivatPublicEvents,
@ -536,16 +500,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
-1L, -1L,
Pagination->RightPage); Pagination->RightPage);
break; break;
case Pag_MY_PUBLIC_AGENDA: case Pag_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents,
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.SelectedOrder,
-1L,
Pagination->RightPage);
break;
case Pag_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Agd_PutHiddenParamEventsOrder (); Agd_PutHiddenParamEventsOrder ();
Pag_PutHiddenParamPagNum (Pagination->RightPage); Pag_PutHiddenParamPagNum (Pagination->RightPage);
@ -611,7 +566,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
Asg_PutHiddenParamAsgOrder (); Asg_PutHiddenParamAsgOrder ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
break; break;
case Pag_MY_FULL_AGENDA: case Pag_MY_AGENDA:
Act_FormStart (ActSeeMyAgd); Act_FormStart (ActSeeMyAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents, Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.PrivatPublicEvents,
@ -620,16 +575,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P
-1L, -1L,
Pagination->NumPags); Pagination->NumPags);
break; break;
case Pag_MY_PUBLIC_AGENDA: case Pag_ANOTHER_AGENDA:
Act_FormStart (ActSeeMyPubAgd);
Agd_PutParams (Gbl.Agenda.Past__FutureEvents,
Gbl.Agenda.PrivatPublicEvents,
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.SelectedOrder,
-1L,
Pagination->NumPags);
break;
case Pag_OTHER_PUBLIC_AGENDA:
Act_FormStart (ActSeeUsrAgd); Act_FormStart (ActSeeUsrAgd);
Agd_PutHiddenParamEventsOrder (); Agd_PutHiddenParamEventsOrder ();
Pag_PutHiddenParamPagNum (Pagination->NumPags); Pag_PutHiddenParamPagNum (Pagination->NumPags);

5
swad_pagination.h
View File

@ -46,9 +46,8 @@ typedef enum
Pag_THREADS_FORUM, Pag_THREADS_FORUM,
Pag_POSTS_FORUM, Pag_POSTS_FORUM,
Pag_SURVEYS, Pag_SURVEYS,
Pag_MY_FULL_AGENDA, Pag_MY_AGENDA,
Pag_MY_PUBLIC_AGENDA, Pag_ANOTHER_AGENDA,
Pag_OTHER_PUBLIC_AGENDA,
} Pag_WhatPaginate_t; } Pag_WhatPaginate_t;
struct Pagination // Used for threads and messages pagination struct Pagination // Used for threads and messages pagination