Merge branch 'hourly-routine-installation-failing' into 'develop'

Resolve "Hourly Routine Installation failing"

See merge request bluekay/shopping-list!2

install/install_action.php

@@ -107,24 +107,12 @@ CREATE TABLE `RezeptZutat` (
   `Zutat` int(11) NOT NULL
 );");
 
-array_push($SQLStatements, "
-CREATE TABLE `ViewEinkauf` (
-  `ID` int(11),
-  `Anzahl` double,
-  `Einheit` varchar(255),
-  `Name` varchar(255),
-  `Erledigt` tinyint(1)
-);");
-
 array_push($SQLStatements, "
 CREATE TABLE `Zutat` (
   `ID` int(11) NOT NULL,
   `Name` varchar(255) NOT NULL
 );");
 
-array_push($SQLStatements, "
-DROP TABLE IF EXISTS `ViewEinkauf`;");
-
 array_push($SQLStatements, "
 CREATE VIEW `ViewEinkauf` AS  select `Einkauf`.`ID` AS `ID`,`Einkauf`.`Anzahl` AS `Anzahl`,`Einheit`.`Name` AS `Einheit`,`Einkauf`.`Name` AS `Name`,`Einkauf`.`Erledigt` AS `Erledigt` from (`Einkauf` join `Einheit` on((`Einkauf`.`Einheit` = `Einheit`.`ID`))) ;");
 
@@ -189,7 +177,7 @@ ALTER TABLE `users`
   ");
 
 array_push($SQLStatements, "
-ALTER TABLE `sessions` 
+ALTER TABLE `sessions`
   ADD CONSTRAINT `fk_session_uid` FOREIGN KEY (`user`) REFERENCES `users` (`uid`);");
 
 array_push($SQLStatements, "
@@ -217,13 +205,6 @@ INSERT INTO `Einheit` (`ID`, `Name`, `Standard`) VALUES
   (11, 'Glas', 0);");
 
 
-array_push($SQLStatements, "
-CREATE EVENT hourly_session_cleanup
-ON SCHEDULE EVERY 1 HOUR
-DO
-  DELETE FROM `sessions` WHERE `expires` < NOW();");
-
-
 foreach($SQLStatements as $statement){
   $result = $connection->query($statement);
 }

php/auth.php

@@ -3,6 +3,9 @@
   include $_SESSION["docroot"].'/php/connect.php';
   if(!(preg_match("/error.+/", $_SERVER["REQUEST_URI"])))
   {
+    # clear expired sessions from the database
+    $mysqli->query('DELETE FROM `sessions` WHERE `expires` < NOW();');
+
     $result = $mysqli->query('SELECT * FROM `sessions` WHERE `session_id` = \''.$_COOKIE["token"].'\';');
 
     if($result->num_rows == 0 && (!(in_array("site", array_keys($_GET))) || $_GET["site"]!="login"))