Merge branch 'autoclose-postmessage' into dev

[github/wallabag/wallabag.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index 77e50864015b4bbb7b0092eebd7ae013ab1f073b..f5bce50d1bb09abbae631f9f8ca841f170a94e51 100755 (executable)
--- a/install/index.php
+++ b/install/index.php
@@ -16,6 +16,27 @@ $email = "";
 
 require_once('install_functions.php');
 
+// Start by destroying session to avoid wrong logins from previous installations
+// cookie part
+$cookiedir = '';
+if (dirname($_SERVER['SCRIPT_NAME'])!='/') {
+    $cookiedir = dirname($_SERVER["SCRIPT_NAME"]).'/';
+}
+
+if (isset($_SERVER['HTTP_COOKIE'])) {
+    $cookies = explode(';', $_SERVER['HTTP_COOKIE']);
+    foreach($cookies as $cookie) {
+        $parts = explode('=', $cookie);
+        $name = trim($parts[0]);
+        setcookie($name, '', time()-1000);
+        setcookie($name, '', time()-1000, $cookiedir);
+    }
+}
+// session part
+if (isset($_SESSION['poche_user'])) {
+       unset($_SESSION['poche_user']);
+}
+
 if (isset($_GET['clean'])) {
     if (is_dir('install')){
         delTree('install', true);
@@ -73,10 +94,14 @@ else if (isset($_POST['install'])) {
                 $errors[] = 'Impossible to create the SQLite database file. Please check your file permissions.';
             }
             else {
-                $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite';
-                $handle = new PDO($db_path);
-                $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-                $sql_structure = "";
+                try {
+                    $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite';
+                    $handle = new PDO($db_path);
+                    $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                    $sql_structure = "";
+                } catch (PDOException $e) {
+                    $errors[] = "SQLite has encountered an issue : " . $e->getMessage();
+                }
             }
         } else {
             // MySQL and Postgre
@@ -233,7 +258,6 @@ else if (isset($_POST['install'])) {
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="themes/baggy/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="themes/baggy/img/apple-touch-icon-72x72-precomposed.png">
         <link rel="apple-touch-icon-precomposed" href="themes/baggy/img/apple-touch-icon-precomposed.png">
-        <link href='//fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="themes/baggy/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="themes/baggy/css/font.css" media="all">
         <link rel="stylesheet" href="themes/baggy/css/main.css" media="all">