From 21d7b28a9a4ba14abf2daa71e424da39f28766e8 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Mon, 30 Nov 2015 15:23:42 +0000
Subject: [PATCH 01/37] moved assumed path management to detect_switch as
 *_vdir

---
 core/install/app_languages.php                | 11 +++++
 .../resources/classes/detect_switch.php       | 41 +++++++++++++++----
 .../resources/classes/install_fusionpbx.php   | 16 +++++---
 .../page_parts/install_event_socket.php       | 23 +++++++++--
 4 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/core/install/app_languages.php b/core/install/app_languages.php
index 7dcfb2145f..22ead46f1e 100644
--- a/core/install/app_languages.php
+++ b/core/install/app_languages.php
@@ -22,6 +22,17 @@ $text['title-detected_configuration']['uk'] = "";
 $text['title-detected_configuration']['de-at'] = "";
 $text['title-detected_configuration']['ar-eg'] = "";
 
+$text['title-assumed_configuration']['en-us'] = "Assumed Configuration";
+$text['title-assumed_configuration']['es-cl'] = "";
+$text['title-assumed_configuration']['pt-pt'] = "";
+$text['title-assumed_configuration']['fr-fr'] = "";
+$text['title-assumed_configuration']['pt-br'] = "";
+$text['title-assumed_configuration']['pl'] = "";
+$text['title-assumed_configuration']['sv-se'] = "";
+$text['title-assumed_configuration']['uk'] = "";
+$text['title-assumed_configuration']['de-at'] = "";
+$text['title-assumed_configuration']['ar-eg'] = "";
+
 $text['message-update']['en-us'] = "Update Completed";
 $text['message-update']['es-cl'] = "Actualización Completada";
 $text['message-update']['pt-pt'] = "Actualização Efectuada";
diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index 77a552aab9..a0c26c4d3c 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -36,7 +36,7 @@ require_once "resources/classes/EventSocket.php";
 		protected $_major;
 		protected $_minor;
 
-		// folders
+		// dirs - detected by from the switch
 		protected $_base_dir = '';
 		protected $_cache_dir = '';
 		protected $_certs_dir = '';
@@ -54,7 +54,7 @@ require_once "resources/classes/EventSocket.php";
 		protected $_sounds_dir = '';
 		protected $_storage_dir = '';
 		protected $_temp_dir = '';
-		
+
 		public function major() { return $this->_major; }
 		public function minor() { return $this->_minor; }
 		public function version() { return $this->_major.".".$this->_minor; }
@@ -75,7 +75,23 @@ require_once "resources/classes/EventSocket.php";
 		public function sounds_dir() { return $this->_sounds_dir; }
 		public function storage_dir() { return $this->_storage_dir; }
 		public function temp_dir() { return $this->_temp_dir; }
-		public function get_folders() {	return $this->_folders;	}
+		public function get_dirs() {	return $this->_dirs;	}
+		public function get_vdirs() {	return $this->_vdirs;	}
+
+		// virtual dirs - assumed based on the detected dirs
+		protected $_voicemail_vdir = '';
+		protected $_phrases_vdir = '';
+		protected $_extensions_vdir = '';
+		protected $_sip_profiles_vdir = '';
+		protected $_dialplan_vdir = '';
+		protected $_backup_vdir = '';
+
+		public function voicemail_vdir() { return $this->_voicemail_vdir; }
+		public function phrases_vdir() { return $this->_phrases_vdir; }
+		public function extensions_vdir() { return $this->_extensions_vdir; }
+		public function sip_profiles_vdir() { return $this->_sip_profiles_vdir; }
+		public function dialplan_vdir() { return $this->_dialplan_vdir; }
+		public function backup_vdir() { return $this->_backup_vdir; }
 
 		// event socket
 		public $event_host = 'localhost';
@@ -91,14 +107,16 @@ require_once "resources/classes/EventSocket.php";
 			if(!$this->event_socket){
 				$this->detect_event_socket();
 			}
-			$this->_folders = preg_grep ('/.*_dir$/', get_class_methods('detect_switch') );
-			sort( $this->_folders );
+			$this->_dirs = preg_grep ('/.*_dir$/', get_class_methods('detect_switch') );
+			sort( $this->_dirs );
+			$this->_vdirs = preg_grep ('/.*_vdir$/', get_class_methods('detect_switch') );
+			sort( $this->_vdirs );
 		}
-		
+
 		protected function detect_event_socket() {
 			//perform searches for user's config here
 		}
-		
+
 		public function detect() {
 			$this->connect_event_socket();
 			if(!$this->event_socket){
@@ -116,8 +134,13 @@ require_once "resources/classes/EventSocket.php";
 					$this->$field = $matches[2];
 				}
 			}
-		}
-		
+			$this->_voicemail_vdir = join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail"));
+			$this->_phrases_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang"));
+			$this->_extensions_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory"));
+			$this->_sip_profiles_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles"));
+			$this->_dialplan_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan"));
+			$this->_backup_vdir = sys_get_temp_dir();
+		}	
 	
 		protected function connect_event_socket(){
 			$esl = new EventSocket;
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 6d62060939..b7482fe592 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -637,7 +637,7 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = join( DIRECTORY_SEPARATOR, $this->detect_switch->storage_dir(), 'voicemail');
+				$tmp[$x]['value'] = $this->detect_switch->voicemail_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'voicemail';
 				$tmp[$x]['enabled'] = 'true';
@@ -655,25 +655,31 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
+				$tmp[$x]['value'] = $this->detect_switch->phrases_vdir();
+				$tmp[$x]['category'] = 'switch';
+				$tmp[$x]['subcategory'] = 'phrases';
+				$tmp[$x]['enabled'] = 'true';
+				$x++;
+				$tmp[$x]['name'] = 'dir';
 				$tmp[$x]['value'] = '';
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'provision';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = join( DIRECTORY_SEPARATOR, $this->detect_switch->conf_dir(), "/directory");
+				$tmp[$x]['value'] = $this->detect_switch->extensions_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'extensions';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = join( DIRECTORY_SEPARATOR, $this->detect_switch->conf_dir(), "/sip_profiles");
+				$tmp[$x]['value'] = $this->detect_switch->sip_profiles_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'sip_profiles';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = join( DIRECTORY_SEPARATOR, $this->detect_switch->conf_dir(), "/dialplan");
+				$tmp[$x]['value'] = $this->detect_switch->dialplan_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'dialplan';
 				$tmp[$x]['enabled'] = 'false';
@@ -694,7 +700,7 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = sys_get_temp_dir();
+				$tmp[$x]['value'] = $this->detect_switch->backup_vdir();
 				$tmp[$x]['category'] = 'server';
 				$tmp[$x]['subcategory'] = 'backup';
 				$tmp[$x]['enabled'] = 'true';
diff --git a/core/install/resources/page_parts/install_event_socket.php b/core/install/resources/page_parts/install_event_socket.php
index 7122925b4d..928c6e5424 100644
--- a/core/install/resources/page_parts/install_event_socket.php
+++ b/core/install/resources/page_parts/install_event_socket.php
@@ -91,10 +91,10 @@
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	
 		echo "<tr>\n";
-		echo "<td colspan='4' align='left' nowrap><b>".$text['title-detected_configuration']."</b><br><br></td>\n";
+		echo "<td colspan='4' align='left' nowrap><b>".$text['title-detected_configuration']."</b></td>\n";
 		echo "</tr>\n";
 
-		$id = 0;
+		$id = 1;
 		echo "<tr>\n";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='15%'>\n";
 		echo "Switch version\n";
@@ -102,9 +102,8 @@
 		echo "<td class='vtable' width='35%' align='left'>\n";
 		echo "    ".$switch_detect->version()."\n";
 		echo "</td>\n";
-		echo "</tr>\n";
 		
-		foreach ($switch_detect->get_folders() as $folder)
+		foreach ($switch_detect->get_dirs() as $folder)
 		{
 			if($id % 2 == 0){ echo "<tr>\n"; }
 			echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='15%'>\n";
@@ -117,6 +116,22 @@
 			$id++;
 		}
 		if($id % 2 == 1){ echo "</tr>\n"; }
+		echo "<tr>\n";
+		echo "<td colspan='4' align='left' nowrap><br/><b>".$text['title-assumed_configuration']."</b></td>\n";
+		echo "</tr>\n";
+		$id=0;
+		foreach ($switch_detect->get_vdirs() as $folder)
+		{
+			if($id % 2 == 0){ echo "<tr>\n"; }
+			echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='15%'>\n";
+			echo $folder."\n";
+			echo "</td>\n";
+			echo "<td class='vtable' width='35%' align='left'>\n";
+			echo "    ".$switch_detect->$folder()."\n";
+			echo "</td>\n";
+			if($id % 2 == 1){ echo "</tr>\n"; }
+			$id++;
+		}
 			
 		echo "</table>";
 	}

From e76645401dce938f3c88ac4f40af7d26dd86783b Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Mon, 30 Nov 2015 16:25:36 +0000
Subject: [PATCH 02/37] Added the better create database support

---
 core/install/install_first_time.php           |  1 +
 .../resources/classes/install_fusionpbx.php   | 60 +++++++++----------
 .../page_parts/install_config_database.php    | 38 ++++++++++++
 3 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index ad08a3faeb..e47bb700bd 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -45,6 +45,7 @@ require_once "resources/classes/text.php";
 	$db_name = '';
 	$db_username = '';
 	$db_password = '';
+	$db_create_option = 'none';
 	$db_create_username = '';
 	$db_create_password = '';
 
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index b38860fb10..2a680efd2d 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -54,6 +54,9 @@ include "root.php";
 		public $db_name;
 		public $db_username;
 		public $db_password;
+		public $db_create_option = 'none';
+		public $db_create_username;
+		public $db_create_password;
 
 	 	function __construct($domain_name, $domain_uuid, $detect_switch) {
 			if(!is_a($detect_switch, 'detect_switch')){
@@ -200,6 +203,12 @@ include "root.php";
 		protected function create_database() {
 			require $this->config_php;
 			$this->write_progress("Creating database as " . $this->db_type);
+			if($this->create_db_option == 'same')
+			{
+				$this->create_db_option = 'user';
+				$this->create_db_username = $this->db_username;
+				$this->create_db_password = $this->db_username_password;
+			}
 			$function = "create_database_" . $this->db_type;
 			$this->$function();
 			global $db;
@@ -270,17 +279,17 @@ include "root.php";
 
 		protected function create_database_pgsql() {
 
-				//if $this->db_create_username provided, attempt to create new PG role and database
-					if (strlen($this->db_create_username) > 0) {
+					if ($this->db_create_option == 'user') {
+					//Attempt to create new PG role and database
 						try {
 							if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
 							if (strlen($this->db_host) > 0) {
-								$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} user={".$this->db_create_username."} password={".$this->db_create_password."} dbname=template1");
+								$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
 							} else {
-								$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={".$this->db_create_username."} password={".$this->db_create_password."} dbname=template1");
+								$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
 							}
 						} catch (PDOException $error) {
-							throw new Exception("error connecting to database: " . $error->getMessage());
+							throw new Exception("error connecting to database in order to create: " . $error->getMessage());
 						}
 
 						//create the database, user, grant perms
@@ -344,50 +353,41 @@ include "root.php";
 
 		protected function create_database_mysql() {
 				//database connection
+					$connect_string = '';
+					$connect_username = $this->db_username;
+					$connect_password = $this->db_password;
+					if ($this->db_create_option == 'user') {
+						$connect_username = $this->db_create_username;
+						$connect_password = $this->db_create_password;
+					}
 					try {
 						if (strlen($this->db_host) == 0 && strlen($this->db_port) == 0) {
 							//if both host and port are empty use the unix socket
-							if (strlen($this->db_create_username) == 0) {
-								$this->dbh = new PDO("mysql:host=$this->db_host;unix_socket=/var/run/mysqld/mysqld.sock;", $this->db_username, $this->db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-							}
-							else {
-								$this->dbh = new PDO("mysql:host=$this->db_host;unix_socket=/var/run/mysqld/mysqld.sock;", $this->db_create_username, $this->db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-							}
+							$this->dbh = new PDO("mysql:host=$this->db_host;unix_socket=/var/run/mysqld/mysqld.sock;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+						}
+						elseif (strlen($this->db_port) == 0) {
+							//leave out port if it is empty
+							$this->dbh = new PDO("mysql:host=$this->db_host;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));							}
 						}
 						else {
-							if (strlen($this->db_port) == 0) {
-								//leave out port if it is empty
-								if (strlen($this->db_create_username) == 0) {
-									$this->dbh = new PDO("mysql:host=$this->db_host;", $this->db_username, $this->db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-								}
-								else {
-									$this->dbh = new PDO("mysql:host=$this->db_host;", $this->db_create_username, $this->db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));							}
-							}
-							else {
-								if (strlen($this->db_create_username) == 0) {
-									$this->dbh = new PDO("mysql:host=$this->db_host;port=$this->db_port;", $this->db_username, $this->db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-								}
-								else {
-									$this->dbh = new PDO("mysql:host=$this->db_host;port=$this->db_port;", $this->db_create_username, $this->db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-								}
-							}
+							$this->dbh = new PDO("mysql:host=$this->db_host;port=$this->db_port;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
 						}
 						$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 						$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					}
 					catch (PDOException $error) {
-								throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
+						throw new Exception("error connecting to database: " . $error->getMessage() . "\n" . $sql );
 					}
 
 				//create the table, user and set the permissions only if the db_create_username was provided
-					if (strlen($this->db_create_username) > 0) {
+					if ($this->db_create_option == 'user') {
 						//select the mysql database
 							try {
 								$this->dbh->query("USE mysql;");
 							}
 							catch (PDOException $error) {
 								if ($this->debug) {
-									throw new Exception("error conencting to database: " . $error->getMessage());
+									throw new Exception("error connecting to database in order to create: " . $error->getMessage());
 								}
 							}
 
diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php
index 371a726b98..f5198fc5a3 100644
--- a/core/install/resources/page_parts/install_config_database.php
+++ b/core/install/resources/page_parts/install_config_database.php
@@ -134,6 +134,25 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+		echo "		Create Database Options\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<label class='radio'><input type='radio' name='create_db_option' value='none'";
+		if($db_create_option=='none') { echo " checked='checked'"; }
+		echo "/>Do not create database</label>\n";
+		echo "	<label class='radio'><input type='radio' name='create_db_option' value='same'";
+		if($db_create_option=='same') { echo " checked='checked'"; }
+		echo "/>Create database using above username/password</label>\n";
+		echo "	<label class='radio'><input type='radio' name='create_db_option' value='user'";
+		if($db_create_option=='user') { echo " checked='checked'"; }
+		echo "/>Create database using below username/password</label>\n";
+		echo "<br />\n";
+		echo "Choose whether to create the database\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 		echo "		Create Database Username\n";
@@ -218,6 +237,25 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+		echo "		Create Database Options\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<label class='radio'><input type='radio' name='create_db_option' value='none'";
+		if($db_create_option=='none') { echo " checked='checked'"; }
+		echo "/>Do not create database</label>\n";
+		echo "	<label class='radio'><input type='radio' name='create_db_option' value='same'";
+		if($db_create_option=='same') { echo " checked='checked'"; }
+		echo "/>Create database using above username/password</label>\n";
+		echo "	<label class='radio'><input type='radio' name='create_db_option' value='user'";
+		if($db_create_option=='user') { echo " checked='checked'"; }
+		echo "/>Create database using below username/password</label>\n";
+		echo "<br />\n";
+		echo "Choose whether to create the database\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 		echo "		Create Database Username\n";

From f5d31ca6ce94d28c1bc53f901587035364fdf5e6 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 09:53:18 +0000
Subject: [PATCH 03/37] pipe paths though realpath to normalize

fixed extra }
---
 .../resources/classes/detect_switch.php       | 21 +++++++++++--------
 .../resources/classes/install_fusionpbx.php   | 18 +++++++++++++++-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index a0c26c4d3c..d07603f431 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -35,6 +35,7 @@ require_once "resources/classes/EventSocket.php";
 		// version information
 		protected $_major;
 		protected $_minor;
+		protected $_build;
 
 		// dirs - detected by from the switch
 		protected $_base_dir = '';
@@ -57,7 +58,8 @@ require_once "resources/classes/EventSocket.php";
 
 		public function major() { return $this->_major; }
 		public function minor() { return $this->_minor; }
-		public function version() { return $this->_major.".".$this->_minor; }
+		public function build() { return $this->_build; }
+		public function version() { return $this->_major.".".$this->_minor.".".$this->_build; }
 		public function base_dir() { return $this->_base_dir; }
 		public function cache_dir() { return $this->_cache_dir; }
 		public function certs_dir() { return $this->_certs_dir; }
@@ -123,23 +125,24 @@ require_once "resources/classes/EventSocket.php";
 				throw new Exception('Failed to use event socket');
 			}
 			$FS_Version = $this->event_socket_request('api version');
-			preg_match("/FreeSWITCH Version (\d+)\.(\d(?:\.\d+)?)/", $FS_Version, $matches);
+			preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d(?:\.\d+)?)/", $FS_Version, $matches);
 			$this->_major = $matches[1];
 			$this->_minor = $matches[2];
+			$this->_build = $matches[3];
 			$FS_Vars = $this->event_socket_request('api global_getvar');
 			foreach (explode("\n",$FS_Vars) as $FS_Var){
 				preg_match("/(\w+_dir)=(.*)/", $FS_Var, $matches);
 				if(count($matches) > 0 and property_exists($this, "_" . $matches[1])){
 					$field = "_" . $matches[1];
-					$this->$field = $matches[2];
+					$this->$field = realpath($matches[2]);
 				}
 			}
-			$this->_voicemail_vdir = join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail"));
-			$this->_phrases_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang"));
-			$this->_extensions_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory"));
-			$this->_sip_profiles_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles"));
-			$this->_dialplan_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan"));
-			$this->_backup_vdir = sys_get_temp_dir();
+			$this->_voicemail_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail")));
+			$this->_phrases_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang")));
+			$this->_extensions_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory")));
+			$this->_sip_profiles_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles")));
+			$this->_dialplan_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan")));
+			$this->_backup_vdir = realpath(sys_get_temp_dir());
 		}	
 	
 		protected function connect_event_socket(){
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 2a680efd2d..4e59d5f2a9 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -213,6 +213,22 @@ include "root.php";
 			$this->$function();
 			global $db;
 			$db = $this->dbh;
+
+			//sqlite is natively supported under all known OS'es
+			if($this->db_type != 'sqlite'){
+				if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
+				//non sqlite database support only uses ODBC under windows
+					$this->create_odbc_database_connection();
+				}elseif($this->db_type != 'pgsql'){
+				//switch supports postgresql natively
+					$this->create_odbc_database_connection();
+				}
+			}
+		}
+		
+		protected function create_odbc_database_connection {
+		//needed for non native database support
+			
 		}
 
 		protected function create_database_sqlite() {
@@ -367,7 +383,7 @@ include "root.php";
 						}
 						elseif (strlen($this->db_port) == 0) {
 							//leave out port if it is empty
-							$this->dbh = new PDO("mysql:host=$this->db_host;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));							}
+							$this->dbh = new PDO("mysql:host=$this->db_host;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
 						}
 						else {
 							$this->dbh = new PDO("mysql:host=$this->db_host;port=$this->db_port;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));

From bcc181ce706b90c75e198e32872e50fde36a9583 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 10:10:58 +0000
Subject: [PATCH 04/37] bug fixes for path normalization

---
 core/install/resources/classes/detect_switch.php | 16 ++++++++--------
 .../resources/classes/install_fusionpbx.php      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index d07603f431..974e2844dc 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -125,7 +125,7 @@ require_once "resources/classes/EventSocket.php";
 				throw new Exception('Failed to use event socket');
 			}
 			$FS_Version = $this->event_socket_request('api version');
-			preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d(?:\.\d+)?)/", $FS_Version, $matches);
+			preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d(?:\.\d+)?)$/", $FS_Version, $matches);
 			$this->_major = $matches[1];
 			$this->_minor = $matches[2];
 			$this->_build = $matches[3];
@@ -134,15 +134,15 @@ require_once "resources/classes/EventSocket.php";
 				preg_match("/(\w+_dir)=(.*)/", $FS_Var, $matches);
 				if(count($matches) > 0 and property_exists($this, "_" . $matches[1])){
 					$field = "_" . $matches[1];
-					$this->$field = realpath($matches[2]);
+					$this->$field = normalize_path($matches[2]);
 				}
 			}
-			$this->_voicemail_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail")));
-			$this->_phrases_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang")));
-			$this->_extensions_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory")));
-			$this->_sip_profiles_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles")));
-			$this->_dialplan_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan")));
-			$this->_backup_vdir = realpath(sys_get_temp_dir());
+			$this->_voicemail_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail")));
+			$this->_phrases_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang")));
+			$this->_extensions_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory")));
+			$this->_sip_profiles_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles")));
+			$this->_dialplan_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan")));
+			$this->_backup_vdir = normalize_path(sys_get_temp_dir());
 		}	
 	
 		protected function connect_event_socket(){
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 4e59d5f2a9..e27e66ac9f 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -226,7 +226,7 @@ include "root.php";
 			}
 		}
 		
-		protected function create_odbc_database_connection {
+		protected function create_odbc_database_connection() {
 		//needed for non native database support
 			
 		}

From 87658251d6b7684a71e121f177b5fc12327c9690 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 10:11:39 +0000
Subject: [PATCH 05/37] added normalize_path

---
 resources/functions.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/functions.php b/resources/functions.php
index c1bd498810..dda3d3a2d6 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -600,6 +600,12 @@
 	}
 	//echo realpath(sys_get_temp_dir());
 
+	if ( !function_exists('normalize_path')) {
+		function normalize_path($path) {
+			return str_replace(DIRECTORY_SEPERATOR, '\\', $path);
+		}
+	}
+
 	if (!function_exists('username_exists')) {
 		function username_exists($username) {
 			global $db, $domain_uuid;

From 2a82c3ca7070505f092b0aac428a52a86cde4caf Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 10:23:24 +0000
Subject: [PATCH 06/37] db_create not create_db

corrected version detection
corrected constant
---
 .../resources/classes/detect_switch.php       |   2 +-
 .../resources/classes/install_fusionpbx.php   | 229 +++++++++---------
 .../page_parts/install_config_database.php    |   6 +-
 resources/functions.php                       |   2 +-
 4 files changed, 119 insertions(+), 120 deletions(-)

diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index 974e2844dc..b85ef4600b 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -125,7 +125,7 @@ require_once "resources/classes/EventSocket.php";
 				throw new Exception('Failed to use event socket');
 			}
 			$FS_Version = $this->event_socket_request('api version');
-			preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d(?:\.\d+)?)$/", $FS_Version, $matches);
+			preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d+(?:\.\d+)?)/", $FS_Version, $matches);
 			$this->_major = $matches[1];
 			$this->_minor = $matches[2];
 			$this->_build = $matches[3];
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index e27e66ac9f..64881301b5 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -232,140 +232,139 @@ include "root.php";
 		}
 
 		protected function create_database_sqlite() {
-			//sqlite database will be created when the config.php is loaded and only if the database file does not exist
+		//sqlite database will be created when the config.php is loaded and only if the database file does not exist
+			try {
+				$this->dbh = new PDO('sqlite:'.$this->db_path.'/'.$this->db_name); //sqlite 3
+				//$this->dbh = new PDO('sqlite::memory:'); //sqlite 3
+			}
+			catch (PDOException $error) {
+				throw Exception("Failed to create database: " . $error->getMessage());
+			}
+
+		//add additional functions to SQLite - bool PDO::sqliteCreateFunction ( string function_name, callback callback [, int num_args] )
+			if (!function_exists('php_now')) {
+				function php_now() {
+					if(function_exists("date_default_timezone_set") and function_exists("date_default_timezone_get")) {
+						@date_default_timezone_set(@date_default_timezone_get());
+					}
+					return date("Y-m-d H:i:s");
+				}
+			}
+			$this->dbh->sqliteCreateFunction('now', 'php_now', 0);
+
+		//add the database structure
+			require_once "resources/classes/schema.php";
+			$schema = new schema;
+			$schema->db = $this->dbh;
+			$schema->db_type = $this->db_type;
+			$schema->sql();
+			$schema->exec();
+
+		//get the contents of the sql file
+			if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql')){
+				$filename = "/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql";
+			}
+			else {
+				$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/sqlite.sql';
+			}
+			$file_contents = file_get_contents($filename);
+			unset($filename);
+
+		//replace \r\n with \n then explode on \n
+			$file_contents = str_replace("\r\n", "\n", $file_contents);
+
+		//loop line by line through all the lines of sql code
+			$this->dbh->beginTransaction();
+			$string_array = explode("\n", $file_contents);
+			$x = 0;
+			foreach($string_array as $sql) {
 				try {
-					$this->dbh = new PDO('sqlite:'.$this->db_path.'/'.$this->db_name); //sqlite 3
-					//$this->dbh = new PDO('sqlite::memory:'); //sqlite 3
+					$this->dbh->query($sql);
 				}
 				catch (PDOException $error) {
-					throw Exception("Failed to create database: " . $error->getMessage());
+							throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
 				}
+				$x++;
+			}
+			unset ($file_contents, $sql);
+			$this->dbh->commit();
 
-			//add additional functions to SQLite - bool PDO::sqliteCreateFunction ( string function_name, callback callback [, int num_args] )
-				if (!function_exists('php_now')) {
-					function php_now() {
-						if(function_exists("date_default_timezone_set") and function_exists("date_default_timezone_get")) {
-							@date_default_timezone_set(@date_default_timezone_get());
-						}
-						return date("Y-m-d H:i:s");
+		//set the file permissions
+			chmod($this->db_path.'/'.$this->db_name, 0777);
+		}
+
+		protected function create_database_pgsql() {
+			if ($this->db_create_option == 'user') {
+			//Attempt to create new PG role and database
+				try {
+					if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
+					if (strlen($this->db_host) > 0) {
+						$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
+					} else {
+						$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
 					}
+				} catch (PDOException $error) {
+					throw new Exception("error connecting to database in order to create: " . $error->getMessage());
 				}
-				$this->dbh->sqliteCreateFunction('now', 'php_now', 0);
 
-			//add the database structure
-				require_once "resources/classes/schema.php";
-				$schema = new schema;
-				$schema->db = $this->dbh;
-				$schema->db_type = $this->db_type;
-				$schema->sql();
-				$schema->exec();
+				//create the database, user, grant perms
+				$this->dbh->exec("CREATE DATABASE {$this->db_name}");
+				$this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'");
+				$this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}");
 
-			//get the contents of the sql file
-				if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql')){
-					$filename = "/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql";
+				//close database connection_aborted
+				$this->dbh = null;
+			}
+
+		//open database connection with $this->db_name
+			try {
+				if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
+				if (strlen($this->db_host) > 0) {
+					$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} dbname={$this->db_name} user={$this->db_username} password={$this->db_password}");
+				} else {
+					$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_username} password={$this->db_password} dbname={$this->db_name}");
 				}
-				else {
-					$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/sqlite.sql';
-				}
-				$file_contents = file_get_contents($filename);
-				unset($filename);
+			}
+			catch (PDOException $error) {
+				throw new Exception("error connecting to database: " . $error->getMessage());
+			}
 
-			//replace \r\n with \n then explode on \n
-				$file_contents = str_replace("\r\n", "\n", $file_contents);
+		//add the database structure
+			require_once "resources/classes/schema.php";
+			$schema = new schema;
+			$schema->db = $this->dbh;
+			$schema->db_type = $this->db_type;
+			$schema->sql();
+			$schema->exec();
 
-			//loop line by line through all the lines of sql code
-				$this->dbh->beginTransaction();
-				$string_array = explode("\n", $file_contents);
-				$x = 0;
-				foreach($string_array as $sql) {
+		//get the contents of the sql file
+			if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql')){
+				$filename = "/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql";
+			}
+			else {
+			$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/pgsql.sql';
+			}
+			$file_contents = file_get_contents($filename);
+
+		//replace \r\n with \n then explode on \n
+			$file_contents = str_replace("\r\n", "\n", $file_contents);
+
+		//loop line by line through all the lines of sql code
+			$string_array = explode("\n", $file_contents);
+			$x = 0;
+			foreach($string_array as $sql) {
+				if (strlen($sql) > 3) {
 					try {
 						$this->dbh->query($sql);
 					}
 					catch (PDOException $error) {
-								throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
+						throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
 					}
-					$x++;
 				}
-				unset ($file_contents, $sql);
-				$this->dbh->commit();
-
-			//set the file permissions
-				chmod($this->db_path.'/'.$this->db_name, 0777);
-		}
-
-		protected function create_database_pgsql() {
-
-					if ($this->db_create_option == 'user') {
-					//Attempt to create new PG role and database
-						try {
-							if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
-							if (strlen($this->db_host) > 0) {
-								$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
-							} else {
-								$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
-							}
-						} catch (PDOException $error) {
-							throw new Exception("error connecting to database in order to create: " . $error->getMessage());
-						}
-
-						//create the database, user, grant perms
-						$this->dbh->exec("CREATE DATABASE {$this->db_name}");
-						$this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'");
-						$this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}");
-
-						//close database connection_aborted
-						$this->dbh = null;
-					}
-
-				//open database connection with $this->db_name
-					try {
-						if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
-						if (strlen($this->db_host) > 0) {
-							$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} dbname={$this->db_name} user={$this->db_username} password={$this->db_password}");
-						} else {
-							$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_username} password={$this->db_password} dbname={$this->db_name}");
-						}
-					}
-					catch (PDOException $error) {
-						throw new Exception("error connecting to database: " . $error->getMessage());
-					}
-
-				//add the database structure
-					require_once "resources/classes/schema.php";
-					$schema = new schema;
-					$schema->db = $this->dbh;
-					$schema->db_type = $this->db_type;
-					$schema->sql();
-					$schema->exec();
-
-				//get the contents of the sql file
-					if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql')){
-						$filename = "/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql";
-					}
-					else {
-					$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/pgsql.sql';
-					}
-					$file_contents = file_get_contents($filename);
-
-				//replace \r\n with \n then explode on \n
-					$file_contents = str_replace("\r\n", "\n", $file_contents);
-
-				//loop line by line through all the lines of sql code
-					$string_array = explode("\n", $file_contents);
-					$x = 0;
-					foreach($string_array as $sql) {
-						if (strlen($sql) > 3) {
-							try {
-								$this->dbh->query($sql);
-							}
-							catch (PDOException $error) {
-								throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
-							}
-						}
-						$x++;
-					}
-					unset ($file_contents, $sql);
+				$x++;
 			}
+			unset ($file_contents, $sql);
+		}
 
 		protected function create_database_mysql() {
 				//database connection
diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php
index f5198fc5a3..0d41078d9d 100644
--- a/core/install/resources/page_parts/install_config_database.php
+++ b/core/install/resources/page_parts/install_config_database.php
@@ -242,13 +242,13 @@
 		echo "		Create Database Options\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<label class='radio'><input type='radio' name='create_db_option' value='none'";
+		echo "	<label class='radio'><input type='radio' name='db_create_option' value='none'";
 		if($db_create_option=='none') { echo " checked='checked'"; }
 		echo "/>Do not create database</label>\n";
-		echo "	<label class='radio'><input type='radio' name='create_db_option' value='same'";
+		echo "	<label class='radio'><input type='radio' name='db_create_option' value='same'";
 		if($db_create_option=='same') { echo " checked='checked'"; }
 		echo "/>Create database using above username/password</label>\n";
-		echo "	<label class='radio'><input type='radio' name='create_db_option' value='user'";
+		echo "	<label class='radio'><input type='radio' name='db_create_option' value='user'";
 		if($db_create_option=='user') { echo " checked='checked'"; }
 		echo "/>Create database using below username/password</label>\n";
 		echo "<br />\n";
diff --git a/resources/functions.php b/resources/functions.php
index dda3d3a2d6..ac3b793f2b 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -602,7 +602,7 @@
 
 	if ( !function_exists('normalize_path')) {
 		function normalize_path($path) {
-			return str_replace(DIRECTORY_SEPERATOR, '\\', $path);
+			return str_replace(DIRECTORY_SEPARATOR, '\\', $path);
 		}
 	}
 

From ec1588c5e192702de1ae443c02dfc6bb4da0960d Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 10:33:51 +0000
Subject: [PATCH 07/37] simplified the create database options

---
 .../resources/classes/install_fusionpbx.php     | 16 ++++++++--------
 .../page_parts/install_config_database.php      | 17 ++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 64881301b5..fc1fb850f4 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -54,7 +54,8 @@ include "root.php";
 		public $db_name;
 		public $db_username;
 		public $db_password;
-		public $db_create_option = 'none';
+		public $db_create;
+		public $db_create_reuse_auth;
 		public $db_create_username;
 		public $db_create_password;
 
@@ -203,11 +204,10 @@ include "root.php";
 		protected function create_database() {
 			require $this->config_php;
 			$this->write_progress("Creating database as " . $this->db_type);
-			if($this->create_db_option == 'same')
+			if($this->db_create_reuse_auth)
 			{
-				$this->create_db_option = 'user';
-				$this->create_db_username = $this->db_username;
-				$this->create_db_password = $this->db_username_password;
+				$this->db_create_username = $this->db_username;
+				$this->db_create_password = $this->db_username_password;
 			}
 			$function = "create_database_" . $this->db_type;
 			$this->$function();
@@ -294,7 +294,7 @@ include "root.php";
 		}
 
 		protected function create_database_pgsql() {
-			if ($this->db_create_option == 'user') {
+			if ($this->db_create) {
 			//Attempt to create new PG role and database
 				try {
 					if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
@@ -371,7 +371,7 @@ include "root.php";
 					$connect_string = '';
 					$connect_username = $this->db_username;
 					$connect_password = $this->db_password;
-					if ($this->db_create_option == 'user') {
+					if ($this->db_create) {
 						$connect_username = $this->db_create_username;
 						$connect_password = $this->db_create_password;
 					}
@@ -395,7 +395,7 @@ include "root.php";
 					}
 
 				//create the table, user and set the permissions only if the db_create_username was provided
-					if ($this->db_create_option == 'user') {
+					if ($this->db_create) {
 						//select the mysql database
 							try {
 								$this->dbh->query("USE mysql;");
diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php
index 0d41078d9d..e091d4cfbe 100644
--- a/core/install/resources/page_parts/install_config_database.php
+++ b/core/install/resources/page_parts/install_config_database.php
@@ -242,17 +242,12 @@
 		echo "		Create Database Options\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<label class='radio'><input type='radio' name='db_create_option' value='none'";
-		if($db_create_option=='none') { echo " checked='checked'"; }
-		echo "/>Do not create database</label>\n";
-		echo "	<label class='radio'><input type='radio' name='db_create_option' value='same'";
-		if($db_create_option=='same') { echo " checked='checked'"; }
-		echo "/>Create database using above username/password</label>\n";
-		echo "	<label class='radio'><input type='radio' name='db_create_option' value='user'";
-		if($db_create_option=='user') { echo " checked='checked'"; }
-		echo "/>Create database using below username/password</label>\n";
-		echo "<br />\n";
-		echo "Choose whether to create the database\n";
+		echo "	<label class='radio'><input type='checkbox' name='db_create' value='1'";
+		if($db_create=='1') { echo " checked='checked'"; }
+		echo "/>Create the database</label>\n";
+		echo "	<label class='radio'><input type='checkbox' name='db_create_reuse_auth' value='1'";
+		if($db_create_reuse_auth=='1') { echo " checked='checked'"; }
+		echo "/>Create database using the username and password above</label>\n";
 		echo "</td>\n";
 		echo "</tr>\n";
 

From e7ff440ec8130d3f96f8a402c975f9516c1ec3c9 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 10:56:18 +0000
Subject: [PATCH 08/37] removed reuse stuff, it was confusing

fixed mysql databse create to make more logical sense inside code
removed many if($debug) and replaced with throws
---
 .../resources/classes/install_fusionpbx.php   | 82 ++++++++-----------
 .../page_parts/install_config_database.php    |  4 +-
 2 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index fc1fb850f4..1253f3da60 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -55,7 +55,6 @@ include "root.php";
 		public $db_username;
 		public $db_password;
 		public $db_create;
-		public $db_create_reuse_auth;
 		public $db_create_username;
 		public $db_create_password;
 
@@ -204,10 +203,10 @@ include "root.php";
 		protected function create_database() {
 			require $this->config_php;
 			$this->write_progress("Creating database as " . $this->db_type);
-			if($this->db_create_reuse_auth)
+			if($this->db_create and strlen($this->db_create_username) > 0)
 			{
 				$this->db_create_username = $this->db_username;
-				$this->db_create_password = $this->db_username_password;
+				$this->db_create_password = $this->db_password;
 			}
 			$function = "create_database_" . $this->db_type;
 			$this->$function();
@@ -368,42 +367,35 @@ include "root.php";
 
 		protected function create_database_mysql() {
 				//database connection
-					$connect_string = '';
-					$connect_username = $this->db_username;
-					$connect_password = $this->db_password;
-					if ($this->db_create) {
-						$connect_username = $this->db_create_username;
-						$connect_password = $this->db_create_password;
+					$connect_string;
+					if (strlen($this->db_host) == 0 && strlen($this->db_port) == 0) {
+						//if both host and port are empty use the unix socket
+						$connect_string = "mysql:host=$this->db_host;unix_socket=/var/run/mysqld/mysqld.sock;";
 					}
-					try {
-						if (strlen($this->db_host) == 0 && strlen($this->db_port) == 0) {
-							//if both host and port are empty use the unix socket
-							$this->dbh = new PDO("mysql:host=$this->db_host;unix_socket=/var/run/mysqld/mysqld.sock;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-						}
-						elseif (strlen($this->db_port) == 0) {
-							//leave out port if it is empty
-							$this->dbh = new PDO("mysql:host=$this->db_host;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-						}
-						else {
-							$this->dbh = new PDO("mysql:host=$this->db_host;port=$this->db_port;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-						}
-						$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-						$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+					elseif (strlen($this->db_port) == 0) {
+						//leave out port if it is empty
+						$connect_string = "mysql:host=$this->db_host;";
 					}
-					catch (PDOException $error) {
-						throw new Exception("error connecting to database: " . $error->getMessage() . "\n" . $sql );
+					else {
+						$connect_string = "mysql:host=$this->db_host;port=$this->db_port;";
 					}
 
 				//create the table, user and set the permissions only if the db_create_username was provided
 					if ($this->db_create) {
+						try {
+							$this->dbh = new PDO($connect_string, $this->db_create_username, db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+							$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+							$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+						}
+						catch (PDOException $error) {
+							throw new Exception("error connecting to database for ccreate: " . $error->getMessage() . "\n" . $sql );
+						}
 						//select the mysql database
 							try {
 								$this->dbh->query("USE mysql;");
 							}
 							catch (PDOException $error) {
-								if ($this->debug) {
-									throw new Exception("error connecting to database in order to create: " . $error->getMessage());
-								}
+								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
 
 						//create user and set the permissions
@@ -412,9 +404,7 @@ include "root.php";
 								$this->dbh->query($tmp_sql);
 							}
 							catch (PDOException $error) {
-								if ($this->debug) {
-									print "error: " . $error->getMessage() . "<br/>";
-								}
+								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
 
 						//set account to unlimited use
@@ -438,9 +428,7 @@ include "root.php";
 								}
 							}
 							catch (PDOException $error) {
-								if ($this->debug) {
-									print "error: " . $error->getMessage() . "<br/>";
-								}
+								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
 
 						//create the database and set the create user with permissions
@@ -449,9 +437,7 @@ include "root.php";
 								$this->dbh->query($tmp_sql);
 							}
 							catch (PDOException $error) {
-								if ($this->debug) {
-									print "error: " . $error->getMessage() . "<br/>";
-								}
+								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
 
 						//set user permissions
@@ -459,9 +445,7 @@ include "root.php";
 								$this->dbh->query("GRANT ALL PRIVILEGES ON ".$this->db_name.".* TO '".$this->db_username."'@'%'; ");
 							}
 							catch (PDOException $error) {
-								if ($this->debug) {
-									print "error: " . $error->getMessage() . "<br/>";
-								}
+								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
 
 						//make the changes active
@@ -470,21 +454,25 @@ include "root.php";
 								$this->dbh->query($tmp_sql);
 							}
 							catch (PDOException $error) {
-								if ($this->debug) {
-									print "error: " . $error->getMessage() . "<br/>";
-								}
+								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
-
+							$this->dbh = null;
 					} //if (strlen($this->db_create_username) > 0)
 
 				//select the database
+					try {
+						$this->dbh = new PDO($connect_string, $this->db_username, db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+						$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+						$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+					}
+					catch (PDOException $error) {
+						throw new Exception("error connecting to database: " . $error->getMessage() . "\n" . $sql );
+					}
 					try {
 						$this->dbh->query("USE ".$this->db_name.";");
 					}
 					catch (PDOException $error) {
-						if ($this->debug) {
-							print "error: " . $error->getMessage() . "<br/>";
-						}
+						throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 					}
 
 				//add the database structure
diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php
index e091d4cfbe..cf782d498b 100644
--- a/core/install/resources/page_parts/install_config_database.php
+++ b/core/install/resources/page_parts/install_config_database.php
@@ -246,8 +246,6 @@
 		if($db_create=='1') { echo " checked='checked'"; }
 		echo "/>Create the database</label>\n";
 		echo "	<label class='radio'><input type='checkbox' name='db_create_reuse_auth' value='1'";
-		if($db_create_reuse_auth=='1') { echo " checked='checked'"; }
-		echo "/>Create database using the username and password above</label>\n";
 		echo "</td>\n";
 		echo "</tr>\n";
 
@@ -259,7 +257,7 @@
 		echo "		<input class='formfld' type='text' name='db_create_username' maxlength='255' value=\"$db_create_username\"><br />\n";
 		echo "		Optional, this username is used to create the database, a database user and set the permissions. \n";
 		echo "		By default this username is 'pgsql' however it can be any account with permission to add a database, user, and grant permissions. \n";
-		echo "		Leave blank if the user and empty database already exist and you do not want them created. \n";
+		echo "		Leave blank to use the details above. \n";
 		echo "</td>\n";
 		echo "</tr>\n";
 

From 4efec3ac0ba0c7d82f40eeae2f6c4f8fac37abf7 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 11:02:32 +0000
Subject: [PATCH 09/37] removed redundant radio

override when length is 0, not visa versa
---
 core/install/resources/classes/install_fusionpbx.php          | 2 +-
 core/install/resources/page_parts/install_config_database.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 1253f3da60..cc15ecdf8a 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -203,7 +203,7 @@ include "root.php";
 		protected function create_database() {
 			require $this->config_php;
 			$this->write_progress("Creating database as " . $this->db_type);
-			if($this->db_create and strlen($this->db_create_username) > 0)
+			if($this->db_create and strlen($this->db_create_username) == 0)
 			{
 				$this->db_create_username = $this->db_username;
 				$this->db_create_password = $this->db_password;
diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php
index cf782d498b..054059e742 100644
--- a/core/install/resources/page_parts/install_config_database.php
+++ b/core/install/resources/page_parts/install_config_database.php
@@ -245,7 +245,6 @@
 		echo "	<label class='radio'><input type='checkbox' name='db_create' value='1'";
 		if($db_create=='1') { echo " checked='checked'"; }
 		echo "/>Create the database</label>\n";
-		echo "	<label class='radio'><input type='checkbox' name='db_create_reuse_auth' value='1'";
 		echo "</td>\n";
 		echo "</tr>\n";
 

From c9197b415131c4beaa12cd3b868139836a65a1ff Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 11:35:23 +0000
Subject: [PATCH 10/37] corrected the normalizer

---
 resources/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/functions.php b/resources/functions.php
index ac3b793f2b..50b86716a3 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -602,7 +602,7 @@
 
 	if ( !function_exists('normalize_path')) {
 		function normalize_path($path) {
-			return str_replace(DIRECTORY_SEPARATOR, '\\', $path);
+			return str_replace(array('/','\\'), DIRECTORY_SEPARATOR, $path);
 		}
 	}
 

From 5e00be2ac175a5db7c5cc2f657434d02fe071aa2 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 11:44:24 +0000
Subject: [PATCH 11/37] use fixed value for the replacement as
 DIRECTORY_SEPARATOR changes per platform

---
 resources/functions.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/functions.php b/resources/functions.php
index 50b86716a3..4d2278a217 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -601,8 +601,9 @@
 	//echo realpath(sys_get_temp_dir());
 
 	if ( !function_exists('normalize_path')) {
+		//don't use DIRECTORY_SEPARATOR as it will change on a per platform basis and we need consistency
 		function normalize_path($path) {
-			return str_replace(array('/','\\'), DIRECTORY_SEPARATOR, $path);
+			return str_replace(array('/','\\'), '/', $path);
 		}
 	}
 

From 1e81e57ddc9fbc209cab9f2c16f609b2e24e4dd5 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 11:56:37 +0000
Subject: [PATCH 12/37] Added detection of windows + non sqlite

---
 core/install/install_first_time.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index e47bb700bd..074abaf53d 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -168,6 +168,10 @@ if(!$install_step) { $install_step = 'select_language'; }
 				"<sm>You can use the following to find what ports are allowed<pre>semanage port -l | grep '^http_port_t'</pre></sm>";
 			}
 		}
+	//test for windows and non sqlite
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') and strlen($db_type) > 0 and $db_type !='sqlite') {
+			$messages[] = "<b>Windows requires a system DSN ODBC connection</b> this must be configured after installing then restart freeswitch.";
+		}
 
 	//action code
 	if($return_install_step == 'config_detail'){

From 52ca0fb08270e6cef1c8d361021a1aeb95b18e54 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 12:00:58 +0000
Subject: [PATCH 13/37] bracket error

---
 core/install/install_first_time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 074abaf53d..86d3823aa6 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -169,7 +169,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 			}
 		}
 	//test for windows and non sqlite
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') and strlen($db_type) > 0 and $db_type !='sqlite') {
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' and strlen($db_type) > 0 and $db_type !='sqlite') {
 			$messages[] = "<b>Windows requires a system DSN ODBC connection</b> this must be configured after installing then restart freeswitch.";
 		}
 

From 472d68ae923f18c23bcaa18c453b468e49472594 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 13:36:13 +0000
Subject: [PATCH 14/37] added event_socket_* detection change in app_defaults

---
 app/settings/app_defaults.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/settings/app_defaults.php b/app/settings/app_defaults.php
index 3f12171d26..d192510c79 100644
--- a/app/settings/app_defaults.php
+++ b/app/settings/app_defaults.php
@@ -76,6 +76,18 @@ if ($domains_processed == 1) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 		}
+
+		if(isset($_SESSION['event_socket_ip_address'])) {
+			$event_socket_ip_address = $_SESSION['event_socket_ip_address'];
+			if(isset($_SESSION['event_socket_port'])) { $event_socket_port = $_SESSION['event_socket_port']; }
+			if(isset($_SESSION['event_socket_password'])) { $event_socket_password = $_SESSION['event_socket_password']; }
+			$sql = "update v_settings ";
+			$sql .= "set event_socket_ip_address = '$event_socket_ip_address' ";
+			$sql .= "set event_socket_port = '$event_socket_port' ";
+			$sql .= "set event_socket_password = '$event_socket_password' ";
+			$this->dbh->exec(check_sql($sql));
+			unset($sql);
+		}
 }
 
 ?>
\ No newline at end of file

From 750b6a0c6d54f1a024275cd24b498c86db8aa088 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 14:32:58 +0000
Subject: [PATCH 15/37] Added Switch upgrade as a separate option

---
 core/install/upgrade_switch.php | 59 +++++++++++++++++++++++++++++++++
 core/upgrade/app_config.php     |  3 ++
 core/upgrade/app_languages.php  | 20 +++++++++++
 core/upgrade/index.php          | 24 ++++++++++++++
 4 files changed, 106 insertions(+)
 create mode 100644 core/install/upgrade_switch.php

diff --git a/core/install/upgrade_switch.php b/core/install/upgrade_switch.php
new file mode 100644
index 0000000000..dc579b4a86
--- /dev/null
+++ b/core/install/upgrade_switch.php
@@ -0,0 +1,59 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+// set included, if not
+	if (!isset($included)) { $included = false; }
+
+//check the permission
+	if(defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		require_once "resources/require.php";
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		$format = 'text'; //html, text
+	}
+	else if (!$included) {
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/check_auth.php";
+		if (permission_exists('upgrade_switch') || if_group("superadmin")) {
+			//echo "access granted";
+		}
+		else {
+			echo "access denied";
+			exit;
+		}
+		$format = 'html'; //html, text
+	}
+
+//run switch upgrade
+	require_once "resources/classes/install_switch.php";
+	$switch = new install_switch;
+	$switch->upgrade();
+
+?>
\ No newline at end of file
diff --git a/core/upgrade/app_config.php b/core/upgrade/app_config.php
index effd5308f4..55cc41a13b 100644
--- a/core/upgrade/app_config.php
+++ b/core/upgrade/app_config.php
@@ -32,6 +32,9 @@
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "e7bb1296-3141-48c9-a95a-82d2768d0ae4";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "upgrade_switch";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 
 	//schema details
 		$y = 0; //table array index
diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php
index b7d735eced..3e28a8da98 100644
--- a/core/upgrade/app_languages.php
+++ b/core/upgrade/app_languages.php
@@ -180,6 +180,16 @@ $text['label-upgrade_apps']['sv-se'] = "App Standard";
 $text['label-upgrade_apps']['uk'] = "Типові значення додатків";
 $text['label-upgrade_apps']['de-at'] = "Applikationen zurücksetzen";
 
+$text['label-upgrade_switch']['en-us'] = "Switch Upgrade";
+$text['label-upgrade_switch']['es-cl'] = "";
+$text['label-upgrade_switch']['pt-pt'] = "";
+$text['label-upgrade_switch']['fr-fr'] = "";
+$text['label-upgrade_switch']['pt-br'] = "";
+$text['label-upgrade_switch']['pl'] = "";
+$text['label-upgrade_switch']['sv-se'] = "";
+$text['label-upgrade_switch']['uk'] = "";
+$text['label-upgrade_switch']['de-at'] = "";
+
 $text['label-upgrade']['en-us'] = "Upgrade";
 $text['label-upgrade']['es-cl'] = "Actualizar";
 $text['label-upgrade']['pt-pt'] = "Actualizar";
@@ -390,6 +400,16 @@ $text['description-upgrade_apps']['sv-se'] = "Återställer standardinställning
 $text['description-upgrade_apps']['uk'] = "Встановлює типові значення для додатків";
 $text['description-upgrade_apps']['de-at'] = "Setzt alle Applikationen auf die Standardeinstellungen zurück.";
 
+$text['description-upgrade_switch']['en-us'] = "Runs the upgrade switch routine.";
+$text['description-upgrade_switch']['es-cl'] = "";
+$text['description-upgrade_switch']['pt-pt'] = "";
+$text['description-upgrade_switch']['fr-fr'] = "";
+$text['description-upgrade_switch']['pt-br'] = "";
+$text['description-upgrade_switch']['pl'] = "";
+$text['description-upgrade_switch']['sv-se'] = "";
+$text['description-upgrade_switch']['uk'] = "";
+$text['description-upgrade_switch']['de-at'] = "";
+
 $text['description-upgrade']['en-us'] = "Select the actions below you wish to perform.";
 $text['description-upgrade']['es-cl'] = "Seleccione las acciones a continuación que desea realizar.";
 $text['description-upgrade']['pt-pt'] = "Selecione as ações abaixo você deseja executar.";
diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index 6a83f51e10..d51b012718 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -35,6 +35,7 @@ if (
 	!permission_exists('upgrade_source') &&
 	!permission_exists('upgrade_schema') &&
 	!permission_exists('upgrade_apps') &&
+	!permission_exists('upgrade_switch') &&
 	!permission_exists('menu_restore') &&
 	!permission_exists('group_edit')
 	) {
@@ -121,6 +122,13 @@ if (sizeof($_POST) > 0) {
 		$response_message = "Permission Defaults Restored";
 	}
 
+	// upgrade switch
+	if ($do["switch"] && permission_exists("upgrade_switch")) {
+		$included = true;
+		require_once("core/install/upgrade_switch.php");
+		$response_message = "Switch Upgraded";
+	}
+
 	if (sizeof($_POST['do']) > 1) {
 		$response_message = $text['message-upgrade'];
 	}
@@ -250,6 +258,22 @@ if (permission_exists("group_edit")) {
 	echo "</table>\n";
 }
 
+if (permission_exists("upgrade_switch")) {
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<tr>\n";
+	echo "	<td width='30%' class='vncell'>\n";
+	echo "		".$text['label-upgrade_switch'];
+	echo "	</td>\n";
+	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
+	echo "		<label for='do_switch'>";
+	echo "			<input type='checkbox' class='formfld' name='do[switch]' id='do_switch' value='1'>";
+	echo "			".$text['description-upgrade_switch'];
+	echo "		</label>\n";
+	echo "	</td>\n";
+	echo "</tr>\n";
+	echo "</table>\n";
+}
+
 echo "<br>";
 echo "<div style='text-align: right;'><input type='submit' class='btn' value='".$text['button-upgrade_execute']."'></div>";
 echo "<br><br>";

From bbcc8b5fa76f11b9e348d067d8c21e2b9cab6258 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 15:13:33 +0000
Subject: [PATCH 16/37] moved config_lua responsibility to install_switch

---
 core/databases/app_defaults.php               | 177 ------------------
 .../resources/classes/install_switch.php      | 145 +++++++++++++-
 resources/functions.php                       |   6 +
 3 files changed, 150 insertions(+), 178 deletions(-)

diff --git a/core/databases/app_defaults.php b/core/databases/app_defaults.php
index 71adfaced2..c6484cbd31 100644
--- a/core/databases/app_defaults.php
+++ b/core/databases/app_defaults.php
@@ -24,22 +24,6 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
 
-global $IS_WINDOWS;
-
-if ($IS_WINDOWS == null) {
-	if (stristr(PHP_OS, 'WIN')) { $IS_WINDOWS = true; } else { $IS_WINDOWS = false; }
-}
-
-if (!function_exists('correct_path')) {
-	function correct_path($p) {
-		global $IS_WINDOWS;
-		if ($IS_WINDOWS) {
-			return str_replace('/', '\\', $p);
-		}
-		return $p;
-	}
-}
-
 //proccess this only one time
 if ($domains_processed == 1) {
 
@@ -66,166 +50,5 @@ if ($domains_processed == 1) {
 			unset($sql);
 		}
 		unset($prep_statement, $result);
-
-	//replace the backslash with a forward slash
-		$db_path = str_replace("\\", "/", $db_path);
-
-	if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
-		//get the odbc information
-			$sql = "select count(*) as num_rows from v_databases ";
-			$sql .= "where database_driver = 'odbc' ";
-			if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-			$prep_statement = $db->prepare($sql);
-			if ($prep_statement) {
-				$prep_statement->execute();
-				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-				unset($prep_statement);
-				if ($row['num_rows'] > 0) {
-					$odbc_num_rows = $row['num_rows'];
-
-					$sql = "select * from v_databases ";
-					$sql .= "where database_driver = 'odbc' ";
-					$prep_statement = $db->prepare(check_sql($sql));
-					$prep_statement->execute();
-					$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-					foreach ($result as &$row) {
-						$dsn_name = $row["database_name"];
-						$dsn_username = $row["database_username"];
-						$dsn_password = $row["database_password"];
-						break; //limit to 1 row
-					}
-					unset ($prep_statement);
-				}
-				else {
-					$odbc_num_rows = '0';
-				}
-			}
-
-		//get the recordings directory
-			if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
-				$sql = "select * from v_default_settings ";
-				$sql .= "where default_setting_category = 'switch' ";
-				$sql .= "and default_setting_subcategory = 'recordings' ";
-				$sql .= "and default_setting_name = 'dir' ";
-				$prep_statement = $db->prepare(check_sql($sql));
-				$prep_statement->execute();
-				$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-				foreach ($result as &$row) {
-					$recordings_dir = $row["default_setting_value"];
-				}
-				unset($prep_statement, $result);
-			}
-
-		//config.lua
-			if (is_dir("/etc/fusionpbx")){
-				$config = "/etc/fusionpbx/config.lua";
-			} elseif (is_dir("/usr/local/etc/fusionpbx")){
-				$config = "/usr/local/etc/fusionpbx/config.lua";
-			}
-			else {
-				$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
-			}
-			$fout = fopen($config,"w");
-			if(!$fout){
-				throw new Exception("Failed to open '$config' for writing");
-			}
-			$tmp = "\n";
-			$tmp .= "--set the variables\n";
-			if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
-				$tmp .= correct_path("	sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
-			}
-			if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
-				$tmp .= correct_path("	phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
-			}
-			if (strlen($_SESSION['switch']['db']['dir']) > 0) {
-				$tmp .= correct_path("	database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
-			}
-			if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
-				$tmp .= correct_path("	recordings_dir = [[".$recordings_dir."]];\n");
-			}
-			if (strlen($_SESSION['switch']['storage']['dir']) > 0) {
-				$tmp .= correct_path("	storage_dir = [[".$_SESSION['switch']['storage']['dir']."]];\n");
-			}
-			if (strlen($_SESSION['switch']['voicemail']['dir']) > 0) {
-				$tmp .= correct_path("	voicemail_dir = [[".$_SESSION['switch']['voicemail']['dir']."]];\n");
-			}
-			if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
-				$tmp .= correct_path("	scripts_dir = [[".$_SESSION['switch']['scripts']['dir']."]];\n");
-			}
-			$tmp .= correct_path("	php_dir = [[".PHP_BINDIR."]];\n");
-			if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
-				$tmp .= "	php_bin = \"php.exe\";\n";
-			}
-			else {
-				$tmp .= "	php_bin = \"php\";\n";
-			}
-			$tmp .= correct_path("	document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n");
-			$tmp .= "\n";
-
-			if ((strlen($db_type) > 0) || (strlen($dsn_name) > 0)) {
-				$tmp .= "--database information\n";
-				$tmp .= "	database = {}\n";
-				$tmp .= "	database[\"type\"] = \"".$db_type."\";\n";
-				$tmp .= "	database[\"name\"] = \"".$db_name."\";\n";
-				$tmp .= correct_path("	database[\"path\"] = [[".$db_path."]];\n");
-
-				if (strlen($dsn_name) > 0) {
-					$tmp .= "	database[\"system\"] = \"odbc://".$dsn_name.":".$dsn_username.":".$dsn_password."\";\n";
-					$tmp .= "	database[\"switch\"] = \"odbc://freeswitch:".$dsn_username.":".$dsn_password."\";\n";
-				}
-				elseif ($db_type == "pgsql") {
-					if ($db_host == "localhost") { $db_host = "127.0.0.1"; }
-					$tmp .= "	database[\"system\"] = \"pgsql://hostaddr=".$db_host." port=".$db_port." dbname=".$db_name." user=".$db_username." password=".$db_password." options='' application_name='".$db_name."'\";\n";
-					$tmp .= "	database[\"switch\"] = \"pgsql://hostaddr=".$db_host." port=".$db_port." dbname=freeswitch user=".$db_username." password=".$db_password." options='' application_name='freeswitch'\";\n";
-				}
-				elseif ($db_type == "sqlite") {
-					$tmp .= "	database[\"system\"] = \"sqlite://".$db_path."/".$db_name."\";\n";
-					$tmp .= "	database[\"switch\"] = \"sqlite://".$_SESSION['switch']['db']['dir']."\";\n";
-				}
-				elseif ($db_type == "mysql") {
-					$tmp .= "	database[\"system\"] = \"\";\n";
-					$tmp .= "	database[\"switch\"] = \"\";\n";
-				}
-				$tmp .= "\n";
-			}
-			$tmp .= "--set defaults\n";
-			$tmp .= "	expire = {}\n";
-			$tmp .= "	expire[\"directory\"] = \"3600\";\n";
-			$tmp .= "	expire[\"dialplan\"] = \"3600\";\n";
-			$tmp .= "	expire[\"languages\"] = \"3600\";\n";
-			$tmp .= "	expire[\"sofia.conf\"] = \"3600\";\n";
-			$tmp .= "	expire[\"acl.conf\"] = \"3600\";\n";
-			$tmp .= "\n";
-			$tmp .= "--set xml_handler\n";
-			$tmp .= "	xml_handler = {}\n";
-			$tmp .= "	xml_handler[\"fs_path\"] = false;\n";
-			$tmp .= "\n";
-			$tmp .= "--set the debug options\n";
-			$tmp .= "	debug[\"params\"] = false;\n";
-			$tmp .= "	debug[\"sql\"] = false;\n";
-			$tmp .= "	debug[\"xml_request\"] = false;\n";
-			$tmp .= "	debug[\"xml_string\"] = false;\n";
-			$tmp .= "	debug[\"cache\"] = false;\n";
-			$tmp .= "\n";
-			$tmp .= "--additional info\n";
-			$tmp .= "	domain_count = ".count($_SESSION["domains"]).";\n";
-			$tmp .= correct_path("	temp_dir = [[".$_SESSION['server']['temp']['dir']."]];\n");
-			if (isset($_SESSION['domain']['dial_string']['text'])) {
-				$tmp .= "	dial_string = \"".$_SESSION['domain']['dial_string']['text']."\";\n";
-			}
-			$tmp .= "\n";
-			$tmp .= "--include local.lua\n";
-			$tmp .= "	require(\"resources.functions.file_exists\");\n";
-			$tmp .= "	if (file_exists(\"/etc/fusionpbx/local.lua\")) then\n";
-			$tmp .= "		dofile(\"/etc/fusionpbx/local.lua\");\n";
-			$tmp .= "	elseif (file_exists(\"/usr/local/etc/fusionpbx/local.lua\")) then\n";
-			$tmp .= "		dofile(\"/usr/local/etc/fusionpbx/local.lua\");\n";
-			$tmp .= "	elseif (file_exists(scripts_dir..\"/resources/local.lua\")) then\n";
-			$tmp .= "		require(\"resources.local\");\n";
-			$tmp .= "	end\n";
-			fwrite($fout, $tmp);
-			unset($tmp);
-			fclose($fout);
-	}
 }
 ?>
\ No newline at end of file
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 715c2cef5b..5e63fd2072 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -176,10 +176,12 @@ include "root.php";
 		function install() {
 			$this->copy_conf();
 			$this->copy_scripts();
+			$this->create_config_lua();
 		}
 
 		function upgrade() {
 			$this->copy_scripts();
+			$this->create_config_lua();
 		}
 
 		function copy_conf() {
@@ -260,6 +262,147 @@ include "root.php";
 				chmod($dst_dir, 0774);
 			}
 		}
-		
+
+		function create_config_lua() {
+		//get the odbc information
+			$sql = "select count(*) as num_rows from v_databases ";
+			$sql .= "where database_driver = 'odbc' ";
+			if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+			$prep_statement = $db->prepare($sql);
+			if ($prep_statement) {
+				$prep_statement->execute();
+				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+				unset($prep_statement);
+				if ($row['num_rows'] > 0) {
+					$odbc_num_rows = $row['num_rows'];
+					$sql = "select * from v_databases ";
+					$sql .= "where database_driver = 'odbc' ";
+					$prep_statement = $db->prepare(check_sql($sql));
+					$prep_statement->execute();
+					$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+					foreach ($result as &$row) {
+						$dsn_name = $row["database_name"];
+						$dsn_username = $row["database_username"];
+						$dsn_password = $row["database_password"];
+						break; //limit to 1 row
+					}
+					unset ($prep_statement);
+				}
+				else {
+					$odbc_num_rows = '0';
+				}
+			}
+
+		//config.lua
+			if (is_dir("/etc/fusionpbx")){
+				$config = "/etc/fusionpbx/config.lua";
+			} elseif (is_dir("/usr/local/etc/fusionpbx")){
+				$config = "/usr/local/etc/fusionpbx/config.lua";
+			}
+			else {
+				$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
+			}
+			$fout = fopen($config,"w");
+			if(!$fout){
+				throw new Exception("Failed to open '$config' for writing");
+			}
+			$tmp = "\n";
+			$tmp .= "--set the variables\n";
+			if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
+			}
+			if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
+			}
+			if (strlen($_SESSION['switch']['db']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
+			}
+			if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	recordings_dir = [[".$_SESSION['switch']['recordings']['dir']."]];\n");
+			}
+			if (strlen($_SESSION['switch']['storage']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	storage_dir = [[".$_SESSION['switch']['storage']['dir']."]];\n");
+			}
+			if (strlen($_SESSION['switch']['voicemail']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	voicemail_dir = [[".$_SESSION['switch']['voicemail']['dir']."]];\n");
+			}
+			if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
+				$tmp .= normalize_path_to_os("	scripts_dir = [[".$_SESSION['switch']['scripts']['dir']."]];\n");
+			}
+			$tmp .= normalize_path_to_os("	php_dir = [[".PHP_BINDIR."]];\n");
+			if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
+				$tmp .= "	php_bin = \"php.exe\";\n";
+			}
+			else {
+				$tmp .= "	php_bin = \"php\";\n";
+			}
+			$tmp .= normalize_path_to_os("	document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n");
+			$tmp .= "\n";
+
+			if ((strlen($db_type) > 0) || (strlen($dsn_name) > 0)) {
+				$tmp .= "--database information\n";
+				$tmp .= "	database = {}\n";
+				$tmp .= "	database[\"type\"] = \"".$db_type."\";\n";
+				$tmp .= "	database[\"name\"] = \"".$db_name."\";\n";
+				$tmp .= normalize_path_to_os("	database[\"path\"] = [[".$db_path."]];\n");
+
+				if (strlen($dsn_name) > 0) {
+					$tmp .= "	database[\"system\"] = \"odbc://".$dsn_name.":".$dsn_username.":".$dsn_password."\";\n";
+					$tmp .= "	database[\"switch\"] = \"odbc://freeswitch:".$dsn_username.":".$dsn_password."\";\n";
+				}
+				elseif ($db_type == "pgsql") {
+					if ($db_host == "localhost") { $db_host = "127.0.0.1"; }
+					$tmp .= "	database[\"system\"] = \"pgsql://hostaddr=".$db_host." port=".$db_port." dbname=".$db_name." user=".$db_username." password=".$db_password." options='' application_name='".$db_name."'\";\n";
+					$tmp .= "	database[\"switch\"] = \"pgsql://hostaddr=".$db_host." port=".$db_port." dbname=freeswitch user=".$db_username." password=".$db_password." options='' application_name='freeswitch'\";\n";
+				}
+				elseif ($db_type == "sqlite") {
+					$tmp .= "	database[\"system\"] = \"sqlite://".$db_path."/".$db_name."\";\n";
+					$tmp .= "	database[\"switch\"] = \"sqlite://".$_SESSION['switch']['db']['dir']."\";\n";
+				}
+				elseif ($db_type == "mysql") {
+					$tmp .= "	database[\"system\"] = \"\";\n";
+					$tmp .= "	database[\"switch\"] = \"\";\n";
+				}
+				$tmp .= "\n";
+			}
+			$tmp .= "--set defaults\n";
+			$tmp .= "	expire = {}\n";
+			$tmp .= "	expire[\"directory\"] = \"3600\";\n";
+			$tmp .= "	expire[\"dialplan\"] = \"3600\";\n";
+			$tmp .= "	expire[\"languages\"] = \"3600\";\n";
+			$tmp .= "	expire[\"sofia.conf\"] = \"3600\";\n";
+			$tmp .= "	expire[\"acl.conf\"] = \"3600\";\n";
+			$tmp .= "\n";
+			$tmp .= "--set xml_handler\n";
+			$tmp .= "	xml_handler = {}\n";
+			$tmp .= "	xml_handler[\"fs_path\"] = false;\n";
+			$tmp .= "\n";
+			$tmp .= "--set the debug options\n";
+			$tmp .= "	debug[\"params\"] = false;\n";
+			$tmp .= "	debug[\"sql\"] = false;\n";
+			$tmp .= "	debug[\"xml_request\"] = false;\n";
+			$tmp .= "	debug[\"xml_string\"] = false;\n";
+			$tmp .= "	debug[\"cache\"] = false;\n";
+			$tmp .= "\n";
+			$tmp .= "--additional info\n";
+			$tmp .= "	domain_count = ".count($_SESSION["domains"]).";\n";
+			$tmp .= normalize_path_to_os("	temp_dir = [[".$_SESSION['server']['temp']['dir']."]];\n");
+			if (isset($_SESSION['domain']['dial_string']['text'])) {
+				$tmp .= "	dial_string = \"".$_SESSION['domain']['dial_string']['text']."\";\n";
+			}
+			$tmp .= "\n";
+			$tmp .= "--include local.lua\n";
+			$tmp .= "	require(\"resources.functions.file_exists\");\n";
+			$tmp .= "	if (file_exists(\"/etc/fusionpbx/local.lua\")) then\n";
+			$tmp .= "		dofile(\"/etc/fusionpbx/local.lua\");\n";
+			$tmp .= "	elseif (file_exists(\"/usr/local/etc/fusionpbx/local.lua\")) then\n";
+			$tmp .= "		dofile(\"/usr/local/etc/fusionpbx/local.lua\");\n";
+			$tmp .= "	elseif (file_exists(scripts_dir..\"/resources/local.lua\")) then\n";
+			$tmp .= "		require(\"resources.local\");\n";
+			$tmp .= "	end\n";
+			fwrite($fout, $tmp);
+			unset($tmp);
+			fclose($fout);	
+		}
 	}
 ?>
\ No newline at end of file
diff --git a/resources/functions.php b/resources/functions.php
index 4d2278a217..04e6d1f3f1 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -606,6 +606,12 @@
 			return str_replace(array('/','\\'), '/', $path);
 		}
 	}
+	
+	if ( !function_exists('normalize_path_to_os')) {
+		function normalize_path_to_os($path) {
+			return str_replace(array('/','\\'), DIRECTORY_SEPARATOR, $path);
+		}
+	}
 
 	if (!function_exists('username_exists')) {
 		function username_exists($username) {

From 9f67c70f5b9f3ab16e682b95d2dc7a723f4fc528 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 15:56:07 +0000
Subject: [PATCH 17/37] Added better status updates

---
 .../resources/classes/install_fusionpbx.php   | 35 ++++++++++++-------
 .../resources/classes/install_switch.php      |  8 +++--
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index cc15ecdf8a..70c0eeec04 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -91,15 +91,18 @@ include "root.php";
 
 		function install() {
 			ini_set('max_execution_time',3600);
+			$this->write_progress("Install started for FusionPBX");
 			$this->create_config_php();
 			$this->create_database();
 			$this->create_domain();
 			$this->create_superuser();
 			require "resources/require.php";
 			$this->create_menus();
+			$this->write_progress("Install complete for FusionPBX");
 		}
 
 		protected function create_config_php() {
+			$this->write_progress("\tCreating " . $this->config_php);
 			$tmp_config = "<?php\n";
 			$tmp_config .= "/* \$Id\$ */\n";
 			$tmp_config .= "/*\n";
@@ -193,7 +196,6 @@ include "root.php";
 				) {
 				throw new Exception("cannot write to '" . $this->config_php . "'" );
 			}
-			$this->write_progress("Creating " . $this->config_php);
 			$fout = fopen($this->config_php,"w");
 			fwrite($fout, $tmp_config);
 			unset($tmp_config);
@@ -202,7 +204,7 @@ include "root.php";
 
 		protected function create_database() {
 			require $this->config_php;
-			$this->write_progress("Creating database as " . $this->db_type);
+			$this->write_progress("\tUsing database as type " . $this->db_type);
 			if($this->db_create and strlen($this->db_create_username) == 0)
 			{
 				$this->db_create_username = $this->db_username;
@@ -295,6 +297,7 @@ include "root.php";
 		protected function create_database_pgsql() {
 			if ($this->db_create) {
 			//Attempt to create new PG role and database
+				$this->write_progress("\tCreating database");				
 				try {
 					if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
 					if (strlen($this->db_host) > 0) {
@@ -307,7 +310,9 @@ include "root.php";
 				}
 
 				//create the database, user, grant perms
-				$this->dbh->exec("CREATE DATABASE {$this->db_name}");
+				if ($this->dbh->exec("CREATE DATABASE {$this->db_name}") == false) {
+					throw new Exception("Failed to create database {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+				}
 				$this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'");
 				$this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}");
 
@@ -315,6 +320,7 @@ include "root.php";
 				$this->dbh = null;
 			}
 
+			$this->write_progress("\tInstalling data to database");				
 		//open database connection with $this->db_name
 			try {
 				if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
@@ -328,6 +334,7 @@ include "root.php";
 				throw new Exception("error connecting to database: " . $error->getMessage());
 			}
 
+
 		//add the database structure
 			require_once "resources/classes/schema.php";
 			$schema = new schema;
@@ -382,6 +389,7 @@ include "root.php";
 
 				//create the table, user and set the permissions only if the db_create_username was provided
 					if ($this->db_create) {
+						$this->write_progress("\tCreating database");				
 						try {
 							$this->dbh = new PDO($connect_string, $this->db_create_username, db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
 							$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -459,6 +467,7 @@ include "root.php";
 							$this->dbh = null;
 					} //if (strlen($this->db_create_username) > 0)
 
+				$this->write_progress("\tInstalling data to database");
 				//select the database
 					try {
 						$this->dbh = new PDO($connect_string, $this->db_username, db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
@@ -518,7 +527,7 @@ include "root.php";
 		}
 
 		protected function create_domain() {
-			$this->write_progress("Checking if domain exists '" . $this->domain_name . "'");
+			$this->write_progress("\tChecking if domain exists '" . $this->domain_name . "'");
 			$sql = "select * from v_domains ";
 			$sql .= "where domain_name = '".$this->domain_name."' ";
 			$sql .= "limit 1";
@@ -534,7 +543,7 @@ include "root.php";
 					throw new Exception("Domain already exists but is disabled, this is unexpected");
 				}
 			} else {
-				$this->write_progress("... creating domain");
+				$this->write_progress("\t... creating domain");
 				$sql = "insert into v_domains ";
 				$sql .= "(";
 				$sql .= "domain_uuid, ";
@@ -819,7 +828,7 @@ include "root.php";
 		}
 
 		protected function create_superuser() {
-			$this->write_progress("Checking if superuser exists '" . $this->domain_name . "'");
+			$this->write_progress("\tChecking if superuser exists '" . $this->domain_name . "'");
 			$sql = "select * from v_users ";
 			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
 			$sql .= "and username = '".$this->admin_username."' ";
@@ -840,7 +849,7 @@ include "root.php";
 				$this->write_debug($sql);
 				$this->dbh->exec(check_sql($sql));
 			}else{
-				$this->write_progress("... creating super user '" . $this->admin_username . "'");
+				$this->write_progress("\t... creating super user '" . $this->admin_username . "'");
 			//add a user and then add the user to the superadmin group
 			//prepare the values
 				$this->admin_uuid = uuid();
@@ -875,7 +884,7 @@ include "root.php";
 				$this->dbh->exec(check_sql($sql));
 				unset($sql);
 			}
-			$this->write_progress("Checking if superuser contact exists");
+			$this->write_progress("\tChecking if superuser contact exists");
 			$sql = "select count(*) from v_contacts ";
 			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
 			$sql .= "and contact_name_given = '".$this->admin_username."' ";
@@ -905,7 +914,7 @@ include "root.php";
 				$this->dbh->exec(check_sql($sql));
 				unset($sql);
 			}
-			$this->write_progress("Checking if superuser is in the correct group");
+			$this->write_progress("\tChecking if superuser is in the correct group");
 			$sql = "select count(*) from v_group_users ";
 			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
 			$sql .= "and user_uuid = '".$this->admin_uuid."' ";
@@ -938,13 +947,13 @@ include "root.php";
 		}
 
 		protected function create_menus() {
-			$this->write_progress("Creating menus");
+			$this->write_progress("\tCreating menus");
 		//set the defaults
 			$menu_name = 'default';
 			$menu_language = 'en-us';
 			$menu_description = 'Default Menu Set';
 
-			$this->write_progress("Checking if menu exists");
+			$this->write_progress("\tChecking if menu exists");
 			$sql = "select count(*) from v_menus ";
 			$sql .= "where menu_uuid = '".$this->menu_uuid."' ";
 			$sql .= "limit 1 ";
@@ -954,7 +963,7 @@ include "root.php";
 			$result = $prep_statement->fetch(PDO::FETCH_NAMED);
 			unset($sql, $prep_statement);
 			if ($result['count'] == 0) {
-				$this->write_progress("... creating menu '" . $menu_name. "'");
+				$this->write_progress("\t... creating menu '" . $menu_name. "'");
 				$sql = "insert into v_menus ";
 				$sql .= "(";
 				$sql .= "menu_uuid, ";
@@ -986,7 +995,7 @@ include "root.php";
 		}
 
 		public function app_defaults() {
-			$this->write_progress("Running app_defaults");
+			$this->write_progress("\tRunning app_defaults");
 
 		//set needed session settings
 			$_SESSION["username"] = $this->admin_username;
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 5e63fd2072..3d7558b88c 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -174,9 +174,11 @@ include "root.php";
 		}
 
 		function install() {
+			$this->write_progress("Install started for switch");
 			$this->copy_conf();
 			$this->copy_scripts();
 			$this->create_config_lua();
+			$this->write_progress("Install completed for switch");
 		}
 
 		function upgrade() {
@@ -185,7 +187,7 @@ include "root.php";
 		}
 
 		function copy_conf() {
-			$this->write_progress("Copying Config");
+			$this->write_progress("\tCopying Config");
 			//make a backup of the config
 				if (file_exists($this->detect_switch->conf_dir())) {
 					$this->backup_dir($this->detect_switch->conf_dir(), 'fusionpbx_switch_config');
@@ -240,7 +242,7 @@ include "root.php";
 		}
 
 		function copy_scripts() {
-			$this->write_progress("Copying Scripts");
+			$this->write_progress("\tCopying Scripts");
 			if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
 				$script_dir = $_SESSION['switch']['scripts']['dir'];
 			}
@@ -264,6 +266,8 @@ include "root.php";
 		}
 
 		function create_config_lua() {
+		$this->write_progress("\Creating config.lua");
+		global $db;
 		//get the odbc information
 			$sql = "select count(*) as num_rows from v_databases ";
 			$sql .= "where database_driver = 'odbc' ";

From 6e03808f6e61746566726b1ed0c60210c2176587 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:08:04 +0000
Subject: [PATCH 18/37] corrected dbh->exec checks to use === to force bool
 check

---
 core/install/resources/classes/install_fusionpbx.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 70c0eeec04..51c91d6002 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -310,11 +310,15 @@ include "root.php";
 				}
 
 				//create the database, user, grant perms
-				if ($this->dbh->exec("CREATE DATABASE {$this->db_name}") == false) {
+				if($this->dbh->exec("CREATE DATABASE {$this->db_name}") === false) {
 					throw new Exception("Failed to create database {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
 				}
-				$this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'");
-				$this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}");
+				if($this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'") === false){
+					throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+				}
+				if($this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}") === false){
+					throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+				}
 
 				//close database connection_aborted
 				$this->dbh = null;

From 7b0a65779036d0517f8437e50609fe5d064d7c89 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:22:40 +0000
Subject: [PATCH 19/37] Result of merge

---
 .../resources/classes/install_fusionpbx.php   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index c60379f916..19bcf70eef 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -297,7 +297,7 @@ include "root.php";
 		protected function create_database_pgsql() {
 			if ($this->db_create) {
 			//Attempt to create new PG role and database
-				$this->write_progress("\tCreating database");				
+				$this->write_progress("\tCreating database");
 				try {
 					if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
 					if (strlen($this->db_host) > 0) {
@@ -347,18 +347,14 @@ include "root.php";
 			$schema->sql();
 			$schema->exec();
 
-				//if $this->db_create_username provided, attempt to create new PG role and database
-					if (strlen($this->db_create_username) > 0) {
-						try {
-							if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
-							if (strlen($this->db_host) > 0) {
-								$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
-							} else {
-								$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
-							}
-						} catch (PDOException $error) {
-							throw new Exception("error connecting to database: " . $error->getMessage());
-						}
+		//get the contents of the sql file
+			if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql')){
+				$filename = "/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql";
+			}
+			else {
+			$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/pgsql.sql';
+			}
+			$file_contents = file_get_contents($filename);
 
 		//replace \r\n with \n then explode on \n
 			$file_contents = str_replace("\r\n", "\n", $file_contents);

From bfd03697a80a1c6478e88a0caf8e0f43fcbf1c0d Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:29:14 +0000
Subject: [PATCH 20/37] Deal with create_username

don't create the db_username if it is the same as the db_create_username
---
 core/install/resources/classes/install_fusionpbx.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 19bcf70eef..c0a7c22d7b 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -313,11 +313,13 @@ include "root.php";
 				if($this->dbh->exec("CREATE DATABASE {$this->db_name}") === false) {
 					throw new Exception("Failed to create database {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
 				}
-				if($this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'") === false){
-					throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
-				}
-				if($this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}") === false){
-					throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+				if($this->db_username != $this->db_create_username){
+					if($this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'") === false){
+						throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+					}
+					if($this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}") === false){
+						throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+					}
 				}
 
 				//close database connection_aborted

From f73090934398228f00c4aa9953c8696314aa5458 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:40:36 +0000
Subject: [PATCH 21/37] improved message related to config_lua

---
 .../resources/classes/install_fusionpbx.php   |  1 +
 .../resources/classes/install_switch.php      | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index c0a7c22d7b..4304b02091 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -77,6 +77,7 @@ include "root.php";
 			else {
 				$this->config_php = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php";
 			}
+			$this->config_php = normalize_path_for_os($this->config_php);
 		}
 
 		function write_debug($message) {
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 3d7558b88c..cd07d59600 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -31,6 +31,7 @@ include "root.php";
 		protected $domain_uuid;
 		protected $domain_name;
 		protected $detect_switch;
+		protected $config_lua;
 
 		public $debug = false;
 
@@ -48,6 +49,15 @@ include "root.php";
 			$this->domain_uuid = $domain_uuid;
 			$this->domain = $domain_name;
 			$this->detect_switch = $detect_switch;
+			if (is_dir("/etc/fusionpbx")){
+				$config = "/etc/fusionpbx/config.lua";
+			} elseif (is_dir("/usr/local/etc/fusionpbx")){
+				$config = "/usr/local/etc/fusionpbx/config.lua";
+			}
+			else {
+				$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
+			}
+			$this->config_lua = normalize_path_for_os($this->config_lua);
 		}
 
 		//utility Functions
@@ -266,8 +276,8 @@ include "root.php";
 		}
 
 		function create_config_lua() {
-		$this->write_progress("\Creating config.lua");
-		global $db;
+			$this->write_progress("\tCreating " . $this->config_lua);
+			global $db;
 		//get the odbc information
 			$sql = "select count(*) as num_rows from v_databases ";
 			$sql .= "where database_driver = 'odbc' ";
@@ -298,17 +308,9 @@ include "root.php";
 			}
 
 		//config.lua
-			if (is_dir("/etc/fusionpbx")){
-				$config = "/etc/fusionpbx/config.lua";
-			} elseif (is_dir("/usr/local/etc/fusionpbx")){
-				$config = "/usr/local/etc/fusionpbx/config.lua";
-			}
-			else {
-				$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
-			}
-			$fout = fopen($config,"w");
+			$fout = fopen($this->config_lua,"w");
 			if(!$fout){
-				throw new Exception("Failed to open '$config' for writing");
+				throw new Exception("Failed to open '{$this->config_lua}' for writing");
 			}
 			$tmp = "\n";
 			$tmp .= "--set the variables\n";

From 64f103ddbb7aecdd2d9942a6544089a7758ba56e Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:42:54 +0000
Subject: [PATCH 22/37] corrected call to normalize_path_to_os

---
 core/install/resources/classes/install_fusionpbx.php | 2 +-
 core/install/resources/classes/install_switch.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 4304b02091..f6047725de 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -77,7 +77,7 @@ include "root.php";
 			else {
 				$this->config_php = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php";
 			}
-			$this->config_php = normalize_path_for_os($this->config_php);
+			$this->config_php = normalize_path_to_os($this->config_php);
 		}
 
 		function write_debug($message) {
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index cd07d59600..93258ffd6d 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -57,7 +57,7 @@ include "root.php";
 			else {
 				$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
 			}
-			$this->config_lua = normalize_path_for_os($this->config_lua);
+			$this->config_lua = normalize_path_to_os($this->config_lua);
 		}
 
 		//utility Functions

From 8c8cf44b4cee8f52fad0d6678a092ee84593ab68 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:47:18 +0000
Subject: [PATCH 23/37] stored config_lua path correctly

---
 core/install/install_first_time.php               | 2 +-
 core/install/resources/classes/install_switch.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 86d3823aa6..a7a40ad75e 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -45,7 +45,7 @@ require_once "resources/classes/text.php";
 	$db_name = '';
 	$db_username = '';
 	$db_password = '';
-	$db_create_option = 'none';
+	$db_create = '';
 	$db_create_username = '';
 	$db_create_password = '';
 
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 93258ffd6d..75c69bb264 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -50,12 +50,12 @@ include "root.php";
 			$this->domain = $domain_name;
 			$this->detect_switch = $detect_switch;
 			if (is_dir("/etc/fusionpbx")){
-				$config = "/etc/fusionpbx/config.lua";
+				$this->config_lua = "/etc/fusionpbx/config.lua";
 			} elseif (is_dir("/usr/local/etc/fusionpbx")){
-				$config = "/usr/local/etc/fusionpbx/config.lua";
+				$this->config_lua = "/usr/local/etc/fusionpbx/config.lua";
 			}
 			else {
-				$config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
+				$this->config_lua = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
 			}
 			$this->config_lua = normalize_path_to_os($this->config_lua);
 		}

From c0382a0a474e6713fae2ebe5701fffa08e7cc094 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 16:57:06 +0000
Subject: [PATCH 24/37] corrected path build

---
 core/install/resources/classes/install_switch.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 75c69bb264..b84faea8e5 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -55,7 +55,7 @@ include "root.php";
 				$this->config_lua = "/usr/local/etc/fusionpbx/config.lua";
 			}
 			else {
-				$this->config_lua = $_SESSION['switch']['scripts']['dir']."/resources/config.lua";
+				$this->config_lua = $this->detect_switch->scripts_dir."/resources/config.lua";
 			}
 			$this->config_lua = normalize_path_to_os($this->config_lua);
 		}
@@ -270,8 +270,12 @@ include "root.php";
 				if (is_readable($script_dir)) {
 					$this->recursive_copy($src_dir, $dst_dir, $_SESSION['scripts']['options']['text']);
 					unset($src_dir, $dst_dir);
+				}else{
+					throw new Exception("Cannot read from '$script_dir' to get teh scripts");
 				}
 				chmod($dst_dir, 0774);
+			}else{
+				$this->write_progress("\tSkipping scripts, scripts_dir is unset");
 			}
 		}
 

From 0fb8a126ff55c97fae9bdfda4bbf3c59d63f951a Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 17:00:41 +0000
Subject: [PATCH 25/37] added normalize to OS before using copy under win

---
 core/install/resources/classes/install_switch.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index b84faea8e5..9effdd3396 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -86,6 +86,8 @@ include "root.php";
 				exec ($cmd);
 			}
 			elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
+				$src = normalize_path_to_os($src);
+				$dst = normalize_path_to_os($dst);
 				exec("copy /L '$src' '$dst'");
 			}
 			else {

From a3d3e539e5ec8ccd4eafbf63944fa221c707967e Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 17:02:38 +0000
Subject: [PATCH 26/37] corrected typo

---
 core/install/resources/classes/install_switch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 9effdd3396..d20888801e 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -55,7 +55,7 @@ include "root.php";
 				$this->config_lua = "/usr/local/etc/fusionpbx/config.lua";
 			}
 			else {
-				$this->config_lua = $this->detect_switch->scripts_dir."/resources/config.lua";
+				$this->config_lua = $this->detect_switch->script_dir."/resources/config.lua";
 			}
 			$this->config_lua = normalize_path_to_os($this->config_lua);
 		}

From 4f58c9315ae78f3b9ed2af4bdc91cd23877e3c33 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 17:30:46 +0000
Subject: [PATCH 27/37] added better quoting for windows

---
 .../install/resources/classes/install_switch.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index d20888801e..14e9dc64b1 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -88,7 +88,7 @@ include "root.php";
 			elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
 				$src = normalize_path_to_os($src);
 				$dst = normalize_path_to_os($dst);
-				exec("copy /L '$src' '$dst'");
+				exec("copy /L /Y \"$src\" \"$dst\"");
 			}
 			else {
 				$dir = opendir($src);
@@ -149,8 +149,9 @@ include "root.php";
 				exec ('rm -Rf '.$dir.'/*');
 			}
 			elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
-				$this->write_debug("del /S /F /Q '$dir'");
-				exec("del /S /F /Q '$dir'");
+				$dst = normalize_path_to_os($dst);
+				$this->write_debug("del /S /F /Q \"$dir\"");
+				exec("del /S /F /Q \"$dir\"");
 			}
 			else {
 				foreach (glob($dir) as $file) {
@@ -255,12 +256,7 @@ include "root.php";
 
 		function copy_scripts() {
 			$this->write_progress("\tCopying Scripts");
-			if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
-				$script_dir = $_SESSION['switch']['scripts']['dir'];
-			}
-			else {
-				$script_dir = $this->detect_switch->script_dir();
-			}
+			$script_dir = $this->detect_switch->script_dir();
 			if (file_exists($script_dir)) {
 				if (file_exists('/usr/share/examples/fusionpbx/resources/install/scripts')){
 					$src_dir = '/usr/share/examples/fusionpbx/resources/install/scripts';
@@ -273,7 +269,7 @@ include "root.php";
 					$this->recursive_copy($src_dir, $dst_dir, $_SESSION['scripts']['options']['text']);
 					unset($src_dir, $dst_dir);
 				}else{
-					throw new Exception("Cannot read from '$script_dir' to get teh scripts");
+					throw new Exception("Cannot read from '$src_dir' to get the scripts");
 				}
 				chmod($dst_dir, 0774);
 			}else{

From d4fa22dbec067d29262c78dd74b88542f0b6acd8 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Tue, 1 Dec 2015 17:34:04 +0000
Subject: [PATCH 28/37] changed to xcopy for windows

---
 core/install/resources/classes/install_switch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 14e9dc64b1..6e9155eb96 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -88,7 +88,7 @@ include "root.php";
 			elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
 				$src = normalize_path_to_os($src);
 				$dst = normalize_path_to_os($dst);
-				exec("copy /L /Y \"$src\" \"$dst\"");
+				exec("xcopy /E /Y \"$src\" \"$dst\"");
 			}
 			else {
 				$dir = opendir($src);

From aff613d3e97d5ae69edcafa00e76b49110581ccd Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 11:16:25 +0000
Subject: [PATCH 29/37] restructured install to go via global_settings

added new global_settings to marshal settings used during a
install/upgrade
---
 app/settings/app_defaults.php                 |   2 +-
 core/install/install_first_time.php           |  21 +-
 .../resources/classes/detect_switch.php       |  77 +++---
 .../resources/classes/global_settings.php     | 192 ++++++++++++++
 .../resources/classes/install_fusionpbx.php   | 245 ++++++++----------
 .../resources/classes/install_switch.php      | 115 ++++----
 6 files changed, 411 insertions(+), 241 deletions(-)
 create mode 100644 core/install/resources/classes/global_settings.php

diff --git a/app/settings/app_defaults.php b/app/settings/app_defaults.php
index d192510c79..7cc0757849 100644
--- a/app/settings/app_defaults.php
+++ b/app/settings/app_defaults.php
@@ -85,7 +85,7 @@ if ($domains_processed == 1) {
 			$sql .= "set event_socket_ip_address = '$event_socket_ip_address' ";
 			$sql .= "set event_socket_port = '$event_socket_port' ";
 			$sql .= "set event_socket_password = '$event_socket_password' ";
-			$this->dbh->exec(check_sql($sql));
+			$db->exec(check_sql($sql));
 			unset($sql);
 		}
 }
diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index a7a40ad75e..82abc3e2e0 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -267,10 +267,10 @@ if(!$install_step) { $install_step = 'select_language'; }
 		//if($_SERVER['HTTPS']) { $protocol = 'https'; }
 		//echo "<iframe src='$protocol://$domain_name/core/install/install_first_time.php' style='border:solid 1px #000;width:100%;height:auto'></iframe>";
 		require_once "core/install/resources/classes/detect_switch.php";
-		$switch_detect = new detect_switch($event_host, $event_port, $event_password);
+		$detect_switch = new detect_switch($event_host, $event_port, $event_password);
 		$detect_ok = true;
 		try {
-			$switch_detect->detect();
+			$detect_switch->detect();
 		} catch(Exception $e){
 			echo "<p>Failed to detect configuration detect_switch reported: " . $e->getMessage() . "</p>\n";
 			$detect_ok = false;
@@ -294,34 +294,31 @@ if(!$install_step) { $install_step = 'select_language'; }
 			}
 			#set_error_handler("error_handler");
 			try {
+				require_once "resources/classes/global_settings.php";
+				$settings = new global_settings($detect_switch, $domain_name);
+
 				require_once "resources/classes/install_fusionpbx.php";
-				$system = new install_fusionpbx($domain_name, null, $switch_detect);
-				$domain_uuid = $system->domain_uuid();
+				$system = new install_fusionpbx($settings);
 				$system->admin_username = $admin_username;
 				$system->admin_password = $admin_password;
 				$system->default_country = $install_default_country;
 				$system->install_language = $install_language;
 				$system->template_name = $install_template_name;
-				foreach($_POST as $key=>$value){
-					if(substr($key,0,3) == "db_"){
-						$system->$key = $value;
-					}
-				}
 
 				require_once "resources/classes/install_switch.php";
-				$switch = new install_switch($domain_name, $domain_uuid, $switch_detect);
+				$switch = new install_switch($settings);
 				//$switch->debug = true;
 				//$system->debug = true;
 				$system->install();
 				$switch->install();
 				$system->app_defaults();
-				$switch_detect->restart_switch();
+				$detect_switch->restart_switch();
 			}catch(Exception $e){
 				echo "</pre>\n";
 				echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";
 				try {
 					require_once "resources/classes/install_fusionpbx.php";
-					$system = new install_fusionpbx($domain_name, $domain_uuid, $switch_detect);
+					$system = new install_fusionpbx($domain_name, $domain_uuid, $detect_switch);
 					$system->remove_config();
 				}catch(Exception $e){
 					echo "<p><b>Failed to remove config:</b> " . $e->getMessage() . "</p>\n";
diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index b85ef4600b..dc46069d7b 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -31,11 +31,19 @@ require_once "resources/classes/EventSocket.php";
 	class detect_switch {
 
 		// cached data
-		protected $_folders;
+		protected $_dirs;
+		protected $_vdirs;
+		public function get_dirs()	{ return $this->_dirs; }
+		public function get_vdirs()	{ return $this->_vdirs; }
+
 		// version information
 		protected $_major;
 		protected $_minor;
 		protected $_build;
+		public function major()		{ return $this->_major; }
+		public function minor()		{ return $this->_minor; }
+		public function build()		{ return $this->_build; }
+		public function version()	{ return $this->_major.".".$this->_minor.".".$this->_build; }
 
 		// dirs - detected by from the switch
 		protected $_base_dir = '';
@@ -55,30 +63,23 @@ require_once "resources/classes/EventSocket.php";
 		protected $_sounds_dir = '';
 		protected $_storage_dir = '';
 		protected $_temp_dir = '';
-
-		public function major() { return $this->_major; }
-		public function minor() { return $this->_minor; }
-		public function build() { return $this->_build; }
-		public function version() { return $this->_major.".".$this->_minor.".".$this->_build; }
-		public function base_dir() { return $this->_base_dir; }
-		public function cache_dir() { return $this->_cache_dir; }
-		public function certs_dir() { return $this->_certs_dir; }
-		public function conf_dir() { return $this->_conf_dir; }
-		public function db_dir() { return $this->_db_dir; }
-		public function external_ssl_dir() { return $this->_external_ssl_dir; }
-		public function grammar_dir() { return $this->_grammar_dir; }
-		public function htdocs_dir() { return $this->_htdocs_dir; }
-		public function internal_ssl_dir() { return $this->_internal_ssl_dir; }
-		public function log_dir() { return $this->_log_dir; }
-		public function mod_dir() { return $this->_mod_dir; }
-		public function recordings_dir() { return $this->_recordings_dir; }
-		public function run_dir() { return $this->_run_dir; }
-		public function script_dir() { return $this->_script_dir; }
-		public function sounds_dir() { return $this->_sounds_dir; }
-		public function storage_dir() { return $this->_storage_dir; }
-		public function temp_dir() { return $this->_temp_dir; }
-		public function get_dirs() {	return $this->_dirs;	}
-		public function get_vdirs() {	return $this->_vdirs;	}
+		public function base_dir()			{ return $this->_base_dir; }
+		public function cache_dir()			{ return $this->_cache_dir; }
+		public function certs_dir()			{ return $this->_certs_dir; }
+		public function conf_dir()			{ return $this->_conf_dir; }
+		public function db_dir()			{ return $this->_db_dir; }
+		public function external_ssl_dir()	{ return $this->_external_ssl_dir; }
+		public function grammar_dir()		{ return $this->_grammar_dir; }
+		public function htdocs_dir()		{ return $this->_htdocs_dir; }
+		public function internal_ssl_dir()	{ return $this->_internal_ssl_dir; }
+		public function log_dir()			{ return $this->_log_dir; }
+		public function mod_dir()			{ return $this->_mod_dir; }
+		public function recordings_dir()	{ return $this->_recordings_dir; }
+		public function run_dir()			{ return $this->_run_dir; }
+		public function script_dir()		{ return $this->_script_dir; }
+		public function sounds_dir()		{ return $this->_sounds_dir; }
+		public function storage_dir()		{ return $this->_storage_dir; }
+		public function temp_dir()			{ return $this->_temp_dir; }
 
 		// virtual dirs - assumed based on the detected dirs
 		protected $_voicemail_vdir = '';
@@ -87,13 +88,12 @@ require_once "resources/classes/EventSocket.php";
 		protected $_sip_profiles_vdir = '';
 		protected $_dialplan_vdir = '';
 		protected $_backup_vdir = '';
-
-		public function voicemail_vdir() { return $this->_voicemail_vdir; }
-		public function phrases_vdir() { return $this->_phrases_vdir; }
-		public function extensions_vdir() { return $this->_extensions_vdir; }
-		public function sip_profiles_vdir() { return $this->_sip_profiles_vdir; }
-		public function dialplan_vdir() { return $this->_dialplan_vdir; }
-		public function backup_vdir() { return $this->_backup_vdir; }
+		public function voicemail_vdir()	{ return $this->_voicemail_vdir; }
+		public function phrases_vdir()		{ return $this->_phrases_vdir; }
+		public function extensions_vdir()	{ return $this->_extensions_vdir; }
+		public function sip_profiles_vdir()	{ return $this->_sip_profiles_vdir; }
+		public function dialplan_vdir()		{ return $this->_dialplan_vdir; }
+		public function backup_vdir()		{ return $this->_backup_vdir; }
 
 		// event socket
 		public $event_host = 'localhost';
@@ -102,6 +102,7 @@ require_once "resources/classes/EventSocket.php";
 		protected $event_socket;
 
 		public function __construct($event_host, $event_port, $event_password) {
+			//do not take these settings from session as they be detecting a new switch
 			if($event_host){		$this->event_host = $event_host; }
 			if($event_port){		$this->event_port = $event_port; }
 			if($event_password){	$this->event_password = $event_password; }
@@ -137,12 +138,12 @@ require_once "resources/classes/EventSocket.php";
 					$this->$field = normalize_path($matches[2]);
 				}
 			}
-			$this->_voicemail_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail")));
-			$this->_phrases_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang")));
-			$this->_extensions_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory")));
-			$this->_sip_profiles_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles")));
-			$this->_dialplan_vdir = normalize_path(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan")));
-			$this->_backup_vdir = normalize_path(sys_get_temp_dir());
+			$this->_voicemail_vdir = 	normalize_path($this->_storage_dir . DIRECTORY_SEPARATOR . "voicemail");
+			$this->_phrases_vdir = 		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "lang");
+			$this->_extensions_vdir = 	normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "directory");
+			$this->_sip_profiles_vdir =	normalize_path(($this->_conf_dir . DIRECTORY_SEPARATOR . "sip_profiles");
+			$this->_dialplan_vdir =		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "dialplan");
+			$this->_backup_vdir =		normalize_path(sys_get_temp_dir());
 		}	
 	
 		protected function connect_event_socket(){
diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php
new file mode 100644
index 0000000000..24f4e89ecc
--- /dev/null
+++ b/core/install/resources/classes/global_settings.php
@@ -0,0 +1,192 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Copyright (C) 2010-2015
+	All Rights Reserved.
+
+	Contributor(s):
+	Matthew Vale <github@mafoo.org>
+	
+*/
+require_once "root.php";
+
+//define the install class
+	class global_settings {
+
+		// cached data
+		protected $_dirs;
+		protected $_vdirs;
+		public function get_switch_dirs()	{ return $this->_switch_dirs; }
+		public function get_switch_vdirs()	{ return $this->_switch_vdirs; }
+
+		// dirs - detected by from the switch
+		protected $_switch_base_dir = '';
+		protected $_switch_cache_dir = '';
+		protected $_switch_certs_dir = '';
+		protected $_switch_conf_dir = '';
+		protected $_switch_db_dir = '';
+		protected $_switch_external_ssl_dir = '';
+		protected $_switch_grammar_dir = '';
+		protected $_switch_htdocs_dir = '';
+		protected $_switch_internal_ssl_dir = '';
+		protected $_switch_log_dir = '';
+		protected $_switch_mod_dir = '';
+		protected $_switch_recordings_dir = '';
+		protected $_switch_run_dir = '';
+		protected $_switch_script_dir = '';
+		protected $_switch_sounds_dir = '';
+		protected $_switch_storage_dir = '';
+		protected $_switch_temp_dir = '';
+		public function switch_base_dir()			{ return $this->_switch_base_dir; }
+		public function switch_cache_dir()			{ return $this->_switch_cache_dir; }
+		public function switch_certs_dir()			{ return $this->_switch_certs_dir; }
+		public function switch_conf_dir()			{ return $this->_switch_conf_dir; }
+		public function switch_db_dir()				{ return $this->_switch_db_dir; }
+		public function switch_external_ssl_dir()	{ return $this->_switch_external_ssl_dir; }
+		public function switch_grammar_dir()		{ return $this->_switch_grammar_dir; }
+		public function switch_htdocs_dir()			{ return $this->_switch_htdocs_dir; }
+		public function switch_internal_ssl_dir()	{ return $this->_switch_internal_ssl_dir; }
+		public function switch_log_dir()			{ return $this->_switch_log_dir; }
+		public function switch_mod_dir()			{ return $this->_switch_mod_dir; }
+		public function switch_recordings_dir()		{ return $this->_switch_recordings_dir; }
+		public function switch_run_dir()			{ return $this->_switch_run_dir; }
+		public function switch_script_dir()			{ return $this->_switch_script_dir; }
+		public function switch_sounds_dir()			{ return $this->_switch_sounds_dir; }
+		public function switch_storage_dir()		{ return $this->_switch_storage_dir; }
+		public function switch_temp_dir()			{ return $this->_switch_temp_dir; }
+
+		// virtual dirs - assumed based on the detected dirs
+		protected $_switch_voicemail_vdir = '';
+		protected $_switch_phrases_vdir = '';
+		protected $_switch_extensions_vdir = '';
+		protected $_switch_sip_profiles_vdir = '';
+		protected $_switch_dialplan_vdir = '';
+		protected $_switch_backup_vdir = '';
+		public function switch_voicemail_vdir()	{ return $this->_switch_voicemail_vdir; }
+		public function switch_phrases_vdir()		{ return $this->_switch_phrases_vdir; }
+		public function switch_extensions_vdir()	{ return $this->_switch_extensions_vdir; }
+		public function switch_sip_profiles_vdir()	{ return $this->_switch_sip_profiles_vdir; }
+		public function switch_dialplan_vdir()		{ return $this->_switch_dialplan_vdir; }
+		public function switch_backup_vdir()		{ return $this->_switch_backup_vdir; }
+
+		// event socket
+		protected $_switch_event_host;
+		protected $_switch_event_port;
+		protected $_switch_event_password;
+		public function switch_event_host()		{ return $this->_switch_event_host; }
+		public function switch_event_port()		{ return $this->_switch_event_port; }
+		public function switch_event_password()	{ return $this->_switch_event_password; }
+
+		// database information
+		protected $_db_type;
+		protected $_db_path;
+		protected $_db_host;
+		protected $_db_port;
+		protected $_db_name;
+		protected $_db_username;
+		protected $_db_password;
+		protected $_db_create;
+		protected $_db_create_username;
+		protected $_db_create_password;
+		public function db_type()	 			{return $this->_db_type; }
+		public function db_path()	 			{return $this->_db_path; }
+		public function db_host()	 			{return $this->_db_host; }
+		public function db_port()	 			{return $this->_db_port; }
+		public function db_name()	 			{return $this->_db_name; }
+		public function db_username()	 		{return $this->_db_username; }
+		public function db_password()	 		{return $this->_db_password; }
+		public function db_create()	 			{return $this->_db_create; }
+		public function db_create_username()	{return $this->_db_create_username; }
+		public function db_create_password()	{return $this->_db_create_password; }
+
+		//misc information
+		protected $_domain_count;
+		public function domain_count()	 		{return $this->_domain_count; }
+
+		public function __construct($detect_switch, $domain_name, $domain_uuid) {
+			$this->_switch_dirs = preg_grep ('/^switch_.*_dir$/', get_class_methods('global_settings') );
+			sort( $this->_switch_dirs );
+			$this->_switch_vdirs = preg_grep ('/^switch_.*_vdir$/', get_class_methods('global_settings') );
+			sort( $this->_switch_vdirs );
+
+			if($detect_switch == null){
+				//take settings from session
+				foreach ($this->_switch_dirs as $dir){
+					$session_var;
+					preg_match( '^switch_.*_dir$', $dir, $session_var);
+					$this->$dir = $_SESSION['switch'][$session_var[0]]['dir'];
+				}
+				foreach ($this->_switch_vdirs as $vdir){
+					$session_var;
+					preg_match( '^switch_.*_vdir$', $vdir, $session_var);
+					$this->$vdir = $_SESSION['switch'][$session_var[0]]['dir'];
+				}
+				$this->switch_event_host		= $_SESSION['event_socket_ip_address'];
+				$this->switch_event_port		= $_SESSION['event_socket_port'];
+				$this->switch_event_password	= $_SESSION['event_socket_password'];
+				
+				// domain info
+				$this->domain_name = $_SESSION['domain_name'];
+				$this->domain_uuid = $_SESSION['domain_uuid'];
+
+				// collect misc info
+				$this->domain_count = count($_SESSION["domains"]);
+
+				// collect db_info
+				global $db_type, $db_path, $db_host, $db_port, $db_name, $db_username, $db_password;
+				$this->_db_type = $db_type;
+				$this->_db_path = $db_path;
+				$this->_db_host = $db_host;
+				$this->_db_port = $db_port;
+				$this->_db_name = $db_name;
+				$this->_db_username = $db_username;
+				$this->_db_password = $db_password;
+
+			}elseif(!is_a($detect_switch, 'detect_switch')){
+				throw new Exception('The parameter $detect_switch must be a detect_switch object (or a subclass of)');
+
+			}else{
+				//copy from detect_switch
+				foreach($detect_switch->switch_dirs() as $dir){
+					$t_dir = "_$dir";
+					$this->$t_dir = $detect_switch->$dir();
+				}
+				foreach($detect_switch->switch_vdirs() as $vdir){
+					$t_vdir = "_$vdir";
+					$this->$t_vdir = $detect_switch->$vdir();
+				}
+
+				//copy from _POST
+				foreach($_POST as $key=>$value){
+					if(substr($key,0,3) == "db_"){
+						$this->$key = $value;
+					}
+				}
+
+				// domain info
+				if($domain_uuid == null){ $domain_uuid = uuid(); }
+				$this->domain_name = $domain_name;
+				$this->domain_uuid = $domain_uuid;
+
+				//collect misc info
+				$this->_domain_count = 1;	//assumed to be one
+			}
+		}
+	}
+?>
\ No newline at end of file
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index f6047725de..17bfa24f0c 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -29,9 +29,7 @@ include "root.php";
 //define the install class
 	class install_fusionpbx {
 
-		protected $_domain_uuid;
-		protected $domain_name;
-		protected $detect_switch;
+		protected $global_settings;
 		protected $config_php;
 		protected $menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286';
 		protected $dbh;
@@ -47,25 +45,11 @@ include "root.php";
 	 	public $default_country = 'US';
 		public $template_name = 'enhanced';
 
-	 	public $db_type;
-		public $db_path;
-		public $db_host;
-		public $db_port;
-		public $db_name;
-		public $db_username;
-		public $db_password;
-		public $db_create;
-		public $db_create_username;
-		public $db_create_password;
-
-	 	function __construct($domain_name, $domain_uuid, $detect_switch) {
-			if(!is_a($detect_switch, 'detect_switch')){
-				throw new Exception('The parameter $detect_switch must be a detect_switch object (or a subclass of)');
+	 	function __construct($global_settings) {
+			if(!is_a($global_settings, 'global_settings')){
+				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
-			if($domain_uuid == null){ $domain_uuid = uuid(); }
-			$this->_domain_uuid = $domain_uuid;
-			$this->domain_name = $domain_name;
-			$this->detect_switch = $detect_switch;
+			$this->global_settings = $global_settings;
 			if (is_dir("/etc/fusionpbx")){
 				$this->config_php = "/etc/fusionpbx/config.php";
 			} elseif (is_dir("/usr/local/etc/fusionpbx")){
@@ -138,26 +122,26 @@ include "root.php";
 			$tmp_config .= "//-----------------------------------------------------\n";
 			$tmp_config .= "\n";
 			$tmp_config .= "	//set the database type\n";
-			$tmp_config .= "		\$db_type = '".$this->db_type."'; //sqlite, mysql, pgsql, others with a manually created PDO connection\n";
+			$tmp_config .= "		\$db_type = '".$this->global_settings->db_type()."'; //sqlite, mysql, pgsql, others with a manually created PDO connection\n";
 			$tmp_config .= "\n";
-			if ($this->db_type == "sqlite") {
+			if ($this->global_settings->db_type() == "sqlite") {
 				$tmp_config .= "	//sqlite: the db_name and db_path are automatically assigned however the values can be overidden by setting the values here.\n";
-				$tmp_config .= "		\$db_name = '".$this->db_name."'; //host name/ip address + '.db' is the default database filename\n";
-				$tmp_config .= "		\$db_path = '".$this->db_path."'; //the path is determined by a php variable\n";
+				$tmp_config .= "		\$db_name = '".$this->global_settings->db_name()."'; //host name/ip address + '.db' is the default database filename\n";
+				$tmp_config .= "		\$db_path = '".$this->global_settings->db_path()."'; //the path is determined by a php variable\n";
 			}
 			$tmp_config .= "\n";
 			$tmp_config .= "	//mysql: database connection information\n";
-			if ($this->db_type == "mysql") {
-				if ($this->db_host == "localhost") {
+			if ($this->global_settings->db_type() == "mysql") {
+				if ($this->global_settings->db_host() == "localhost") {
 					//if localhost is used it defaults to a Unix Socket which doesn't seem to work.
 					//replace localhost with 127.0.0.1 so that it will connect using TCP
-					$this->db_host = "127.0.0.1";
+					$this->global_settings->db_host() = "127.0.0.1";
 				}
-				$tmp_config .= "		\$db_host = '".$this->db_host."';\n";
-				$tmp_config .= "		\$db_port = '".$this->db_port."';\n";
-				$tmp_config .= "		\$db_name = '".$this->db_name."';\n";
-				$tmp_config .= "		\$db_username = '".$this->db_username."';\n";
-				$tmp_config .= "		\$db_password = '".$this->db_password."';\n";
+				$tmp_config .= "		\$db_host = '".$this->global_settings->db_host()."';\n";
+				$tmp_config .= "		\$db_port = '".$this->global_settings->db_port()."';\n";
+				$tmp_config .= "		\$db_name = '".$this->global_settings->db_name()."';\n";
+				$tmp_config .= "		\$db_username = '".$this->global_settings->db_username()."';\n";
+				$tmp_config .= "		\$db_password = '".$this->global_settings->db_password()."';\n";
 			}
 			else {
 				$tmp_config .= "		//\$db_host = '';\n";
@@ -168,19 +152,19 @@ include "root.php";
 			}
 			$tmp_config .= "\n";
 			$tmp_config .= "	//pgsql: database connection information\n";
-			if ($this->db_type == "pgsql") {
-				$tmp_config .= "		\$db_host = '".$this->db_host."'; //set the host only if the database is not local\n";
-				$tmp_config .= "		\$db_port = '".$this->db_port."';\n";
-				$tmp_config .= "		\$db_name = '".$this->db_name."';\n";
-				$tmp_config .= "		\$db_username = '".$this->db_username."';\n";
-				$tmp_config .= "		\$db_password = '".$this->db_password."';\n";
+			if ($this->global_settings->db_type() == "pgsql") {
+				$tmp_config .= "		\$db_host = '".$this->global_settings->db_host()."'; //set the host only if the database is not local\n";
+				$tmp_config .= "		\$db_port = '".$this->global_settings->db_port()."';\n";
+				$tmp_config .= "		\$db_name = '".$this->global_settings->db_name()."';\n";
+				$tmp_config .= "		\$db_username = '".$this->global_settings->db_username()."';\n";
+				$tmp_config .= "		\$db_password = '".$this->global_settings->db_password()."';\n";
 			}
 			else {
-				$tmp_config .= "		//\$db_host = '".$this->db_host."'; //set the host only if the database is not local\n";
-				$tmp_config .= "		//\$db_port = '".$this->db_port."';\n";
-				$tmp_config .= "		//\$db_name = '".$this->db_name."';\n";
-				$tmp_config .= "		//\$db_username = '".$this->db_username."';\n";
-				$tmp_config .= "		//\$db_password = '".$this->db_password."';\n";
+				$tmp_config .= "		//\$db_host = '".$this->global_settings->db_host()."'; //set the host only if the database is not local\n";
+				$tmp_config .= "		//\$db_port = '".$this->global_settings->db_port()."';\n";
+				$tmp_config .= "		//\$db_name = '".$this->global_settings->db_name()."';\n";
+				$tmp_config .= "		//\$db_username = '".$this->global_settings->db_username()."';\n";
+				$tmp_config .= "		//\$db_password = '".$this->global_settings->db_password()."';\n";
 			}
 			$tmp_config .= "\n";
 			$tmp_config .= "	//show errors\n";
@@ -205,23 +189,24 @@ include "root.php";
 
 		protected function create_database() {
 			require $this->config_php;
-			$this->write_progress("\tUsing database as type " . $this->db_type);
-			if($this->db_create and strlen($this->db_create_username) == 0)
-			{
-				$this->db_create_username = $this->db_username;
-				$this->db_create_password = $this->db_password;
-			}
-			$function = "create_database_" . $this->db_type;
-			$this->$function();
 			global $db;
 			$db = $this->dbh;
 
+			$this->write_progress("\tUsing database as type " . $this->global_settings->db_type());
+			if($this->global_settings->db_create() and strlen($this->global_settings->db_create_username()) == 0)
+			{
+				$this->global_settings->db_create_username() = $this->global_settings->db_username();
+				$this->global_settings->db_create_password() = $this->global_settings->db_password();
+			}
+			$function = "create_database_" . $this->global_settings->db_type();
+			$this->$function();
+
 			//sqlite is natively supported under all known OS'es
-			if($this->db_type != 'sqlite'){
+			if($this->global_settings->db_type() != 'sqlite'){
 				if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
 				//non sqlite database support only uses ODBC under windows
 					$this->create_odbc_database_connection();
-				}elseif($this->db_type != 'pgsql'){
+				}elseif($this->global_settings->db_type() != 'pgsql'){
 				//switch supports postgresql natively
 					$this->create_odbc_database_connection();
 				}
@@ -236,7 +221,7 @@ include "root.php";
 		protected function create_database_sqlite() {
 		//sqlite database will be created when the config.php is loaded and only if the database file does not exist
 			try {
-				$this->dbh = new PDO('sqlite:'.$this->db_path.'/'.$this->db_name); //sqlite 3
+				$this->dbh = new PDO('sqlite:'.$this->global_settings->db_path().'/'.$this->global_settings->db_name()); //sqlite 3
 				//$this->dbh = new PDO('sqlite::memory:'); //sqlite 3
 			}
 			catch (PDOException $error) {
@@ -258,7 +243,7 @@ include "root.php";
 			require_once "resources/classes/schema.php";
 			$schema = new schema;
 			$schema->db = $this->dbh;
-			$schema->db_type = $this->db_type;
+			$schema->db_type = $this->global_settings->db_type();
 			$schema->sql();
 			$schema->exec();
 
@@ -292,34 +277,34 @@ include "root.php";
 			$this->dbh->commit();
 
 		//set the file permissions
-			chmod($this->db_path.'/'.$this->db_name, 0777);
+			chmod($this->global_settings->db_path().'/'.$this->global_settings->db_name(), 0777);
 		}
 
 		protected function create_database_pgsql() {
-			if ($this->db_create) {
+			if ($this->global_settings->db_create()) {
 			//Attempt to create new PG role and database
 				$this->write_progress("\tCreating database");
 				try {
-					if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
-					if (strlen($this->db_host) > 0) {
-						$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
+					if (strlen($this->global_settings->db_port()) == 0) { $this->global_settings->db_port() = "5432"; }
+					if (strlen($this->global_settings->db_host()) > 0) {
+						$this->dbh = new PDO("pgsql:host={$this->global_settings->db_host()} port={$this->global_settings->db_port()} user={$this->global_settings->db_create_username()} password={$this->global_settings->db_create_password()} dbname=template1");
 					} else {
-						$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_create_username} password={$this->db_create_password} dbname=template1");
+						$this->dbh = new PDO("pgsql:host=localhost port={$this->global_settings->db_port()} user={$this->global_settings->db_create_username()} password={$this->global_settings->db_create_password()} dbname=template1");
 					}
 				} catch (PDOException $error) {
 					throw new Exception("error connecting to database in order to create: " . $error->getMessage());
 				}
 
 				//create the database, user, grant perms
-				if($this->dbh->exec("CREATE DATABASE {$this->db_name}") === false) {
-					throw new Exception("Failed to create database {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+				if($this->dbh->exec("CREATE DATABASE {$this->global_settings->db_name()}") === false) {
+					throw new Exception("Failed to create database {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo()));
 				}
-				if($this->db_username != $this->db_create_username){
-					if($this->dbh->exec("CREATE USER {$this->db_username} WITH PASSWORD '{$this->db_password}'") === false){
-						throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+				if($this->global_settings->db_username() != $this->global_settings->db_create_username()){
+					if($this->dbh->exec("CREATE USER {$this->global_settings->db_username()} WITH PASSWORD '{$this->global_settings->db_password()}'") === false){
+						throw new Exception("Failed to create user {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo()));
 					}
-					if($this->dbh->exec("GRANT ALL ON {$this->db_name} TO {$this->db_username}") === false){
-						throw new Exception("Failed to create user {$this->db_name}: " . join(":", $this->dbh->errorInfo()));
+					if($this->dbh->exec("GRANT ALL ON {$this->global_settings->db_name()} TO {$this->global_settings->db_username()}") === false){
+						throw new Exception("Failed to create user {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo()));
 					}
 				}
 
@@ -328,13 +313,13 @@ include "root.php";
 			}
 
 			$this->write_progress("\tInstalling data to database");				
-		//open database connection with $this->db_name
+		//open database connection with $this->global_settings->db_name()
 			try {
-				if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
-				if (strlen($this->db_host) > 0) {
-					$this->dbh = new PDO("pgsql:host={$this->db_host} port={$this->db_port} dbname={$this->db_name} user={$this->db_username} password={$this->db_password}");
+				if (strlen($this->global_settings->db_port()) == 0) { $this->global_settings->db_port() = "5432"; }
+				if (strlen($this->global_settings->db_host()) > 0) {
+					$this->dbh = new PDO("pgsql:host={$this->global_settings->db_host()} port={$this->global_settings->db_port()} dbname={$this->global_settings->db_name()} user={$this->global_settings->db_username()} password={$this->global_settings->db_password()}");
 				} else {
-					$this->dbh = new PDO("pgsql:host=localhost port={$this->db_port} user={$this->db_username} password={$this->db_password} dbname={$this->db_name}");
+					$this->dbh = new PDO("pgsql:host=localhost port={$this->global_settings->db_port()} user={$this->global_settings->db_username()} password={$this->global_settings->db_password()} dbname={$this->global_settings->db_name()}");
 				}
 			}
 			catch (PDOException $error) {
@@ -346,7 +331,7 @@ include "root.php";
 			require_once "resources/classes/schema.php";
 			$schema = new schema;
 			$schema->db = $this->dbh;
-			$schema->db_type = $this->db_type;
+			$schema->db_type = $this->global_settings->db_type();
 			$schema->sql();
 			$schema->exec();
 
@@ -382,23 +367,23 @@ include "root.php";
 		protected function create_database_mysql() {
 				//database connection
 					$connect_string;
-					if (strlen($this->db_host) == 0 && strlen($this->db_port) == 0) {
+					if (strlen($this->global_settings->db_host()) == 0 && strlen($this->global_settings->db_port()) == 0) {
 						//if both host and port are empty use the unix socket
-						$connect_string = "mysql:host=$this->db_host;unix_socket=/var/run/mysqld/mysqld.sock;";
+						$connect_string = "mysql:host=$this->global_settings->db_host();unix_socket=/var/run/mysqld/mysqld.sock;";
 					}
-					elseif (strlen($this->db_port) == 0) {
+					elseif (strlen($this->global_settings->db_port()) == 0) {
 						//leave out port if it is empty
-						$connect_string = "mysql:host=$this->db_host;";
+						$connect_string = "mysql:host=$this->global_settings->db_host();";
 					}
 					else {
-						$connect_string = "mysql:host=$this->db_host;port=$this->db_port;";
+						$connect_string = "mysql:host=$this->global_settings->db_host();port=$this->global_settings->db_port();";
 					}
 
 				//create the table, user and set the permissions only if the db_create_username was provided
-					if ($this->db_create) {
+					if ($this->global_settings->db_create()) {
 						$this->write_progress("\tCreating database");				
 						try {
-							$this->dbh = new PDO($connect_string, $this->db_create_username, db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+							$this->dbh = new PDO($connect_string, $this->global_settings->db_create_username(), db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
 							$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 							$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 						}
@@ -415,7 +400,7 @@ include "root.php";
 
 						//create user and set the permissions
 							try {
-								$tmp_sql = "CREATE USER '".$this->db_username."'@'%' IDENTIFIED BY '".$this->db_password."'; ";
+								$tmp_sql = "CREATE USER '".$this->global_settings->db_username()."'@'%' IDENTIFIED BY '".$this->global_settings->db_password()."'; ";
 								$this->dbh->query($tmp_sql);
 							}
 							catch (PDOException $error) {
@@ -424,20 +409,20 @@ include "root.php";
 
 						//set account to unlimited use
 							try {
-								if ($this->db_host == "localhost" || $this->db_host == "127.0.0.1") {
-									$tmp_sql = "GRANT USAGE ON * . * TO '".$this->db_username."'@'localhost' ";
-									$tmp_sql .= "IDENTIFIED BY '".$this->db_password."' ";
+								if ($this->global_settings->db_host() == "localhost" || $this->global_settings->db_host() == "127.0.0.1") {
+									$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'localhost' ";
+									$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
 									$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
 									$this->dbh->query($tmp_sql);
 
-									$tmp_sql = "GRANT USAGE ON * . * TO '".$this->db_username."'@'127.0.0.1' ";
-									$tmp_sql .= "IDENTIFIED BY '".$this->db_password."' ";
+									$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'127.0.0.1' ";
+									$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
 									$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
 									$this->dbh->query($tmp_sql);
 								}
 								else {
-									$tmp_sql = "GRANT USAGE ON * . * TO '".$this->db_username."'@'".$this->db_host."' ";
-									$tmp_sql .= "IDENTIFIED BY '".$this->db_password."' ";
+									$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'".$this->global_settings->db_host()."' ";
+									$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
 									$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
 									$this->dbh->query($tmp_sql);
 								}
@@ -448,7 +433,7 @@ include "root.php";
 
 						//create the database and set the create user with permissions
 							try {
-								$tmp_sql = "CREATE DATABASE IF NOT EXISTS ".$this->db_name."; ";
+								$tmp_sql = "CREATE DATABASE IF NOT EXISTS ".$this->global_settings->db_name()."; ";
 								$this->dbh->query($tmp_sql);
 							}
 							catch (PDOException $error) {
@@ -457,7 +442,7 @@ include "root.php";
 
 						//set user permissions
 							try {
-								$this->dbh->query("GRANT ALL PRIVILEGES ON ".$this->db_name.".* TO '".$this->db_username."'@'%'; ");
+								$this->dbh->query("GRANT ALL PRIVILEGES ON ".$this->global_settings->db_name().".* TO '".$this->global_settings->db_username()."'@'%'; ");
 							}
 							catch (PDOException $error) {
 								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
@@ -472,12 +457,12 @@ include "root.php";
 								throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
 							}
 							$this->dbh = null;
-					} //if (strlen($this->db_create_username) > 0)
+					} //if (strlen($this->global_settings->db_create_username()) > 0)
 
 				$this->write_progress("\tInstalling data to database");
 				//select the database
 					try {
-						$this->dbh = new PDO($connect_string, $this->db_username, db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+						$this->dbh = new PDO($connect_string, $this->global_settings->db_username(), db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
 						$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 						$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					}
@@ -485,7 +470,7 @@ include "root.php";
 						throw new Exception("error connecting to database: " . $error->getMessage() . "\n" . $sql );
 					}
 					try {
-						$this->dbh->query("USE ".$this->db_name.";");
+						$this->dbh->query("USE ".$this->global_settings->db_name().";");
 					}
 					catch (PDOException $error) {
 						throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
@@ -495,7 +480,7 @@ include "root.php";
 					require_once "resources/classes/schema.php";
 					$schema = new schema;
 					$schema->db = $this->dbh;
-					$schema->db_type = $this->db_type;
+					$schema->db_type = $this->global_settings->db_type();
 					$schema->sql();
 					$schema->exec();
 
@@ -534,9 +519,9 @@ include "root.php";
 		}
 
 		protected function create_domain() {
-			$this->write_progress("\tChecking if domain exists '" . $this->domain_name . "'");
+			$this->write_progress("\tChecking if domain exists '" . $this->global_settings->domain_name . "'");
 			$sql = "select * from v_domains ";
-			$sql .= "where domain_name = '".$this->domain_name."' ";
+			$sql .= "where domain_name = '".$this->global_settings->domain_name."' ";
 			$sql .= "limit 1";
 			$this->write_debug($sql);
 			$prep_statement = $this->dbh->prepare(check_sql($sql));
@@ -560,7 +545,7 @@ include "root.php";
 				$sql .= "values ";
 				$sql .= "(";
 				$sql .= "'".$this->_domain_uuid."', ";
-				$sql .= "'".$this->domain_name."', ";
+				$sql .= "'".$this->global_settings->domain_name."', ";
 				$sql .= "'' ";
 				$sql .= ");";
 
@@ -608,73 +593,73 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->base_dir();
+				$tmp[$x]['value'] = $this->global_settings->base_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'base';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->conf_dir();
+				$tmp[$x]['value'] = $this->global_settings->conf_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'conf';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->db_dir();
+				$tmp[$x]['value'] = $this->global_settings->db_dir()();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'db';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->log_dir();
+				$tmp[$x]['value'] = $this->global_settings->log_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'log';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->mod_dir();
+				$tmp[$x]['value'] = $this->global_settings->mod_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'mod';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->script_dir();
+				$tmp[$x]['value'] = $this->global_settings->script_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'scripts';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->grammar_dir();
+				$tmp[$x]['value'] = $this->global_settings->grammar_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'grammar';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->storage_dir();
+				$tmp[$x]['value'] = $this->global_settings->storage_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'storage';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->voicemail_vdir();
+				$tmp[$x]['value'] = $this->global_settings->voicemail_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'voicemail';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->recordings_dir();
+				$tmp[$x]['value'] = $this->global_settings->recordings_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'recordings';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->sounds_dir();
+				$tmp[$x]['value'] = $this->global_settings->sounds_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'sounds';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->phrases_vdir();
+				$tmp[$x]['value'] = $this->global_settings->phrases_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'phrases';
 				$tmp[$x]['enabled'] = 'true';
@@ -686,19 +671,19 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->extensions_vdir();
+				$tmp[$x]['value'] = $this->global_settings->extensions_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'extensions';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->sip_profiles_vdir();
+				$tmp[$x]['value'] = $this->global_settings->sip_profiles_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'sip_profiles';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->dialplan_vdir();
+				$tmp[$x]['value'] = $this->global_settings->dialplan_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'dialplan';
 				$tmp[$x]['enabled'] = 'false';
@@ -706,7 +691,7 @@ include "root.php";
 
 				//server settings
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->temp_dir();
+				$tmp[$x]['value'] = $this->global_settings->temp_dir();
 				$tmp[$x]['category'] = 'server';
 				$tmp[$x]['subcategory'] = 'temp';
 				$tmp[$x]['enabled'] = 'true';
@@ -719,7 +704,7 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->detect_switch->backup_vdir();
+				$tmp[$x]['value'] = $this->global_settings->backup_vdir();
 				$tmp[$x]['category'] = 'server';
 				$tmp[$x]['subcategory'] = 'backup';
 				$tmp[$x]['enabled'] = 'true';
@@ -835,7 +820,7 @@ include "root.php";
 		}
 
 		protected function create_superuser() {
-			$this->write_progress("\tChecking if superuser exists '" . $this->domain_name . "'");
+			$this->write_progress("\tChecking if superuser exists '" . $this->global_settings->domain_name . "'");
 			$sql = "select * from v_users ";
 			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
 			$sql .= "and username = '".$this->admin_username."' ";
@@ -1009,16 +994,16 @@ include "root.php";
 			$_SESSION["domain_uuid"] = $this->_domain_uuid;
 			require $this->config_php;
 			require "resources/require.php";
-			$_SESSION['event_socket_ip_address'] = $this->detect_switch->event_host;
-			$_SESSION['event_socket_port'] = $this->detect_switch->event_port;
-			$_SESSION['event_socket_password'] = $this->detect_switch->event_password;
+			$_SESSION['event_socket_ip_address'] = $this->global_settings->event_host;
+			$_SESSION['event_socket_port'] = $this->global_settings->event_port;
+			$_SESSION['event_socket_password'] = $this->global_settings->event_password;
 
 		//get the groups assigned to the user and then set the groups in $_SESSION["groups"]
 			$sql = "SELECT * FROM v_group_users ";
 			$sql .= "where domain_uuid=:domain_uuid ";
 			$sql .= "and user_uuid=:user_uuid ";
 			$prep_statement = $this->dbh->prepare(check_sql($sql));
-			$prep_statement->bindParam(':domain_uuid', $this->domain_uuid);
+			$prep_statement->bindParam(':domain_uuid', $this->global_settings->domain_uuid);
 			$prep_statement->bindParam(':user_uuid', $this->admin_uuid);
 			$prep_statement->execute();
 			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -1031,10 +1016,10 @@ include "root.php";
 			foreach($_SESSION["groups"] as $field) {
 				if (strlen($field['group_name']) > 0) {
 					if ($x == 0) {
-						$sql .= "where (domain_uuid = '".$this->domain_uuid."' and group_name = '".$field['group_name']."') ";
+						$sql .= "where (domain_uuid = '".$this->global_settings->domain_uuid."' and group_name = '".$field['group_name']."') ";
 					}
 					else {
-						$sql .= "or (domain_uuid = '".$this->domain_uuid."' and group_name = '".$field['group_name']."') ";
+						$sql .= "or (domain_uuid = '".$this->global_settings->domain_uuid."' and group_name = '".$field['group_name']."') ";
 					}
 					$x++;
 				}
@@ -1045,13 +1030,13 @@ include "root.php";
 			unset($sql, $prep_statement_sub);
 
 		//include the config.php
-			$db_type = $this->db_type;
-			$db_path = $this->db_path;
-			$db_host = $this->db_host;
-			$db_port = $this->db_port;
-			$db_name = $this->db_name;
-			$db_username = $this->db_username;
-			$db_password = $this->db_password;
+			$db_type = $this->global_settings->db_type();
+			$db_path = $this->global_settings->db_path();
+			$db_host = $this->global_settings->db_host();
+			$db_port = $this->global_settings->db_port();
+			$db_name = $this->global_settings->db_name();
+			$db_username = $this->global_settings->db_username();
+			$db_password = $this->global_settings->db_password();
 
 		//add the database structure
 			require_once "resources/classes/schema.php";
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 6e9155eb96..67b45e3bb1 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -28,34 +28,25 @@ include "root.php";
 //define the install class
 	class install_switch {
 
-		protected $domain_uuid;
-		protected $domain_name;
-		protected $detect_switch;
+		protected $global_settings;
 		protected $config_lua;
+		protected $dbh;
 
 		public $debug = false;
 
-		function __construct($domain_name, $domain_uuid, $detect_switch) {
-			if($detect_switch == null){
-				if(strlen($_SESSION['event_socket_ip_address']) == 0 or strlen($_SESSION['event_socket_port']) == 0 or strlen($_SESSION['event_socket_password']) == 0 ){
-					throw new Exception('The parameter $detect_switch was empty and i could not find the event socket details from the session');
-				}
-				$detect_switch = new detect_switch($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				$domain_name = $_SESSION['domain_name'];
-				$domain_uuid = $_SESSION['domain_uuid'];
-			}elseif(!is_a($detect_switch, 'detect_switch')){
-				throw new Exception('The parameter $detect_switch must be a detect_switch object (or a subclass of)');
+		function __construct($global_settings) {
+			if(!is_a($global_settings, 'global_settings')){
+				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
-			$this->domain_uuid = $domain_uuid;
-			$this->domain = $domain_name;
-			$this->detect_switch = $detect_switch;
+			$this->global_settings = $global_settings;
 			if (is_dir("/etc/fusionpbx")){
 				$this->config_lua = "/etc/fusionpbx/config.lua";
-			} elseif (is_dir("/usr/local/etc/fusionpbx")){
+			}elseif (is_dir("/usr/local/etc/fusionpbx")){
 				$this->config_lua = "/usr/local/etc/fusionpbx/config.lua";
-			}
-			else {
-				$this->config_lua = $this->detect_switch->script_dir."/resources/config.lua";
+			}elseif(strlen($this->global_settings->script_dir) > 0) {
+				$this->config_lua = $this->global_settings->script_dir."/resources/config.lua";
+			}else{
+				throw new Exception("Could not work out where to put the config.lua");
 			}
 			$this->config_lua = normalize_path_to_os($this->config_lua);
 		}
@@ -91,6 +82,7 @@ include "root.php";
 				exec("xcopy /E /Y \"$src\" \"$dst\"");
 			}
 			else {
+				throw new Exception('Could not perform copy operation on this platform, implementation missing');
 				$dir = opendir($src);
 				if (!$dir) {
 					if (!mkdir($src, 0755, true)) {
@@ -202,14 +194,14 @@ include "root.php";
 		function copy_conf() {
 			$this->write_progress("\tCopying Config");
 			//make a backup of the config
-				if (file_exists($this->detect_switch->conf_dir())) {
-					$this->backup_dir($this->detect_switch->conf_dir(), 'fusionpbx_switch_config');
-					$this->recursive_delete($this->detect_switch->conf_dir());
+				if (file_exists($this->global_settings->conf_dir())) {
+					$this->backup_dir($this->global_settings->conf_dir(), 'fusionpbx_switch_config');
+					$this->recursive_delete($this->global_settings->conf_dir());
 				}
 			//make sure the conf directory exists
-				if (!is_dir($this->detect_switch->conf_dir())) {
-					if (!mkdir($this->detect_switch->conf_dir(), 0774, true)) {
-						throw new Exception("Failed to create the switch conf directory '".$this->detect_switch->conf_dir()."'. ");
+				if (!is_dir($this->global_settings->conf_dir())) {
+					if (!mkdir($this->global_settings->conf_dir(), 0774, true)) {
+						throw new Exception("Failed to create the switch conf directory '".$this->global_settings->conf_dir()."'. ");
 					}
 				}
 			//copy resources/templates/conf to the freeswitch conf dir
@@ -219,14 +211,14 @@ include "root.php";
 				else {
 					$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf";
 				}
-				$dst_dir = $this->detect_switch->conf_dir();
+				$dst_dir = $this->global_settings->conf_dir();
 				if (is_readable($dst_dir)) {
 					$this->recursive_copy($src_dir, $dst_dir);
 					unset($src_dir, $dst_dir);
 				}
-				$fax_dir = join( DIRECTORY_SEPARATOR, array($this->detect_switch->storage_dir(), 'fax'));
+				$fax_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->storage_dir(), 'fax'));
 				if (!is_readable($fax_dir)) { mkdir($fax_dir,0777,true); }
-				$voicemail_dir = join( DIRECTORY_SEPARATOR, array($this->detect_switch->storage_dir(), 'voicemail'));
+				$voicemail_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->storage_dir(), 'voicemail'));
 				if (!is_readable($voicemail_dir)) { mkdir($voicemail_dir,0777,true); }
 			
 			//create the dialplan/default.xml for single tenant or dialplan/domain.xml
@@ -234,7 +226,7 @@ include "root.php";
 					$dialplan = new dialplan;
 					$dialplan->domain_uuid = $this->domain_uuid;
 					$dialplan->domain = $this->domain_name;
-					$dialplan->switch_dialplan_dir = join( DIRECTORY_SEPARATOR, array($this->detect_switch->conf_dir(), "/dialplan"));
+					$dialplan->switch_dialplan_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->conf_dir(), "/dialplan"));
 					$dialplan->restore_advanced_xml();
 					if($this->_debug){
 						print_r($dialplan->result, $message);
@@ -248,7 +240,7 @@ include "root.php";
 				}
 
 			//write the switch.conf.xml file
-				if (file_exists($this->detect_switch->conf_dir())) {
+				if (file_exists($this->global_settings->conf_dir())) {
 					switch_conf_xml();
 				}
 
@@ -256,7 +248,10 @@ include "root.php";
 
 		function copy_scripts() {
 			$this->write_progress("\tCopying Scripts");
-			$script_dir = $this->detect_switch->script_dir();
+			$script_dir = $this->global_settings->script_dir();
+			if(strlen($script_dir) == 0) {
+				throw new Exception("Cannot copy scripts the 'script_dir' is empty");
+			}
 			if (file_exists($script_dir)) {
 				if (file_exists('/usr/share/examples/fusionpbx/resources/install/scripts')){
 					$src_dir = '/usr/share/examples/fusionpbx/resources/install/scripts';
@@ -312,30 +307,30 @@ include "root.php";
 		//config.lua
 			$fout = fopen($this->config_lua,"w");
 			if(!$fout){
-				throw new Exception("Failed to open '{$this->config_lua}' for writing");
+				throw new Exception("Failed to open '".$this->config_lua."' for writing");
 			}
 			$tmp = "\n";
 			$tmp .= "--set the variables\n";
-			if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_sounds_dir()) > 0) {
+				$tmp .= normalize_path_to_os("	sounds_dir = [[".$this->global_settings->switch_sounds_dir()."]];\n");
 			}
-			if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_phrases_vdir()) > 0) {
+				$tmp .= normalize_path_to_os("	phrases_dir = [[".$this->global_settings->switch_phrases_vdir()."]];\n");
 			}
-			if (strlen($_SESSION['switch']['db']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_db_dir()) > 0) {
+				$tmp .= normalize_path_to_os("	database_dir = [[".$this->global_settings->switch_db_dir()."]];\n");
 			}
-			if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	recordings_dir = [[".$_SESSION['switch']['recordings']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_recordings_dir()) > 0) {
+				$tmp .= normalize_path_to_os("	recordings_dir = [[".$this->global_settings->switch_recordings_dir()."]];\n");
 			}
-			if (strlen($_SESSION['switch']['storage']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	storage_dir = [[".$_SESSION['switch']['storage']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_storage_dir()) > 0) {
+				$tmp .= normalize_path_to_os("	storage_dir = [[".$this->global_settings->switch_storage_dir()."]];\n");
 			}
-			if (strlen($_SESSION['switch']['voicemail']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	voicemail_dir = [[".$_SESSION['switch']['voicemail']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_voicemail_vdir()) > 0) {
+				$tmp .= normalize_path_to_os("	voicemail_dir = [[".$this->global_settings->switch_voicemail_vdir()."]];\n");
 			}
-			if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
-				$tmp .= normalize_path_to_os("	scripts_dir = [[".$_SESSION['switch']['scripts']['dir']."]];\n");
+			if (strlen($this->global_settings->switch_scripts_dir()) > 0) {
+				$tmp .= normalize_path_to_os("	scripts_dir = [[".$this->global_settings->switch_scripts_dir()."]];\n");
 			}
 			$tmp .= normalize_path_to_os("	php_dir = [[".PHP_BINDIR."]];\n");
 			if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
@@ -347,27 +342,27 @@ include "root.php";
 			$tmp .= normalize_path_to_os("	document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n");
 			$tmp .= "\n";
 
-			if ((strlen($db_type) > 0) || (strlen($dsn_name) > 0)) {
+			if ((strlen($this->global_settings->db_type()) > 0) || (strlen($dsn_name) > 0)) {
 				$tmp .= "--database information\n";
 				$tmp .= "	database = {}\n";
-				$tmp .= "	database[\"type\"] = \"".$db_type."\";\n";
-				$tmp .= "	database[\"name\"] = \"".$db_name."\";\n";
-				$tmp .= normalize_path_to_os("	database[\"path\"] = [[".$db_path."]];\n");
+				$tmp .= "	database[\"type\"] = \"".$this->global_settings->db_type()."\";\n";
+				$tmp .= "	database[\"name\"] = \"".$this->global_settings->db_name()."\";\n";
+				$tmp .= normalize_path_to_os("	database[\"path\"] = [[".$this->global_settings->db_path()."]];\n");
 
 				if (strlen($dsn_name) > 0) {
 					$tmp .= "	database[\"system\"] = \"odbc://".$dsn_name.":".$dsn_username.":".$dsn_password."\";\n";
 					$tmp .= "	database[\"switch\"] = \"odbc://freeswitch:".$dsn_username.":".$dsn_password."\";\n";
 				}
-				elseif ($db_type == "pgsql") {
-					if ($db_host == "localhost") { $db_host = "127.0.0.1"; }
-					$tmp .= "	database[\"system\"] = \"pgsql://hostaddr=".$db_host." port=".$db_port." dbname=".$db_name." user=".$db_username." password=".$db_password." options='' application_name='".$db_name."'\";\n";
-					$tmp .= "	database[\"switch\"] = \"pgsql://hostaddr=".$db_host." port=".$db_port." dbname=freeswitch user=".$db_username." password=".$db_password." options='' application_name='freeswitch'\";\n";
+				elseif ($this->global_settings->db_type() == "pgsql") {
+					if ($this->global_settings->db_host() == "localhost") { $this->global_settings->db_host() = "127.0.0.1"; }
+					$tmp .= "	database[\"system\"] = \"pgsql://hostaddr=".$this->global_settings->db_host()." port=".$this->global_settings->db_port()." dbname=".$this->global_settings->db_name()." user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='".$this->global_settings->db_name()."'\";\n";
+					$tmp .= "	database[\"switch\"] = \"pgsql://hostaddr=".$this->global_settings->db_host()." port=".$this->global_settings->db_port()." dbname=freeswitch user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='freeswitch'\";\n";
 				}
-				elseif ($db_type == "sqlite") {
-					$tmp .= "	database[\"system\"] = \"sqlite://".$db_path."/".$db_name."\";\n";
+				elseif ($this->global_settings->db_type() == "sqlite") {
+					$tmp .= "	database[\"system\"] = \"sqlite://".$this->global_settings->db_path()."/".$this->global_settings->db_name()."\";\n";
 					$tmp .= "	database[\"switch\"] = \"sqlite://".$_SESSION['switch']['db']['dir']."\";\n";
 				}
-				elseif ($db_type == "mysql") {
+				elseif ($this->global_settings->db_type() == "mysql") {
 					$tmp .= "	database[\"system\"] = \"\";\n";
 					$tmp .= "	database[\"switch\"] = \"\";\n";
 				}
@@ -393,8 +388,8 @@ include "root.php";
 			$tmp .= "	debug[\"cache\"] = false;\n";
 			$tmp .= "\n";
 			$tmp .= "--additional info\n";
-			$tmp .= "	domain_count = ".count($_SESSION["domains"]).";\n";
-			$tmp .= normalize_path_to_os("	temp_dir = [[".$_SESSION['server']['temp']['dir']."]];\n");
+			$tmp .= "	domain_count = ".$this->global_settings->domain_count().";\n";
+			$tmp .= normalize_path_to_os("	temp_dir = [[".$this->global_settings->switch_temp_dir()."]];\n");
 			if (isset($_SESSION['domain']['dial_string']['text'])) {
 				$tmp .= "	dial_string = \"".$_SESSION['domain']['dial_string']['text']."\";\n";
 			}

From 3c19e21828d463398d29f006af6b760112e85054 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 11:21:09 +0000
Subject: [PATCH 30/37] added auto usage of global_settings where not provided

---
 core/install/install_first_time.php                  | 4 +++-
 core/install/resources/classes/install_fusionpbx.php | 5 ++++-
 core/install/resources/classes/install_switch.php    | 5 ++++-
 core/install/upgrade_switch.php                      | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 82abc3e2e0..ba6a567c36 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -296,7 +296,9 @@ if(!$install_step) { $install_step = 'select_language'; }
 			try {
 				require_once "resources/classes/global_settings.php";
 				$settings = new global_settings($detect_switch, $domain_name);
-
+				if($settings = null){
+					throw new Exception("Error global_settings came back with null");
+				}
 				require_once "resources/classes/install_fusionpbx.php";
 				$system = new install_fusionpbx($settings);
 				$system->admin_username = $admin_username;
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 17bfa24f0c..ab096ca715 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -46,7 +46,10 @@ include "root.php";
 		public $template_name = 'enhanced';
 
 	 	function __construct($global_settings) {
-			if(!is_a($global_settings, 'global_settings')){
+			if($global_settings == null){
+				require_once "resources/classes/global_settings.php";
+				$global_settings = new global_settings();
+			elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
 			$this->global_settings = $global_settings;
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 67b45e3bb1..f9fa1b9ec2 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -35,7 +35,10 @@ include "root.php";
 		public $debug = false;
 
 		function __construct($global_settings) {
-			if(!is_a($global_settings, 'global_settings')){
+			if($global_settings == null){
+				require_once "resources/classes/global_settings.php";
+				$global_settings = new global_settings();
+			elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
 			$this->global_settings = $global_settings;
diff --git a/core/install/upgrade_switch.php b/core/install/upgrade_switch.php
index dc579b4a86..fd34d3c806 100644
--- a/core/install/upgrade_switch.php
+++ b/core/install/upgrade_switch.php
@@ -53,7 +53,7 @@
 
 //run switch upgrade
 	require_once "resources/classes/install_switch.php";
-	$switch = new install_switch;
+	$switch = new install_switch();
 	$switch->upgrade();
 
 ?>
\ No newline at end of file

From ddcc317d49996e1cf1c3c6e3cee83831b976662f Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 14:05:21 +0000
Subject: [PATCH 31/37] Bugfix batch

---
 core/install/install_first_time.php           | 14 ++-
 .../resources/classes/detect_switch.php       |  2 +-
 .../resources/classes/global_settings.php     | 55 +++++++----
 .../resources/classes/install_fusionpbx.php   | 99 ++++++++++---------
 .../resources/classes/install_switch.php      | 41 ++++----
 5 files changed, 115 insertions(+), 96 deletions(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index ba6a567c36..5a772e023e 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -295,12 +295,10 @@ if(!$install_step) { $install_step = 'select_language'; }
 			#set_error_handler("error_handler");
 			try {
 				require_once "resources/classes/global_settings.php";
-				$settings = new global_settings($detect_switch, $domain_name);
-				if($settings = null){
-					throw new Exception("Error global_settings came back with null");
-				}
+				$global_settings = new global_settings($detect_switch, $domain_name);
+				if(is_null($global_settings)){ throw new Exception("Error global_settings came back with null");	}
 				require_once "resources/classes/install_fusionpbx.php";
-				$system = new install_fusionpbx($settings);
+				$system = new install_fusionpbx($global_settings);
 				$system->admin_username = $admin_username;
 				$system->admin_password = $admin_password;
 				$system->default_country = $install_default_country;
@@ -308,7 +306,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 				$system->template_name = $install_template_name;
 
 				require_once "resources/classes/install_switch.php";
-				$switch = new install_switch($settings);
+				$switch = new install_switch($global_settings);
 				//$switch->debug = true;
 				//$system->debug = true;
 				$system->install();
@@ -320,7 +318,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 				echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";
 				try {
 					require_once "resources/classes/install_fusionpbx.php";
-					$system = new install_fusionpbx($domain_name, $domain_uuid, $detect_switch);
+					$system = new install_fusionpbx($global_settings);
 					$system->remove_config();
 				}catch(Exception $e){
 					echo "<p><b>Failed to remove config:</b> " . $e->getMessage() . "</p>\n";
@@ -330,7 +328,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 			restore_error_handler();
 			if($install_ok){
 				echo "</pre>\n";
-				header("Location: ".PROJECT_PATH."/logout.php");
+				#header("Location: ".PROJECT_PATH."/logout.php");
 				$_SESSION['message'] = 'Install complete';
 			}else{
 				echo "<form method='post' name='frm' action=''>\n";
diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index dc46069d7b..4245d5bc61 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -141,7 +141,7 @@ require_once "resources/classes/EventSocket.php";
 			$this->_voicemail_vdir = 	normalize_path($this->_storage_dir . DIRECTORY_SEPARATOR . "voicemail");
 			$this->_phrases_vdir = 		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "lang");
 			$this->_extensions_vdir = 	normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "directory");
-			$this->_sip_profiles_vdir =	normalize_path(($this->_conf_dir . DIRECTORY_SEPARATOR . "sip_profiles");
+			$this->_sip_profiles_vdir =	normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "sip_profiles");
 			$this->_dialplan_vdir =		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "dialplan");
 			$this->_backup_vdir =		normalize_path(sys_get_temp_dir());
 		}	
diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php
index 24f4e89ecc..76612ed539 100644
--- a/core/install/resources/classes/global_settings.php
+++ b/core/install/resources/classes/global_settings.php
@@ -30,8 +30,8 @@ require_once "root.php";
 	class global_settings {
 
 		// cached data
-		protected $_dirs;
-		protected $_vdirs;
+		protected $_switch_dirs;
+		protected $_switch_vdirs;
 		public function get_switch_dirs()	{ return $this->_switch_dirs; }
 		public function get_switch_vdirs()	{ return $this->_switch_vdirs; }
 
@@ -116,25 +116,39 @@ require_once "root.php";
 		public function db_create_password()	{return $this->_db_create_password; }
 
 		//misc information
+		protected $_domain_uuid;
+		protected $_domain_name;
 		protected $_domain_count;
+		public function domain_uuid()	 		{return $this->_domain_uuid; }
+		public function domain_name()	 		{return $this->_domain_name; }
 		public function domain_count()	 		{return $this->_domain_count; }
+		public function set_domain_uuid($domain_uuid) {
+			$e = new Exception();
+			$trace = $e->getTrace();
+			if($trace[1]['function'] != 'create_domain'){
+				throw new Exception('Only create_domain is allowed to update the domain_uuid');
+			}
+			$this->_domain_uuid = $domain_uuid;
+		}
 
-		public function __construct($detect_switch, $domain_name, $domain_uuid) {
+		public function __construct($detect_switch = null, $domain_name = null, $domain_uuid = null) {
 			$this->_switch_dirs = preg_grep ('/^switch_.*_dir$/', get_class_methods('global_settings') );
 			sort( $this->_switch_dirs );
 			$this->_switch_vdirs = preg_grep ('/^switch_.*_vdir$/', get_class_methods('global_settings') );
 			sort( $this->_switch_vdirs );
-
-			if($detect_switch == null){
+			if(is_null($detect_switch)){
 				//take settings from session
+				if(!isset($_SESSION['switch'])){
+					throw new Exception("No detect_switch was passed to me but \$_SESSION['switch'] is empty!");
+				}
 				foreach ($this->_switch_dirs as $dir){
 					$session_var;
-					preg_match( '^switch_.*_dir$', $dir, $session_var);
+					preg_match( '/^switch_.*_dir$/', $dir, $session_var);
 					$this->$dir = $_SESSION['switch'][$session_var[0]]['dir'];
 				}
 				foreach ($this->_switch_vdirs as $vdir){
 					$session_var;
-					preg_match( '^switch_.*_vdir$', $vdir, $session_var);
+					preg_match( '/^switch_.*_vdir$/', $vdir, $session_var);
 					$this->$vdir = $_SESSION['switch'][$session_var[0]]['dir'];
 				}
 				$this->switch_event_host		= $_SESSION['event_socket_ip_address'];
@@ -142,8 +156,8 @@ require_once "root.php";
 				$this->switch_event_password	= $_SESSION['event_socket_password'];
 				
 				// domain info
-				$this->domain_name = $_SESSION['domain_name'];
-				$this->domain_uuid = $_SESSION['domain_uuid'];
+				$this->_domain_name = $_SESSION['domain_name'];
+				$this->_domain_uuid = $_SESSION['domain_uuid'];
 
 				// collect misc info
 				$this->domain_count = count($_SESSION["domains"]);
@@ -163,26 +177,33 @@ require_once "root.php";
 
 			}else{
 				//copy from detect_switch
-				foreach($detect_switch->switch_dirs() as $dir){
-					$t_dir = "_$dir";
+				foreach($detect_switch->get_dirs() as $dir){
+					$t_dir = "_switch_$dir";
 					$this->$t_dir = $detect_switch->$dir();
 				}
-				foreach($detect_switch->switch_vdirs() as $vdir){
-					$t_vdir = "_$vdir";
+				foreach($detect_switch->get_vdirs() as $vdir){
+					$t_vdir = "_switch_$vdir";
 					$this->$t_vdir = $detect_switch->$vdir();
 				}
 
 				//copy from _POST
 				foreach($_POST as $key=>$value){
 					if(substr($key,0,3) == "db_"){
-						$this->$key = $value;
+						$o_key = "_$key";
+						$this->$o_key = $value;
 					}
 				}
+				if($this->_db_create and strlen($this->_db_create_username) == 0)
+				{
+					$this->_db_create_username = $this->_db_username;
+					$this->_db_create_password = $this->_db_password;
+				}
+				if (strlen($this->_db_port) == 0) { $this->_db_port = "5432"; }
 
 				// domain info
-				if($domain_uuid == null){ $domain_uuid = uuid(); }
-				$this->domain_name = $domain_name;
-				$this->domain_uuid = $domain_uuid;
+				if(strlen($domain_uuid) == 0){ $domain_uuid = uuid(); }
+				$this->_domain_name = $domain_name;
+				$this->_domain_uuid = $domain_uuid;
 
 				//collect misc info
 				$this->_domain_count = 1;	//assumed to be one
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index ab096ca715..b6c2dbb6bd 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -34,7 +34,7 @@ include "root.php";
 		protected $menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286';
 		protected $dbh;
 
-		public function domain_uuid() { return $this->_domain_uuid; }
+		public function domain_uuid() { return $this->global_settings->domain_uuid(); }
 
 		public $debug = false;
 
@@ -46,10 +46,10 @@ include "root.php";
 		public $template_name = 'enhanced';
 
 	 	function __construct($global_settings) {
-			if($global_settings == null){
+			if(is_null($global_settings)){
 				require_once "resources/classes/global_settings.php";
 				$global_settings = new global_settings();
-			elseif(!is_a($global_settings, 'global_settings')){
+			}elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
 			$this->global_settings = $global_settings;
@@ -81,9 +81,14 @@ include "root.php";
 			ini_set('max_execution_time',3600);
 			$this->write_progress("Install started for FusionPBX");
 			$this->create_config_php();
+			$this->write_progress("\tExecuting config.php");
+			require $this->config_php;
+			global $db;
+			$db = $this->dbh;
 			$this->create_database();
 			$this->create_domain();
 			$this->create_superuser();
+			$this->write_progress("\tRunning requires");
 			require "resources/require.php";
 			$this->create_menus();
 			$this->write_progress("Install complete for FusionPBX");
@@ -135,12 +140,13 @@ include "root.php";
 			$tmp_config .= "\n";
 			$tmp_config .= "	//mysql: database connection information\n";
 			if ($this->global_settings->db_type() == "mysql") {
-				if ($this->global_settings->db_host() == "localhost") {
+				$db_host = $this->global_settings->db_host();
+				if ( $db_host == "localhost") {
 					//if localhost is used it defaults to a Unix Socket which doesn't seem to work.
 					//replace localhost with 127.0.0.1 so that it will connect using TCP
-					$this->global_settings->db_host() = "127.0.0.1";
+					$db_host = "127.0.0.1";
 				}
-				$tmp_config .= "		\$db_host = '".$this->global_settings->db_host()."';\n";
+				$tmp_config .= "		\$db_host = '".$db_host."';\n";
 				$tmp_config .= "		\$db_port = '".$this->global_settings->db_port()."';\n";
 				$tmp_config .= "		\$db_name = '".$this->global_settings->db_name()."';\n";
 				$tmp_config .= "		\$db_username = '".$this->global_settings->db_username()."';\n";
@@ -156,7 +162,9 @@ include "root.php";
 			$tmp_config .= "\n";
 			$tmp_config .= "	//pgsql: database connection information\n";
 			if ($this->global_settings->db_type() == "pgsql") {
-				$tmp_config .= "		\$db_host = '".$this->global_settings->db_host()."'; //set the host only if the database is not local\n";
+				$cmt_out = '';
+				if($this->global_settings->db_host() != 'localhost') { $cmt_out = "//"; }
+				$tmp_config .= "		$cmt_out\$db_host = '".$this->global_settings->db_host()."'; //set the host only if the database is not local\n";
 				$tmp_config .= "		\$db_port = '".$this->global_settings->db_port()."';\n";
 				$tmp_config .= "		\$db_name = '".$this->global_settings->db_name()."';\n";
 				$tmp_config .= "		\$db_username = '".$this->global_settings->db_username()."';\n";
@@ -191,16 +199,7 @@ include "root.php";
 		}
 
 		protected function create_database() {
-			require $this->config_php;
-			global $db;
-			$db = $this->dbh;
-
 			$this->write_progress("\tUsing database as type " . $this->global_settings->db_type());
-			if($this->global_settings->db_create() and strlen($this->global_settings->db_create_username()) == 0)
-			{
-				$this->global_settings->db_create_username() = $this->global_settings->db_username();
-				$this->global_settings->db_create_password() = $this->global_settings->db_password();
-			}
 			$function = "create_database_" . $this->global_settings->db_type();
 			$this->$function();
 
@@ -288,7 +287,6 @@ include "root.php";
 			//Attempt to create new PG role and database
 				$this->write_progress("\tCreating database");
 				try {
-					if (strlen($this->global_settings->db_port()) == 0) { $this->global_settings->db_port() = "5432"; }
 					if (strlen($this->global_settings->db_host()) > 0) {
 						$this->dbh = new PDO("pgsql:host={$this->global_settings->db_host()} port={$this->global_settings->db_port()} user={$this->global_settings->db_create_username()} password={$this->global_settings->db_create_password()} dbname=template1");
 					} else {
@@ -318,7 +316,6 @@ include "root.php";
 			$this->write_progress("\tInstalling data to database");				
 		//open database connection with $this->global_settings->db_name()
 			try {
-				if (strlen($this->global_settings->db_port()) == 0) { $this->global_settings->db_port() = "5432"; }
 				if (strlen($this->global_settings->db_host()) > 0) {
 					$this->dbh = new PDO("pgsql:host={$this->global_settings->db_host()} port={$this->global_settings->db_port()} dbname={$this->global_settings->db_name()} user={$this->global_settings->db_username()} password={$this->global_settings->db_password()}");
 				} else {
@@ -528,12 +525,14 @@ include "root.php";
 			$sql .= "limit 1";
 			$this->write_debug($sql);
 			$prep_statement = $this->dbh->prepare(check_sql($sql));
-			$prep_statement->execute();
+			if($prep_statement->execute() === false){
+				throw new Exception("Failed to search for domain: " . join(":", $this->dbh->errorInfo()));
+			}
 			$result = $prep_statement->fetch(PDO::FETCH_NAMED);
 			unset($sql, $prep_statement);
 			if ($result) {
-				$this->_domain_uuid = $result['domain_uuid'];
-				$this->write_progress("... domain exists as '" . $this->_domain_uuid . "'");
+				$this->global_settings->set_domain_uuid($result['domain_uuid']);
+				$this->write_progress("... domain exists as '" . $this->global_settings->domain_uuid() . "'");
 				if($result['domain_enabled'] != 'true'){
 					throw new Exception("Domain already exists but is disabled, this is unexpected");
 				}
@@ -547,13 +546,15 @@ include "root.php";
 				$sql .= ") ";
 				$sql .= "values ";
 				$sql .= "(";
-				$sql .= "'".$this->_domain_uuid."', ";
-				$sql .= "'".$this->global_settings->domain_name."', ";
-				$sql .= "'' ";
+				$sql .= "'".$this->global_settings->domain_uuid()."', ";
+				$sql .= "'".$this->global_settings->domain_name()."', ";
+				$sql .= "'Default Domain' ";
 				$sql .= ");";
 
 				$this->write_debug($sql);
-				$this->dbh->exec(check_sql($sql));
+				if($this->dbh->exec(check_sql($sql)) === false){
+					throw new Exception("Failed to execute sql statement: " . join(":", $this->dbh->errorInfo()));
+				}
 				unset($sql);
 
 				//domain settings
@@ -596,73 +597,73 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->base_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_base_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'base';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->conf_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_conf_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'conf';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->db_dir()();
+				$tmp[$x]['value'] = $this->global_settings->switch_db_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'db';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->log_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_log_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'log';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->mod_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_mod_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'mod';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->script_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_script_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'scripts';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->grammar_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_grammar_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'grammar';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->storage_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_storage_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'storage';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->voicemail_vdir();
+				$tmp[$x]['value'] = $this->global_settings->switch_voicemail_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'voicemail';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->recordings_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_recordings_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'recordings';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->sounds_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_sounds_dir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'sounds';
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->phrases_vdir();
+				$tmp[$x]['value'] = $this->global_settings->switch_phrases_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'phrases';
 				$tmp[$x]['enabled'] = 'true';
@@ -674,19 +675,19 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->extensions_vdir();
+				$tmp[$x]['value'] = $this->global_settings->switch_extensions_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'extensions';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->sip_profiles_vdir();
+				$tmp[$x]['value'] = $this->global_settings->switch_sip_profiles_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'sip_profiles';
 				$tmp[$x]['enabled'] = 'false';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->dialplan_vdir();
+				$tmp[$x]['value'] = $this->global_settings->switch_dialplan_vdir();
 				$tmp[$x]['category'] = 'switch';
 				$tmp[$x]['subcategory'] = 'dialplan';
 				$tmp[$x]['enabled'] = 'false';
@@ -694,7 +695,7 @@ include "root.php";
 
 				//server settings
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->temp_dir();
+				$tmp[$x]['value'] = $this->global_settings->switch_temp_dir();
 				$tmp[$x]['category'] = 'server';
 				$tmp[$x]['subcategory'] = 'temp';
 				$tmp[$x]['enabled'] = 'true';
@@ -707,7 +708,7 @@ include "root.php";
 				$tmp[$x]['enabled'] = 'true';
 				$x++;
 				$tmp[$x]['name'] = 'dir';
-				$tmp[$x]['value'] = $this->global_settings->backup_vdir();
+				$tmp[$x]['value'] = $this->global_settings->switch_backup_vdir();
 				$tmp[$x]['category'] = 'server';
 				$tmp[$x]['subcategory'] = 'backup';
 				$tmp[$x]['enabled'] = 'true';
@@ -825,7 +826,7 @@ include "root.php";
 		protected function create_superuser() {
 			$this->write_progress("\tChecking if superuser exists '" . $this->global_settings->domain_name . "'");
 			$sql = "select * from v_users ";
-			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
+			$sql .= "where domain_uuid = '".$this->global_settings->domain_uuid()."' ";
 			$sql .= "and username = '".$this->admin_username."' ";
 			$sql .= "limit 1 ";
 			$this->write_debug($sql);
@@ -866,7 +867,7 @@ include "root.php";
 				$sql .= ") ";
 				$sql .= "values ";
 				$sql .= "(";
-				$sql .= "'".$this->_domain_uuid."', ";
+				$sql .= "'".$this->global_settings->domain_uuid()."', ";
 				$sql .= "'".$this->admin_uuid."', ";
 				$sql .= "'$contact_uuid', ";
 				$sql .= "'".$this->admin_username."', ";
@@ -881,7 +882,7 @@ include "root.php";
 			}
 			$this->write_progress("\tChecking if superuser contact exists");
 			$sql = "select count(*) from v_contacts ";
-			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
+			$sql .= "where domain_uuid = '".$this->global_settings->domain_uuid()."' ";
 			$sql .= "and contact_name_given = '".$this->admin_username."' ";
 			$sql .= "and contact_nickname = '".$this->admin_username."' ";
 			$sql .= "limit 1 ";
@@ -900,7 +901,7 @@ include "root.php";
 				$sql .= ") ";
 				$sql .= "values ";
 				$sql .= "(";
-				$sql .= "'".$this->_domain_uuid."', ";
+				$sql .= "'".$this->global_settings->domain_uuid()."', ";
 				$sql .= "'$contact_uuid', ";
 				$sql .= "'user', ";
 				$sql .= "'".$this->admin_username."', ";
@@ -911,7 +912,7 @@ include "root.php";
 			}
 			$this->write_progress("\tChecking if superuser is in the correct group");
 			$sql = "select count(*) from v_group_users ";
-			$sql .= "where domain_uuid = '".$this->_domain_uuid."' ";
+			$sql .= "where domain_uuid = '".$this->global_settings->domain_uuid()."' ";
 			$sql .= "and user_uuid = '".$this->admin_uuid."' ";
 			$sql .= "and group_name = 'superadmin' ";
 			$sql .= "limit 1 ";
@@ -931,7 +932,7 @@ include "root.php";
 				$sql .= "values ";
 				$sql .= "(";
 				$sql .= "'".uuid()."', ";
-				$sql .= "'".$this->_domain_uuid."', ";
+				$sql .= "'".$this->global_settings->domain_uuid()."', ";
 				$sql .= "'".$this->admin_uuid."', ";
 				$sql .= "'superadmin' ";
 				$sql .= ");";
@@ -994,7 +995,7 @@ include "root.php";
 
 		//set needed session settings
 			$_SESSION["username"] = $this->admin_username;
-			$_SESSION["domain_uuid"] = $this->_domain_uuid;
+			$_SESSION["domain_uuid"] = $this->global_settings->domain_uuid();
 			require $this->config_php;
 			require "resources/require.php";
 			$_SESSION['event_socket_ip_address'] = $this->global_settings->event_host;
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index f9fa1b9ec2..e2cd95dd00 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -35,10 +35,10 @@ include "root.php";
 		public $debug = false;
 
 		function __construct($global_settings) {
-			if($global_settings == null){
+			if(is_null($global_settings)){
 				require_once "resources/classes/global_settings.php";
 				$global_settings = new global_settings();
-			elseif(!is_a($global_settings, 'global_settings')){
+			}elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
 			$this->global_settings = $global_settings;
@@ -98,8 +98,8 @@ include "root.php";
 					}
 				}
 				//This looks wrong, essentially if we can't use /bin/cp it manually fils dirs, not correct
-				$scripts_dir_target = $_SESSION['switch']['scripts']['dir'];
-				$scripts_dir_source = realpath($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/scripts');
+				$script_dir_target = $_SESSION['switch']['scripts']['dir'];
+				$script_dir_source = realpath($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/scripts');
 				foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($src)) as $file_path_source) {
 					if (
 					substr_count($file_path_source, '/..') == 0 &&
@@ -197,14 +197,14 @@ include "root.php";
 		function copy_conf() {
 			$this->write_progress("\tCopying Config");
 			//make a backup of the config
-				if (file_exists($this->global_settings->conf_dir())) {
-					$this->backup_dir($this->global_settings->conf_dir(), 'fusionpbx_switch_config');
-					$this->recursive_delete($this->global_settings->conf_dir());
+				if (file_exists($this->global_settings->switch_conf_dir())) {
+					$this->backup_dir($this->global_settings->switch_conf_dir(), 'fusionpbx_switch_config');
+					$this->recursive_delete($this->global_settings->switch_conf_dir());
 				}
 			//make sure the conf directory exists
-				if (!is_dir($this->global_settings->conf_dir())) {
-					if (!mkdir($this->global_settings->conf_dir(), 0774, true)) {
-						throw new Exception("Failed to create the switch conf directory '".$this->global_settings->conf_dir()."'. ");
+				if (!is_dir($this->global_settings->switch_conf_dir())) {
+					if (!mkdir($this->global_settings->switch_conf_dir(), 0774, true)) {
+						throw new Exception("Failed to create the switch conf directory '".$this->global_settings->switch_conf_dir()."'. ");
 					}
 				}
 			//copy resources/templates/conf to the freeswitch conf dir
@@ -214,14 +214,14 @@ include "root.php";
 				else {
 					$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf";
 				}
-				$dst_dir = $this->global_settings->conf_dir();
+				$dst_dir = $this->global_settings->switch_conf_dir();
 				if (is_readable($dst_dir)) {
 					$this->recursive_copy($src_dir, $dst_dir);
 					unset($src_dir, $dst_dir);
 				}
-				$fax_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->storage_dir(), 'fax'));
+				$fax_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->switch_storage_dir(), 'fax'));
 				if (!is_readable($fax_dir)) { mkdir($fax_dir,0777,true); }
-				$voicemail_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->storage_dir(), 'voicemail'));
+				$voicemail_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->switch_storage_dir(), 'voicemail'));
 				if (!is_readable($voicemail_dir)) { mkdir($voicemail_dir,0777,true); }
 			
 			//create the dialplan/default.xml for single tenant or dialplan/domain.xml
@@ -229,7 +229,7 @@ include "root.php";
 					$dialplan = new dialplan;
 					$dialplan->domain_uuid = $this->domain_uuid;
 					$dialplan->domain = $this->domain_name;
-					$dialplan->switch_dialplan_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->conf_dir(), "/dialplan"));
+					$dialplan->switch_dialplan_dir = join( DIRECTORY_SEPARATOR, array($this->global_settings->switch_conf_dir(), "/dialplan"));
 					$dialplan->restore_advanced_xml();
 					if($this->_debug){
 						print_r($dialplan->result, $message);
@@ -243,7 +243,7 @@ include "root.php";
 				}
 
 			//write the switch.conf.xml file
-				if (file_exists($this->global_settings->conf_dir())) {
+				if (file_exists($this->global_settings->switch_conf_dir())) {
 					switch_conf_xml();
 				}
 
@@ -251,7 +251,7 @@ include "root.php";
 
 		function copy_scripts() {
 			$this->write_progress("\tCopying Scripts");
-			$script_dir = $this->global_settings->script_dir();
+			$script_dir = $this->global_settings->switch_script_dir();
 			if(strlen($script_dir) == 0) {
 				throw new Exception("Cannot copy scripts the 'script_dir' is empty");
 			}
@@ -271,7 +271,7 @@ include "root.php";
 				}
 				chmod($dst_dir, 0774);
 			}else{
-				$this->write_progress("\tSkipping scripts, scripts_dir is unset");
+				$this->write_progress("\tSkipping scripts, script_dir is unset");
 			}
 		}
 
@@ -332,8 +332,8 @@ include "root.php";
 			if (strlen($this->global_settings->switch_voicemail_vdir()) > 0) {
 				$tmp .= normalize_path_to_os("	voicemail_dir = [[".$this->global_settings->switch_voicemail_vdir()."]];\n");
 			}
-			if (strlen($this->global_settings->switch_scripts_dir()) > 0) {
-				$tmp .= normalize_path_to_os("	scripts_dir = [[".$this->global_settings->switch_scripts_dir()."]];\n");
+			if (strlen($this->global_settings->switch_script_dir()) > 0) {
+				$tmp .= normalize_path_to_os("	script_dir = [[".$this->global_settings->switch_script_dir()."]];\n");
 			}
 			$tmp .= normalize_path_to_os("	php_dir = [[".PHP_BINDIR."]];\n");
 			if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
@@ -357,7 +357,6 @@ include "root.php";
 					$tmp .= "	database[\"switch\"] = \"odbc://freeswitch:".$dsn_username.":".$dsn_password."\";\n";
 				}
 				elseif ($this->global_settings->db_type() == "pgsql") {
-					if ($this->global_settings->db_host() == "localhost") { $this->global_settings->db_host() = "127.0.0.1"; }
 					$tmp .= "	database[\"system\"] = \"pgsql://hostaddr=".$this->global_settings->db_host()." port=".$this->global_settings->db_port()." dbname=".$this->global_settings->db_name()." user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='".$this->global_settings->db_name()."'\";\n";
 					$tmp .= "	database[\"switch\"] = \"pgsql://hostaddr=".$this->global_settings->db_host()." port=".$this->global_settings->db_port()." dbname=freeswitch user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='freeswitch'\";\n";
 				}
@@ -403,7 +402,7 @@ include "root.php";
 			$tmp .= "		dofile(\"/etc/fusionpbx/local.lua\");\n";
 			$tmp .= "	elseif (file_exists(\"/usr/local/etc/fusionpbx/local.lua\")) then\n";
 			$tmp .= "		dofile(\"/usr/local/etc/fusionpbx/local.lua\");\n";
-			$tmp .= "	elseif (file_exists(scripts_dir..\"/resources/local.lua\")) then\n";
+			$tmp .= "	elseif (file_exists(script_dir..\"/resources/local.lua\")) then\n";
 			$tmp .= "		require(\"resources.local\");\n";
 			$tmp .= "	end\n";
 			fwrite($fout, $tmp);

From 1327dc011a47c90f01788062a49b05bc954974b3 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 14:17:53 +0000
Subject: [PATCH 32/37] added automatic odbc_database definition

---
 .../resources/classes/install_fusionpbx.php   | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index b6c2dbb6bd..6571f15adf 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -217,7 +217,38 @@ include "root.php";
 		
 		protected function create_odbc_database_connection() {
 		//needed for non native database support
-			
+				$database_uuid = uuid();
+				$sql = "insert into v_databases ";
+				$sql .= "(";
+				//$sql .= "domain_uuid, ";
+				$sql .= "database_uuid, ";
+				$sql .= "database_driver, ";
+				$sql .= "database_type, ";
+				$sql .= "database_host, ";
+				$sql .= "database_port, ";
+				$sql .= "database_name, ";
+				$sql .= "database_username, ";
+				$sql .= "database_password, ";
+				$sql .= "database_path, ";
+				$sql .= "database_description ";
+				$sql .= ")";
+				$sql .= "values ";
+				$sql .= "(";
+				$sql .= "'$database_uuid', ";
+				$sql .= "'odbc', ";
+				$sql .= "'".$this->global_settings->db_type()."', ";
+				$sql .= "'".$this->global_settings->db_host()."', ";
+				$sql .= "'".$this->global_settings->db_port()."', ";
+				$sql .= "'".$this->global_settings->db_name()."', ";
+				$sql .= "'".$this->global_settings->db_username()."', ";
+				$sql .= "'".$this->global_settings->db_password()."', ";
+				$sql .= "'".$this->global_settings->db_path()."', ";
+				$sql .= "'Created by installer' ";
+				$sql .= ")";
+				if($this->dbh->exec(check_sql($sql)) === false){
+					throw new Exception("Failed to create odbc_database entery: " . join(":", $this->dbh->errorInfo()));
+				}
+				unset($sql);
 		}
 
 		protected function create_database_sqlite() {

From 0c557d5c5841bd19fd34b64ef00866f123321438 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 14:32:49 +0000
Subject: [PATCH 33/37] reorganised upgrade routine to make more sense

---
 core/install/install_first_time.php           |  2 --
 .../resources/classes/install_fusionpbx.php   |  7 ++++++-
 .../resources/classes/install_switch.php      | 20 ++++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 5a772e023e..896ec839fe 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -311,8 +311,6 @@ if(!$install_step) { $install_step = 'select_language'; }
 				//$system->debug = true;
 				$system->install();
 				$switch->install();
-				$system->app_defaults();
-				$detect_switch->restart_switch();
 			}catch(Exception $e){
 				echo "</pre>\n";
 				echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 6571f15adf..b35b21f917 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -91,8 +91,13 @@ include "root.php";
 			$this->write_progress("\tRunning requires");
 			require "resources/require.php";
 			$this->create_menus();
+			$this->app_defaults();
 			$this->write_progress("Install complete for FusionPBX");
 		}
+		
+		function upgrade() {
+			$this->app_defaults();
+		}
 
 		protected function create_config_php() {
 			$this->write_progress("\tCreating " . $this->config_php);
@@ -1021,7 +1026,7 @@ include "root.php";
 			}
 		}
 
-		public function app_defaults() {
+		protected function app_defaults() {
 			$this->write_progress("\tRunning app_defaults");
 
 		//set needed session settings
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index e2cd95dd00..c0c8215059 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -186,15 +186,17 @@ include "root.php";
 			$this->copy_conf();
 			$this->copy_scripts();
 			$this->create_config_lua();
+			$this->restart_switch();
 			$this->write_progress("Install completed for switch");
 		}
 
 		function upgrade() {
 			$this->copy_scripts();
 			$this->create_config_lua();
+			$this->restart_switch();
 		}
 
-		function copy_conf() {
+		protected function copy_conf() {
 			$this->write_progress("\tCopying Config");
 			//make a backup of the config
 				if (file_exists($this->global_settings->switch_conf_dir())) {
@@ -249,7 +251,7 @@ include "root.php";
 
 		}
 
-		function copy_scripts() {
+		protected function copy_scripts() {
 			$this->write_progress("\tCopying Scripts");
 			$script_dir = $this->global_settings->switch_script_dir();
 			if(strlen($script_dir) == 0) {
@@ -275,7 +277,7 @@ include "root.php";
 			}
 		}
 
-		function create_config_lua() {
+		public function create_config_lua() {
 			$this->write_progress("\tCreating " . $this->config_lua);
 			global $db;
 		//get the odbc information
@@ -410,4 +412,16 @@ include "root.php";
 			fclose($fout);	
 		}
 	}
+	
+	protected function restart_switch() {
+		global $errstr;
+		$esl = new EventSocket;
+		if (!$esl->connect($this->event_host, $this->event_port, $this->event_password)) {
+			throw new Exception("Failed to connect to switch: $errstr");
+		}
+		if (!$esl->request('api fsctl shutdown restart elegant')){
+			throw new Exception("Failed to send switch restart: $errstr");
+		}
+		$esl->reset_fp();
+	}
 ?>
\ No newline at end of file

From c1e84c50a4b329e24acfff77d7b1e5d641ed37c9 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 14:39:53 +0000
Subject: [PATCH 34/37] accidentally cancelled redirect during testing

---
 core/install/install_first_time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 896ec839fe..fd9472bfc4 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -326,7 +326,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 			restore_error_handler();
 			if($install_ok){
 				echo "</pre>\n";
-				#header("Location: ".PROJECT_PATH."/logout.php");
+				header("Location: ".PROJECT_PATH."/logout.php");
 				$_SESSION['message'] = 'Install complete';
 			}else{
 				echo "<form method='post' name='frm' action=''>\n";

From 7c1422fd13bf70c7b6f1498b05974560f8a9c9b0 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 14:46:03 +0000
Subject: [PATCH 35/37] Removed redundant code

---
 core/install/resources/classes/install_fusionpbx.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index b35b21f917..a2dd714b1a 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -34,11 +34,8 @@ include "root.php";
 		protected $menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286';
 		protected $dbh;
 
-		public function domain_uuid() { return $this->global_settings->domain_uuid(); }
-
 		public $debug = false;
 
-	 	public $install_msg;
 	 	public $install_language = 'en-us';
 	 	public $admin_username;
 	 	public $admin_password;
@@ -225,7 +222,6 @@ include "root.php";
 				$database_uuid = uuid();
 				$sql = "insert into v_databases ";
 				$sql .= "(";
-				//$sql .= "domain_uuid, ";
 				$sql .= "database_uuid, ";
 				$sql .= "database_driver, ";
 				$sql .= "database_type, ";

From 36e1d5c4c5d038c607e2d26a3bd48a294c72aa51 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 15:55:21 +0000
Subject: [PATCH 36/37] fixes during upgrade

---
 .../resources/classes/global_settings.php     | 48 +++++++++++--------
 .../resources/classes/install_switch.php      | 23 +++++----
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php
index 76612ed539..eb1cbfd2ef 100644
--- a/core/install/resources/classes/global_settings.php
+++ b/core/install/resources/classes/global_settings.php
@@ -78,7 +78,7 @@ require_once "root.php";
 		protected $_switch_sip_profiles_vdir = '';
 		protected $_switch_dialplan_vdir = '';
 		protected $_switch_backup_vdir = '';
-		public function switch_voicemail_vdir()	{ return $this->_switch_voicemail_vdir; }
+		public function switch_voicemail_vdir()		{ return $this->_switch_voicemail_vdir; }
 		public function switch_phrases_vdir()		{ return $this->_switch_phrases_vdir; }
 		public function switch_extensions_vdir()	{ return $this->_switch_extensions_vdir; }
 		public function switch_sip_profiles_vdir()	{ return $this->_switch_sip_profiles_vdir; }
@@ -104,24 +104,24 @@ require_once "root.php";
 		protected $_db_create;
 		protected $_db_create_username;
 		protected $_db_create_password;
-		public function db_type()	 			{return $this->_db_type; }
-		public function db_path()	 			{return $this->_db_path; }
-		public function db_host()	 			{return $this->_db_host; }
-		public function db_port()	 			{return $this->_db_port; }
-		public function db_name()	 			{return $this->_db_name; }
-		public function db_username()	 		{return $this->_db_username; }
-		public function db_password()	 		{return $this->_db_password; }
-		public function db_create()	 			{return $this->_db_create; }
-		public function db_create_username()	{return $this->_db_create_username; }
-		public function db_create_password()	{return $this->_db_create_password; }
+		public function db_type()	 			{ return $this->_db_type; }
+		public function db_path()	 			{ return $this->_db_path; }
+		public function db_host()	 			{ return $this->_db_host; }
+		public function db_port()	 			{ return $this->_db_port; }
+		public function db_name()	 			{ return $this->_db_name; }
+		public function db_username()	 		{ return $this->_db_username; }
+		public function db_password()	 		{ return $this->_db_password; }
+		public function db_create()	 			{ return $this->_db_create; }
+		public function db_create_username()	{ return $this->_db_create_username; }
+		public function db_create_password()	{ return $this->_db_create_password; }
 
 		//misc information
 		protected $_domain_uuid;
 		protected $_domain_name;
 		protected $_domain_count;
-		public function domain_uuid()	 		{return $this->_domain_uuid; }
-		public function domain_name()	 		{return $this->_domain_name; }
-		public function domain_count()	 		{return $this->_domain_count; }
+		public function domain_uuid()	 		{ return $this->_domain_uuid; }
+		public function domain_name()	 		{ return $this->_domain_name; }
+		public function domain_count()	 		{ return $this->_domain_count; }
 		public function set_domain_uuid($domain_uuid) {
 			$e = new Exception();
 			$trace = $e->getTrace();
@@ -143,17 +143,20 @@ require_once "root.php";
 				}
 				foreach ($this->_switch_dirs as $dir){
 					$session_var;
-					preg_match( '/^switch_.*_dir$/', $dir, $session_var);
-					$this->$dir = $_SESSION['switch'][$session_var[0]]['dir'];
+					preg_match( '/^switch_(.*)_dir$/', $dir, $session_var);
+					$dir = "_$dir";
+					if($session_var[1] == 'script'){ $session_var[1] = 'scripts'; }
+					$this->$dir = $_SESSION['switch'][$session_var[1]]['dir'];
 				}
 				foreach ($this->_switch_vdirs as $vdir){
 					$session_var;
-					preg_match( '/^switch_.*_vdir$/', $vdir, $session_var);
-					$this->$vdir = $_SESSION['switch'][$session_var[0]]['dir'];
+					preg_match( '/^switch_(.*)_vdir$/', $vdir, $session_var);
+					$vdir = "_$vdir";
+					$this->$vdir = $_SESSION['switch'][$session_var[1]]['dir'];
 				}
-				$this->switch_event_host		= $_SESSION['event_socket_ip_address'];
-				$this->switch_event_port		= $_SESSION['event_socket_port'];
-				$this->switch_event_password	= $_SESSION['event_socket_password'];
+				$this->_switch_event_host		= $_SESSION['event_socket_ip_address'];
+				$this->_switch_event_port		= $_SESSION['event_socket_port'];
+				$this->_switch_event_password	= $_SESSION['event_socket_password'];
 				
 				// domain info
 				$this->_domain_name = $_SESSION['domain_name'];
@@ -185,6 +188,9 @@ require_once "root.php";
 					$t_vdir = "_switch_$vdir";
 					$this->$t_vdir = $detect_switch->$vdir();
 				}
+				$this->_switch_event_host		= $detect_switch->event_host;
+				$this->_switch_event_port		= $detect_switch->event_port;
+				$this->_switch_event_password	= $detect_switch->event_password;
 
 				//copy from _POST
 				foreach($_POST as $key=>$value){
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index c0c8215059..bc4036fdc2 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -36,7 +36,7 @@ include "root.php";
 
 		function __construct($global_settings) {
 			if(is_null($global_settings)){
-				require_once "resources/classes/global_settings.php";
+				require_once "core/install/resources/classes/global_settings.php";
 				$global_settings = new global_settings();
 			}elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
@@ -411,17 +411,16 @@ include "root.php";
 			unset($tmp);
 			fclose($fout);	
 		}
-	}
-	
-	protected function restart_switch() {
-		global $errstr;
-		$esl = new EventSocket;
-		if (!$esl->connect($this->event_host, $this->event_port, $this->event_password)) {
-			throw new Exception("Failed to connect to switch: $errstr");
+
+		protected function restart_switch() {
+			$esl = new EventSocket;
+			if(!$esl->connect($this->global_settings->switch_event_host(), $this->global_settings->switch_event_port(), $this->global_settings->switch_event_password())) {
+				throw new Exception("Failed to connect to switch");
+			}
+			if (!$esl->request('api fsctl shutdown restart elegant')){
+				throw new Exception("Failed to send switch restart");
+			}
+			$esl->reset_fp();
 		}
-		if (!$esl->request('api fsctl shutdown restart elegant')){
-			throw new Exception("Failed to send switch restart: $errstr");
-		}
-		$esl->reset_fp();
 	}
 ?>
\ No newline at end of file

From 761a7b0717a8e9ad2dab11d11a899dce08b721b4 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Wed, 2 Dec 2015 16:07:23 +0000
Subject: [PATCH 37/37] made reference to install resource literal

---
 resources/classes/domains.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index 5ea36058bf..2c2bbadee1 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -369,6 +369,10 @@
 				if (function_exists('save_dialplan_xml')) {
 					save_dialplan_xml();
 				}
+			//update config.lua
+				require_once "core/install/resources/classes/install_switch.php";
+				$switch = new install_switch;
+				$switch->create_config_lua();
 
 			//clear the session variables
 				unset($_SESSION['domain']);