From a79e1411939e2bf123942d150299734d7dac8a23 Mon Sep 17 00:00:00 2001
From: botanicvelious <cyberempires@gmail.com>
Date: Sun, 7 Dec 2014 05:01:05 -0800
Subject: [PATCH 1/2] Update with added Domain_Auto_Add settings

--HG--
branch : develop
---
 code/web/private_php/setup/sql/nel_ams_lib_00007.sql | 2 ++
 code/web/public_php/setup/database.php               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 code/web/private_php/setup/sql/nel_ams_lib_00007.sql

diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00007.sql b/code/web/private_php/setup/sql/nel_ams_lib_00007.sql
new file mode 100644
index 000000000..748793e66
--- /dev/null
+++ b/code/web/private_php/setup/sql/nel_ams_lib_00007.sql
@@ -0,0 +1,2 @@
+INSERT INTO `settings` (`idSettings`, `Setting`, `Value`) VALUES
+(2, 'Domain_Auto_Add', '1');
\ No newline at end of file
diff --git a/code/web/public_php/setup/database.php b/code/web/public_php/setup/database.php
index 3e195f2b8..6137cb00f 100644
--- a/code/web/public_php/setup/database.php
+++ b/code/web/public_php/setup/database.php
@@ -6,7 +6,7 @@ $db_nel_tool = 2;
 
 // Support
 $db_nel_ams = 2;
-$db_nel_ams_lib = 6;
+$db_nel_ams_lib = 7;
 
 // Domain
 $db_ring_domain = 1;

From 1df52a45ad68db3ecfd49d2a98fabbac35500495 Mon Sep 17 00:00:00 2001
From: botanicvelious <cyberempires@gmail.com>
Date: Sun, 7 Dec 2014 06:42:57 -0800
Subject: [PATCH 2/2] add some additional checking for database errors

--HG--
branch : develop
---
 code/web/private_php/ams/autoload/ticket_user.php | 14 ++++++++++++--
 code/web/public_php/setup/install.php             | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/code/web/private_php/ams/autoload/ticket_user.php b/code/web/private_php/ams/autoload/ticket_user.php
index 6de69ccdd..a52ffaec8 100644
--- a/code/web/private_php/ams/autoload/ticket_user.php
+++ b/code/web/private_php/ams/autoload/ticket_user.php
@@ -20,8 +20,18 @@ class Ticket_User{
     * @param $permission the permission that will be given to the user. 1=user, 2=mod, 3=admin
     */
     public static function createTicketUser( $extern_id, $permission) {
-        $dbl = new DBLayer("lib");
-		$dbl->insert("ticket_user",array('TUserId' => $extern_id, 'Permission' => $permission, 'ExternId' => $extern_id));
+          try {
+               //make connection with and put into db
+               $dbl = new DBLayer("lib");
+               $dbl->insert("ticket_user",array('TUserId' => $extern_id, 'Permission' => $permission, 'ExternId' => $extern_id));
+          }
+          catch (PDOException $e) {
+                //oh noooz...
+                //error_log(print_r($e, true));
+                //print_r($e);
+                echo "Problem creating user in database!";
+          }
+		
     }
 
 
diff --git a/code/web/public_php/setup/install.php b/code/web/public_php/setup/install.php
index 49fc0b3a7..438a5c332 100644
--- a/code/web/public_php/setup/install.php
+++ b/code/web/public_php/setup/install.php
@@ -42,6 +42,20 @@ require_once('setup/version.php');
 			$continue = false;
 		}
 	}
+    
+	if ($continue) {
+		try {
+            if (!in_array("mysql",PDO::getAvailableDrivers(),TRUE))
+            {
+                throw new PDOException ("Cannot work without a proper database setting up");
+            }
+        }
+        catch (PDOException $pdoEx)
+        {
+            printalert("danger", "PHP PDO seems to be missing the mysql driver");
+			$continue = false;
+        }
+	}    
 
 	// Validate basics
 	if ($continue) {