From bb73afc00b1a200081802faae758e53c0868dadf Mon Sep 17 00:00:00 2001
From: TheMrNomis <n0m1s@homnomnom.fr>
Date: Fri, 10 Apr 2015 10:07:42 +0200
Subject: [PATCH] updated database

---
 calendar.php  |   4 ++--
 getEvents.php |   2 +-
 testdb.db     | Bin 2048 -> 3072 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/calendar.php b/calendar.php
index ed9e9a6..a7f4a89 100644
--- a/calendar.php
+++ b/calendar.php
@@ -4,8 +4,8 @@
 #    header("Location:.");
 #    exit;
 #  }
-  header('Content-type: text/calendar; charset=utf-8');
-  header('Content-Disposition: inline; filename=kiwicalendar.ics');
+#  header('Content-type: text/calendar; charset=utf-8');
+#  header('Content-Disposition: inline; filename=kiwicalendar.ics');
   include("./getEvents.php");
 
   $icalheader = "BEGIN:VCALENDAR
diff --git a/getEvents.php b/getEvents.php
index 15f1581..7861e59 100644
--- a/getEvents.php
+++ b/getEvents.php
@@ -15,7 +15,7 @@
       echo("Impossible d'acceder à la base de donnée");
       die();
     }
-    $stmt = $pdo->prepare("SELECT * FROM events");
+    $stmt = $pdo->prepare("SELECT titre, localisation, dtstart, dtend, description FROM events, categorie WHERE events.categorie = categorie.id");
     $stmt->execute();
     $result = $stmt->fetchAll();
     return $result;
diff --git a/testdb.db b/testdb.db
index dc6b5e1940c792c3c4ee843922b55409a3214c38..046fe437539595e0c3f1799a6d059d4ee9cfedf4 100644
GIT binary patch
literal 3072
zcmeHJPiqrF6o0cbTHSWr#9G=Cq*FvlAS$)=;6+T6X$|(D+ojl(Op~b&W_RlDZ0Svk
zCqX}f7xCo!5j?s_PksRfy^DSWXH%Otfr5uZ59YxPZyxW@@BM~h-ui<jsRi9uq0cp)
z1p)}cT}lC<U=}v(P>4~`;h{%AX6{l8aQ*wVgEzoJzrp%uw!WM#1N%?$!1&}OdNHH<
zR!fLo5$Nb(x2i6yc#L|L`6WgVY(?3m^%ajTGMBEo_2r7YN$<1GGSyOtf^JmY>b;6v
zyfrshD$@qn;;{;)I1DM%mTK^pjJTF6=<#mqNb^wBnyKm4msy!MwFsKW&mwAsa;F{Z
zv4>unF08t&zPOS>D0ZrqsLK|Z%T}sv{Ro3WUMj`b!1&Y@+P~dywiD4&a97J6^NC#t
z%70|MdOC?z9JS4VnJSqp{&2R}{EyX%lR0KDyDxnP`V9Pc3}o+r%z6&^C;o~*<B#|)
zevS9Az-#ypzJUwawtiVZtS{ClE3w{KuZ(M7`V5>F1A}7(CQ&6evqa=LmkC@!HOY5)
zqylGXlt2MhWsoL5cg8Ofm_go?G)doOlgCZEx|1d$cbt3{RaHSlggSC^IRaPFx{_g<
z2s&S5&fv&V4SQmkz%268q?INO<@<3U&3|r&6MMuVFpZYEHd!T)_w4)-forH99L&b@
zSuE_~K>|~#rhKK_=bW7to0rN@lcq`3vPUlxD4}XA-l83>D1RZ#)Hd?48OuPS(SeTN
vcF6rLB_o0I=QF?b<!<^u5Pmk8!Nj=}@WKe`#tV7eix-BiF1(OKJ$T^{NlNu!

delta 312
zcmZpWXb_knEy&Ekz`z8=Fu*ub$C#g)LHCg&FHne)IgEihY_lNC3ns2cbw+k^NlC^g
z&B?zRgC-|1`SNOl)G#qCFfdPKRsgCJVXn_-VrNiwG&Xh(PRuRHNp&qt%_}i-2C_?w
z6;e_al2Q{(b23v)brgb9^YT)QjSLJ;bqx%4jZ72_&8-X!fCyR05+dZ2UzD1wkXcY%
snyXNpS)!1VpOastkeHiVqF|KE2(i!+Y+)kAMnfWOG{v+LC`8ak06`y5(*OVf