From 7f3c6222d66b2f24eebed9c6566bd35e60b3b820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Tue, 21 Mar 2017 01:35:36 +0100
Subject: [PATCH] Version 16.158.1

---
 icon/future64x64.png | Bin 0 -> 1359 bytes
 icon/past64x64.png   | Bin 0 -> 1360 bytes
 swad_agenda.c        |  20 ++++++++++----------
 swad_changelog.h     |   5 +++--
 swad_global.c        |   2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 icon/future64x64.png
 create mode 100644 icon/past64x64.png

diff --git a/icon/future64x64.png b/icon/future64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..b41c8c359da253fe4b2991ac80a355dd335fc694
GIT binary patch
literal 1359
zcmV-V1+e;wP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00009a7bBm000*f
z000*f0cW4mQUCx20ZBwbRA}Dqm|tuZMI6UJv%5X6e}VGHV1f35t1&7MM1^9EM`+7K
zuRvk}Nkkz;WAx3K7>$GoMk78M^~DGKpos!aKvGBmfsHhxArXRv#1=@Ys8vgo0(Z6a
zcE<-wxxJgcon2bwfqA*xop0v%o!{>}v)>uG-|p?!T=3?ZqWGqec(DAt*7G$3qVZAj
zzMFCY6XR6&b<st(h5ZWr8g_F{iC@7%-zcU(fwRCvFLA)BmjFoIIbtIft;fD{U*lu}
z{v5EN052<+9^30~<aAg9YdA-$b+ldP=cr*QbD`^`8o%mByUZW4VI*^*>$LAQ4Zn`v
zK;}g`rLgD5s+L(k_!o#3_GDM59w0mcSU%OA1t79Ut1WC1TPXSg<c!P=AN))e-mOkg
zk3^uR)G7rq{;28$nA>mm0+{j2xC%cvZp8tNKdXKNnERJ`sTe+xfRys4ns5ccs3DCp
zbx9T8&BqHVf)~1nz+0ZKd1;*7=kd{`l~D~<ml3XK0^`iAbng3g{`<fOY?#@<!`<iz
zfFFD~JGFz|NyYo)K6AT`HxWn5U)gycwzDNa18afQyvrv?H#x$uB<j=`0&n8nLh59f
z51nm%n(^>C1a<+#TV<VMKrxnmfzTpQ95=<?`fR0A1F5NQqS%b|qUZ4N$(Wo!RHGy?
zJ#NH{4e07d9t$jeGGWBa;z|O(1r|aASh@_10K6wNR`7W4?CXyw2a%T_bLZ>CcW0*;
zFB_Dacq@2Ml2e>d8G&pGWm*-8Wj|(zF5b%B$$YC&N@*zlg}@uRr4B9hXw4JH_#b?p
zC)0*s$KA?6js|Y6TeG*Sc~8&8$9<>l#9?Qt&ga;4$|qyueU++3Z}?P6qpcqMZPO&+
z25La@>Gy9f>;;}%039UnATL&sO8pKj`)RFB@9bZ^Y(PF`cSk2+D5kBk9~@%Etl@9m
z#UN+WnOsQZEJWT1vKz8X#{MSgNY>kd6hsgK8EQW;a>q+>B3T<mK?V^BlZ>M{pPRqr
zyr|~qWW621pcoMh2k<sWua&PhPkAT=XhCXgKtqH-0{bpjw3+8Tg($8CrMEN`Dbmuw
z%fPo6=Pb3(>uSLWazrv<=1nEpvfF2!ZjwNsoYt8B-kI;wLW6o=Q2Px_uLS$~DCWG$
z=6t-tRabaV#MN{r+w3#V9Gb|Tu!YpL>)SNNm7t@k<xr2FwzQXFbv(o(NjO`gEW=v>
zCDS|iDl#Yo<DO8-^vZCESm%xH5gbvmT7AcRL&g?&GbM%M7BT6)g6W~{yPhTvYk5LT
z(V@sdBiva2q4*^K%E6UWt214mYlJ~kb~lRfLRsPv`@oS=hHgJ?q8(UY{m(JyK~MNa
z_N64Y_Nh7IRt)XH%EaF%vbCP%H~5AR{v3yq{1d>+M7qPN_txI-_6zUl39V?J@JY%m
z(tDgo3TtmqfFsiQ7=1?U)x7YF?CvPGETSg_XH>WLljI4lFU{k6wVxDE*v!F!^5>18
zKn#$w&*;=%M!ld=+wv6q`dG5IZdWhpC4WLaA#}15*wqVbG;2Sho)BQ)*zfMJ$8uj!
zIGzgc-R?xSy0mbMYT(MS`!D$41>b4wx;4My%&;;82d)~w-jxfIzRKSf1l9qi+eGiA
zhaWND-E+OBkibr$^K#9i*cax=WL=h7lpLvg_;44zp$2TbD|b|Dx!>-o_8(W^)=~Wp
Rg_i&T002ovPDHLkV1jB#pKbsE

literal 0
HcmV?d00001

diff --git a/icon/past64x64.png b/icon/past64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bae7b9063967e8dbdd7124f33503ac4ddf135b3
GIT binary patch
literal 1360
zcmV-W1+V&vP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00009a7bBm000*f
z000*f0cW4mQUCx20!c(cRA}DqSzAmTRT%!x%mB-^LW@|Tz(beB*pNuoiqUjxxje9?
zH3huHTVML1@x>^KCZv&?SYLc=;w9B4KGfnSRYFY)RVSfoYnpf|q)C^ip(|Eekp$@O
zT6X6gAAs%5>^VDUhKqgZ|3aAgGXL%SFXt?9PwsBnp7EsFBfiB&gC>5}ic?Uv9ZzW=
z(??7IDwF~C-rOiyC%)m}+i;SDpBe>w0mp<|i0H*@IEoi@t{)<AG0Rg0bieUA5B~-Z
z<ISAWLy*KTi7I;W8-R`7W{>?T16sF?L@syYk^_GMKxua>15aAE{2qy9;_sL!lu$)#
z59e`i{1xz1P(Hsq^C`=VzskqE8W1a`WdJ}XbL$Oa5M>uh0RY{wa~%&KU(eQa@#TEH
zs{zFUH2?tWwW=EcQ1XZJ7XWC1sz6r!c-15Tlth*50HEbp=KC@r9Ym5O06-TB%NS*R
zAQ%8JC8^l)j7b{soV`M0plRw^3y0RmxfLB>0y;{|+!V9^`!2r^97GR}WB2CRCv2w)
z0GJkpDb+YUr*jOL7Wim3o?XPNOgZ{M_lHy52=oAGdU|FwwW!`I)D~j*oQXnilH|UL
z3!zOw7tgu9#q<F3vV53`+ZGqc#k1PP0icg(z)U5p7O+sxb7y-MM2rSQ>$oH=2q*#m
z_Zab%f~Ay+cpoSY@T)+mK%)zG$P}#&FGv}an}%tBswcMUBZS1Z(fg(Rub$YdkAU2I
zR0c0$0INuakz`2aAy=vhDpFx20W(iTX~mlXASm?6!R&ZjCsllu*>Z&t;*o@_DgQ?V
zY>sj`pq_1P{vf{cdY=u>4w|)=z9JmQTC{jI95)Mj3m}&RRPvJ@i+}gXhTh*oA`%^8
z0MBm*zD1jd5wT(h7|`o>{5?7L%=uk4CtVL9qAFATdJpLJ7+@O!x-Ic_Yx$u3n6`yN
z@pM{At2dz6A&lVSj`T$8WxsLMq}gIuUxRZfv-m;0)IW2HfXf16K(E6uR`u$L`Pq*?
zyPwAh=rEwyBWzRuYhg$KoR`i;U0SiQB|CEu0P3Zpj{d8_c@HFXZA41;+*{OZS2jNR
z-Bn<}ml<G7vF0|f9l5trPmLBdMWNpZM4($%NG(2;%oYjjEYRe#)`G!|+ygXkc38;_
zSIRu1fAr3Ln^X!kxm*pRIheHNeqs3%M7p==)3%%bJ0Z6W%^s)vY*H4GEkngEM}BvX
zERprM6DkLBMc#ma5?QLiwi9Y{J7F`1#`L{#uz=iP^PCtal_T+)(`fQc!gPo-IWPpk
zxTuF56TmFkJ~Qo{1B8*dku<XO0hgUnlnNb2L~pQ80rSDcPn8YFrh$F<(!*Nrwi61d
zU_gg)4UHJHlzh$2bL~OMsh4lXR6GY^M9^V1!K{mg+k?PkYqJv?0E~+WS?^=a`q&A*
z=<&7N33V6|G}ugdIQR9#Yqt~fxL_u|aA4Uxp_2>hu=dqToDC&+LMs=@6rlWE_|mB<
zFKfBm4T<EXlnx_;@~+yxaUg^NpI-Znz(N!{0rZUn?Vi*xV<&XV(j|Pq?9B<0;sBww
zvDG*o-?@7xd=A7DG_i2bIm5jRUal-P4*IWkSX&}c{3nU7$)(KY?`Js%RN}-f^?h=C
z)o-ZA^Lwp745STs8^F++l817B&{j(|)Z4jVR5lDu0LS@|t~I%%>cu^|tK>glfXaQ7
S<P)y|0000<MNUMnLSTXyOnpiK

literal 0
HcmV?d00001

diff --git a/swad_agenda.c b/swad_agenda.c
index e1682200f..6ebf36a26 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -166,8 +166,8 @@ static void Agd_ShowFormToSelPastFutureEvents (void)
    Agd_PastFutureEvents_t PstFut;
    static const char *Image[2] =
      {
-      "backward64x64.png",	// Agd_PAST_EVENTS
-      "forward64x64.png",	// Agd_FUTURE_EVENTS
+      "past64x64.png",		// Agd_PAST_EVENTS
+      "future64x64.png",	// Agd_FUTURE_EVENTS
      };
 
    fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@@ -216,11 +216,11 @@ static void Agd_ShowFormToSelPrivatePublicEvents (void)
 	PrvPub++)
      {
       fprintf (Gbl.F.Out,"<div class=\"%s\">",
-	       (Gbl.Agenda.PastFutureEvents & (1 << PrvPub)) ? "PREF_ON" :
-							       "PREF_OFF");
+	       (Gbl.Agenda.PrivatePublicEvents & (1 << PrvPub)) ? "PREF_ON" :
+							          "PREF_OFF");
       Act_FormStart (ActSeeMyAgd);
-      Agd_PutHiddenParamsPastFutureEvents (1 << PrvPub);
-      Agd_PutHiddenParamsPrivatePublicEvents (Gbl.Agenda.PrivatePublicEvents);
+      Agd_PutHiddenParamsPastFutureEvents (Gbl.Agenda.PastFutureEvents);
+      Agd_PutHiddenParamsPrivatePublicEvents (1 << PrvPub);
       Agd_PutHiddenParamsHiddenVisibleEvents (Gbl.Agenda.HiddenVisibleEvents);
 
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
@@ -256,12 +256,12 @@ static void Agd_ShowFormToSelHiddenVisibleEvents (void)
 	HidVis++)
      {
       fprintf (Gbl.F.Out,"<div class=\"%s\">",
-	       (Gbl.Agenda.PastFutureEvents & (1 << HidVis)) ? "PREF_ON" :
-							       "PREF_OFF");
+	       (Gbl.Agenda.HiddenVisibleEvents & (1 << HidVis)) ? "PREF_ON" :
+							          "PREF_OFF");
       Act_FormStart (ActSeeMyAgd);
-      Agd_PutHiddenParamsPastFutureEvents (1 << HidVis);
+      Agd_PutHiddenParamsPastFutureEvents (Gbl.Agenda.PastFutureEvents);
       Agd_PutHiddenParamsPrivatePublicEvents (Gbl.Agenda.PrivatePublicEvents);
-      Agd_PutHiddenParamsHiddenVisibleEvents (Gbl.Agenda.HiddenVisibleEvents);
+      Agd_PutHiddenParamsHiddenVisibleEvents (1 << HidVis);
 
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
 			 " alt=\"%s\" title=\"%s\" class=\"ICO25x25\""
diff --git a/swad_changelog.h b/swad_changelog.h
index d21bc4433..78a19e03a 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -210,14 +210,15 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.158 (2017-03-21)"
+#define Log_PLATFORM_VERSION	"SWAD 16.158.1 (2017-03-21)"
 #define CSS_FILE		"swad16.157.css"
 #define JS_FILE			"swad16.144.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 16.158:   Mar 21, 2017	Changes in agenda. No finished.
+        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.
 					Fixed bug in user enrollment. (217394 lines)
 Copy the following icons to icon public directory:
 sudo cp -a backward64x64.png /var/www/html/swad/icon/
diff --git a/swad_global.c b/swad_global.c
index 5d59dc70a..02bf989eb 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -424,7 +424,7 @@ void Gbl_InitializeGlobals (void)
 
    /* Agenda */
    Gbl.Agenda.PastFutureEvents    = (1 << Agd_FUTURE_EVENTS);
-   Gbl.Agenda.PrivatePublicEvents = (1 << Agd_PRIVATE_EVENTS) &
+   Gbl.Agenda.PrivatePublicEvents = (1 << Agd_PRIVATE_EVENTS) |
 	                            (1 << Agd_PUBLIC_EVENTS);
    Gbl.Agenda.HiddenVisibleEvents = (1 << Agd_VISIBLE_EVENTS);
    Gbl.Agenda.SelectedOrder = Agd_ORDER_DEFAULT;