Merge branch 'master' of github.com:TheMrNomis/KiWi-calendar

10 years ago · 4e96d86cd9
--- a/databaseOperations.php
+++ b/databaseOperations.php
--- a/export.php
+++ b/export.php
@ -13,7 +13,7 @@ function icaldate($date)
    return date('Ymd',$dt).'T'. date('His',$dt). 'Z';
 }
 include_once('getEvents.php');
 include_once('databaseOperations.php');
 $db = connect();
 $events = getEventsSince($db, strtotime('last monday +'.$weekOffset.' weeks'));
--- a/index.php
+++ b/index.php
@ -1,6 +1,6 @@
 <?php
 session_start();
 include_once('getEvents.php');
 include_once('databaseOperations.php');
 $db = connect();
 $days = array(
@ -32,6 +32,8 @@ if(isset($_GET['w'])&&is_numeric($_GET['w']))
 else
    $weekOffset = 0;
 $categories = getCategories($db);
 ?>
 <!DOCTYPE html>
 <html>
--- a/makedatabase.sql
+++ b/makedatabase.sql
@ -1,7 +1,7 @@
 CREATE TABLE sous_categorie(sous_cat_id INTEGER PRIMARY KEY, sous_cat_titre VARCHAR(255));
 CREATE TABLE sous_categorie(sous_cat_id INTEGER PRIMARY KEY, sous_cat_tab INTEGER NOT NULL, sous_cat_titre VARCHAR(255) NOT NULL);
 CREATE TABLE categorie(cat_id INTEGER PRIMARY KEY, cat_titre VARCHAR(255), sous_cat_id INTEGER, FOREIGN KEY(sous_cat_id) REFERENCES sous_categorie(sous_cat_id));
 CREATE TABLE categorie(cat_id INTEGER PRIMARY KEY, cat_titre VARCHAR(255) NOT NULL, sous_cat_id INTEGER NOT NULL, FOREIGN KEY(sous_cat_id) REFERENCES sous_categorie(sous_cat_id));
 CREATE TABLE event(event_id INTEGER PRIMARY KEY, event_titre VARCHAR(255), event_localisation VARCHAR(255), event_dtstart DATETIME, event_dtend DATETIME, event_description TEXT, event_url VARCHAR(255));
 CREATE TABLE event(event_id INTEGER PRIMARY KEY, event_titre VARCHAR(255) NOT NULL, event_localisation VARCHAR(255) NOT NULL, event_dtstart DATETIME NOT NULL, event_dtend DATETIME NOT NULL, event_description TEXT NOT NULL, event_url VARCHAR(255) NULL);
 CREATE TABLE eventCategorie(event_id INTEGER, cat_id INTEGER, FOREIGN KEY(event_id) REFERENCES event(event_id), FOREIGN KEY(cat_id) REFERENCES categorie(cat_id));