nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reinstated the detect Configuration (#1624)

Browse Source 
it is no longer required for the detect_switch to pass but this
reinstates the ability to change the values and check them with detect
configuration
This commit is contained in:
Mafoo
2016-06-08 14:36:13 +01:00
committed by FusionPBX
parent 63e2b74411
commit b93fa7ccee
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/install/install.php
View File

@@ -97,6 +97,7 @@
//intialize variables
$install_step = '';
$return_install_step = '';
$re_detect_switch = false;
//process the the HTTP POST
if (count($_POST) > 0) {
@@ -116,6 +117,9 @@
$install_template_name = $_POST["install_template_name"];
$domain_name = $_POST["domain_name"];
}
if($install_step == 'config_detail' and strlen(check_str($_POST["re_detect_switch"])) > 0 ){
$re_detect_switch = true;
}
}
//set the install step if it is not set
@@ -177,7 +181,10 @@
elseif (strlen($admin_password) < 5) { $messages[] = "Please provide an Admin Password that is 5 or more characters.<br>\n"; }
if ( count($messages) > $existing_errors) { $install_step = 'config_detail'; }
}
if($re_detect_switch == true ){
$install_step = 'detect_config';
}
if($install_step =='execute') {
//set the max execution time to 1 hour
ini_set('max_execution_time',3600);
@@ -214,17 +221,17 @@
echo "</form>\n";
} elseif($install_step == 'detect_config'){
if(!($event_host == '' || $event_host == 'localhost' || $event_host == '::1' || $event_host == '127.0.0.1' )){
echo "<p><b>Warning</b> you have choosen a value other than localhost for event_host, this is unsoported at present</p>\n";
echo "<p><b>Warning</b> you have chosen a value other than localhost for event_host, this is unsupported at present</p>\n";
}
//if($detect_ok){
echo "<form method='post' name='frm' action=''>\n";
include "resources/page_parts/install_event_socket.php";
echo " <input type='hidden' name='install_language' value='".$_SESSION['domain']['language']['code']."'/>\n";
echo " <input type='hidden' name='return_install_step' value='detect_config'/>\n";
echo " <input type='hidden' name='install_step' value='config_detail'/>\n";
echo " <input type='hidden' name='event_host' value='$event_host'/>\n";
echo " <input type='hidden' name='event_port' value='$event_port'/>\n";
echo " <input type='hidden' name='event_password' value='$event_password'/>\n";
//echo " <input type='hidden' name='install_language' value='".$_SESSION['domain']['language']['code']."'/>\n";
//echo " <input type='hidden' name='return_install_step' value='detect_config'/>\n";
//echo " <input type='hidden' name='install_step' value='config_detail'/>\n";
//echo " <input type='hidden' name='event_host' value='$event_host'/>\n";
//echo " <input type='hidden' name='event_port' value='$event_port'/>\n";
//echo " <input type='hidden' name='event_password' value='$event_password'/>\n";
//echo " <div style='text-align:right'>\n";
//echo " <button type='button' class='btn' onclick=\"history.go(-1);\">".$text['button-back']."</button>\n";
//echo " <button type='submit' class='btn' id='next'>".$text['button-next']."</button>\n";

8
core/install/resources/page_parts/install_event_socket.php
View File

@@ -17,7 +17,7 @@
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
Portions created by the Initial Developer are Copyright (C) 2008-2016
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -31,8 +31,8 @@
try {
$switch_detect->detect();
} catch(Exception $e){
//echo "<p><b>Failed to detect configuration</b> detect_switch reported: " . $e->getMessage() ."</p>\n";
//$detect_ok = false;
echo "<p><b>Failed to detect configuration</b> detect_switch reported: " . $e->getMessage() ."</p>\n";
$detect_ok = false;
}
echo "<input type='hidden' name='install_language' value='".$_SESSION['domain']['language']['code']."'/>\n";
echo "<input type='hidden' name='install_step' value='detect_config'/>\n";
@@ -41,7 +41,7 @@
echo "<tr>\n";
echo "<td width='30%' align='left' nowrap><b>".$text['header-event_socket']."</b><br><br></td>\n";
echo "<td width='70%' align='right'>";
//echo " <input type='button' name='detect' class='btn' onclick=\"location.reload();\" value='".$text['button-detect']."'/>\n";
echo " <input type='submit' name='re_detect_switch' class='btn' value='".$text['button-detect']."'/>\n";
echo " <input type='button' name='back' class='btn' onclick=\"history.go(-1);\" value='".$text['button-back']."'/>\n";
echo " <input type='submit' name='next' class='btn' value='".$text['button-next']."'/>\n";
echo "</td>\n";