diff --git a/core/databases/app_defaults.php b/core/databases/app_defaults.php
index ea4d04d6c9..71adfaced2 100644
--- a/core/databases/app_defaults.php
+++ b/core/databases/app_defaults.php
@@ -126,6 +126,9 @@ if ($domains_processed == 1) {
$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) {
diff --git a/core/install/index.php b/core/install/index.php
index 492550f282..1eb6efc8c9 100644
--- a/core/install/index.php
+++ b/core/install/index.php
@@ -78,23 +78,10 @@ if (!if_group("superadmin")) {
echo "\n";
echo "\n";
- echo "\n";
-
echo "
";
+ echo "WiP
";
+
//include the footer
require_once "resources/footer.php";
?>
\ No newline at end of file
diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index a091eb6825..99f0ab043a 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -63,7 +63,7 @@ if (is_link('/etc/localtime')) {
// Ubuntu / Debian.
$data = file_get_contents('/etc/timezone');
if ($data) {
- $timezone = $data;
+ $timezone = rtrim($data);
}
} elseif (file_exists('/etc/sysconfig/clock')) {
// RHEL / CentOS
@@ -221,6 +221,9 @@ if(!$install_step) { $install_step = 'select_language'; }
echo " \n";
echo "\n";
}elseif($install_step == 'detect_config'){
+ if(!($event_host == '' || $event_host == 'localhost' || $event_host == '::1' || $event_host == '127.0.0.1' )){
+ echo "Warning you have choosen a value other than localhost for event_host, this is unsoported at present
\n";
+ }
include "resources/page_parts/install_event_socket.php";
if($detect_ok){
echo "\n";
+ }else{
+ echo "\n";
}
}
elseif($install_step == 'config_detail'){
@@ -284,7 +293,6 @@ if(!$install_step) { $install_step = 'select_language'; }
require_once "resources/classes/install_fusionpbx.php";
$fusionPBX = new install_fusionpbx($domain_name, null, $switch_detect);
$domain_uuid = $fusionPBX->domain_uuid();
- //$fusionPBX->debug = true;
$fusionPBX->admin_username = $admin_username;
$fusionPBX->admin_password = $admin_password;
$fusionPBX->default_country = $install_default_country;
@@ -295,12 +303,15 @@ if(!$install_step) { $install_step = 'select_language'; }
$fusionPBX->$key = $value;
}
}
- $fusionPBX->install();
require_once "resources/classes/install_switch.php";
$switch = new install_switch($domain_name, $domain_uuid, $switch_detect);
//$switch->debug = true;
+ //$fusionPBX->debug = true;
+ $fusionPBX->install();
$switch->install();
+ $fusionPBX->app_defaults();
+ $detect_switch->restart_switch();
}catch(Exception $e){
echo "\n";
echo "Failed to install
" . $e->getMessage() . "
\n";
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 6d62060939..ebfccc3de1 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -94,7 +94,6 @@ include "root.php";
$this->create_superuser();
require "resources/require.php";
$this->create_menus();
- $this->app_defaults();
}
protected function create_config_php() {
@@ -976,7 +975,7 @@ include "root.php";
}
}
- protected function app_defaults() {
+ public function app_defaults() {
$this->write_progress("Running app_defaults");
//set needed session settings
@@ -984,7 +983,10 @@ 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;
+
//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 ";
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index ac959b8d16..715c2cef5b 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -35,9 +35,16 @@ include "root.php";
public $debug = false;
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)');
- //}
+ 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)');
+ }
$this->domain_uuid = $domain_uuid;
$this->domain = $domain_name;
$this->detect_switch = $detect_switch;
@@ -169,9 +176,6 @@ include "root.php";
function install() {
$this->copy_conf();
$this->copy_scripts();
- //tell freeswitch to restart
- $this->write_progress("Restarting switch");
- $this->detect_switch->restart_switch();
}
function upgrade() {
diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php
index ad8e632734..371a726b98 100644
--- a/core/install/resources/page_parts/install_config_database.php
+++ b/core/install/resources/page_parts/install_config_database.php
@@ -31,7 +31,7 @@
echo "\n";
echo "\n";
- echo "\n";
+ echo "\n";
echo "\n";
echo "\n";
echo "\n";
diff --git a/core/install/resources/page_parts/install_config_detail.php b/core/install/resources/page_parts/install_config_detail.php
index 8ee7597ba9..6fd2c8ce05 100644
--- a/core/install/resources/page_parts/install_config_detail.php
+++ b/core/install/resources/page_parts/install_config_detail.php
@@ -31,7 +31,7 @@
echo "\n";
echo "\n";
- echo "\n";
+ echo "\n";
echo "\n";
echo "\n";
diff --git a/core/install/resources/page_parts/install_event_socket.php b/core/install/resources/page_parts/install_event_socket.php
index 7122925b4d..8588d13b1e 100644
--- a/core/install/resources/page_parts/install_event_socket.php
+++ b/core/install/resources/page_parts/install_event_socket.php
@@ -31,10 +31,10 @@
try {
$switch_detect->detect();
} catch(Exception $e){
- $messages[] = "Failed to detect confgiuration detect_switch reported: " . $e->getMessage();
+ echo "Failed to detect configuration detect_switch reported: " . $e->getMessage() ."
\n";
$detect_ok = false;
}
- echo "