From 6bb97818f467dc8bdbffbfd18a37ee65ae2e23da Mon Sep 17 00:00:00 2001 From: AmarOk Date: Thu, 31 Mar 2016 10:11:55 +0200 Subject: [PATCH 1/3] http -> https --- event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/event.php b/event.php index eaeefa8..99d7b67 100755 --- a/event.php +++ b/event.php @@ -40,7 +40,7 @@ $dtend = strtotime($event['event_dtend']); $obj = json_decode(file_get_contents($url), true); $lat = $obj[0]["lat"]; $lng = $obj[0]["lon"]; - $urlFrame = 'http://www.openstreetmap.org/export/embed.html?bbox='.$lng.','.$lat.','.$lng.','.$lat.'&layer=mapnik&floor'; + $urlFrame = 'https://www.openstreetmap.org/export/embed.html?bbox='.$lng.','.$lat.','.$lng.','.$lat.'&layer=mapnik&floor'; echo ''; @@ -62,7 +62,7 @@ $dtend = strtotime($event['event_dtend']); - + From 2c57706fab3902d7a72f68edacbc4077416f5c0a Mon Sep 17 00:00:00 2001 From: AmarOk Date: Thu, 31 Mar 2016 11:12:08 +0200 Subject: [PATCH 2/3] fix HTML --- index.php | 246 +++++++++++++++++++++++++++--------------------------- 1 file changed, 123 insertions(+), 123 deletions(-) diff --git a/index.php b/index.php index 598dbf0..8a48faf 100644 --- a/index.php +++ b/index.php @@ -8,143 +8,143 @@ $db = connect(); initCategories($db); if(isset($_GET['w'])&&is_numeric($_GET['w'])) - $weekOffset = $_GET['w']; +$weekOffset = $_GET['w']; else - $weekOffset = 0; +$weekOffset = 0; ?> - - Kiwi Calendar - - - - - - - -
- menu - logo ESIR - -
+ + Kiwi Calendar + + + + + + + +
+ menu + logo ESIR + +
- + -
- + '); - for($date = strtotime('last monday +'.$week.' weeks'); - $date < strtotime('next monday +'.$week.' weeks'); - $date = strtotime('+1 day', $date) - ) - { - $events = getEventsByDateAndCategories($db, $date, $_SESSION['categorieStatus']); + for($week = $weekOffset; $week < $weekOffset + 5; ++$week) + { + echo(' + + '); + } + echo(' + '."\n"); + } + ?> - + + + + From e1757007454b4eb3a805f91a1cb51ba1d795411c Mon Sep 17 00:00:00 2001 From: AmarOk Date: Thu, 31 Mar 2016 11:15:22 +0200 Subject: [PATCH 3/3] fix HTML --- about.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.php b/about.php index bf082ac..8867013 100644 --- a/about.php +++ b/about.php @@ -37,7 +37,7 @@

Nathalie Molines, professeur d'Innovation et Politique, pour nous avoir donné l’opportunité de concevoir ce projet ainsi que pour nous avoir conseillé tout au long de sa réalisation.
Les étudiants du groupe Innovation et Politique, pour nous avoir régulièrement donné leur avis et conseils.

- L'équipe Kiwi.

+ L'équipe Kiwi.