X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Findex.php;h=bb3510952414a9f6346ed97d76e5221b186f3043;hb=refs%2Fpull%2F1234%2Fhead;hp=fc16af0c7778d35fcf5ab8dd1250530ed7ccef7a;hpb=dfc1d3e8f325cdd90d76e26d45668870181ec3b8;p=github%2Fwallabag%2Fwallabag.git

diff --git a/install/index.php b/install/index.php
index fc16af0c..bb351095 100755
--- 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);
@@ -144,16 +165,43 @@ else if (isset($_POST['install'])) {
                 $sql_structure = file_get_contents('install/postgres.sql');
             }
             // create database structure
-            $query = $handle->exec($sql_structure);
-
-            $usertest = executeQuery($handle,"SELECT * from users WHERE username = ?", array($username));
-            if (!empty($usertest)) {
-                $continue = false;
-                $errors[] = "An user already exists with this username in database.";
-            }
+            if (!$handle) {
+            	$continue = false;
+                $errors[] = "Couldn't connect to your database server. Please check credentials.";
+            } else {
+	            $query = $handle->exec($sql_structure);
+
+	            $usertest = executeQuery($handle,"SELECT * from users WHERE username = ?", array($username));
+	            if (!empty($usertest)) {
+	                $continue = false;
+	                $errors[] = "An user already exists with this username in database.";
+	            }
+        }
 
         } catch (PDOException $e) {
-            $errors[] = $e->getMessage();
+        	/* Error codes :
+        	/ 	7 : PostgreSQL issues
+        	/ 	1045 : Access denied to the user : user doesn't exists        		   
+        	/ 	1044 : Access denied to the user : user doesn't have the rights to connect to this database
+        	/	2005 : Unknown database server
+			*/
+        	switch ($e->getCode()) {
+        		case 7:
+        			$errors[] = "PostgreSQL has encountered an issue : " . $e->getMessage();
+        			break;
+        		case 1045:
+        			$errors[] = "The password for this user is incorrect, or this user doesn't exist.";
+        			break;
+        		case 1044:
+        			$errors[] = "The user isn't allowed to use this database.";
+        			break;
+        		case 2005:
+        			$errors[] = "The server can't be reached.";
+        			break;
+        		default:
+        			$errors[] = "A error happened while connecting to your database : " . $e->getMessage();
+        			break;
+        	}
             $continue = false;
         }
         }