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

Updated detected configuration

Browse Source
This commit is contained in:
Matthew Vale
2015-11-25 15:19:00 +00:00
parent b664574278
commit 20dd2065a7
3 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/install/app_languages.php
View File

@@ -11,6 +11,17 @@ $text['title-install_first_time']['uk'] = "";
$text['title-install_first_time']['de-at'] = "";
$text['title-install_first_time']['ar-eg'] = "";
$text['title-detected_configuration']['en-us'] = "Detected Configuration";
$text['title-detected_configuration']['es-cl'] = "";
$text['title-detected_configuration']['pt-pt'] = "";
$text['title-detected_configuration']['fr-fr'] = "";
$text['title-detected_configuration']['pt-br'] = "";
$text['title-detected_configuration']['pl'] = "";
$text['title-detected_configuration']['sv-se'] = "";
$text['title-detected_configuration']['uk'] = "";
$text['title-detected_configuration']['de-at'] = "";
$text['title-detected_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";

68
core/install/resources/classes/detect_switch.php
View File

@@ -30,6 +30,8 @@ require_once "resources/classes/EventSocket.php";
//define the install class
class detect_switch {
// cached data
protected $_folders;
// version information
protected $_major;
protected $_minor;
@@ -53,25 +55,27 @@ require_once "resources/classes/EventSocket.php";
protected $_storage_dir = '';
protected $_temp_dir = '';
function major() { return $this->_major; }
function minor() { return $this->_minor; }
function base_dir() { return $this->_base_dir; }
function cache_dir() { return $this->_cache_dir; }
function certs_dir() { return $this->_certs_dir; }
function conf_dir() { return $this->_conf_dir; }
function db_dir() { return $this->_db_dir; }
function external_ssl_dir() { return $this->_external_ssl_dir; }
function grammar_dir() { return $this->_grammar_dir; }
function htdocs_dir() { return $this->_htdocs_dir; }
function internal_ssl_dir() { return $this->_internal_ssl_dir; }
function log_dir() { return $this->_log_dir; }
function mod_dir() { return $this->_mod_dir; }
function recordings_dir() { return $this->_recordings_dir; }
function run_dir() { return $this->_run_dir; }
function script_dir() { return $this->_script_dir; }
function sounds_dir() { return $this->_sounds_dir; }
function storage_dir() { return $this->_storage_dir; }
function temp_dir() { return $this->_temp_dir; }
public function major() { return $this->_major; }
public function minor() { return $this->_minor; }
public function version() { return $this->_major.".".$this->_minor; }
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_folders() { return $this->_folders; }
// event socket
public $event_host = 'localhost';
@@ -87,6 +91,8 @@ 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 );
}
protected function detect_event_socket() {
@@ -112,29 +118,7 @@ require_once "resources/classes/EventSocket.php";
}
}
public function show_config() {
$buffer = '';
$buffer .= "FreeSWITCH Verson => " . $this->_major . "." . $this->_minor . "\n";
$buffer .= "base_dir => " . $this->_base_dir ."\n";
$buffer .= "cache_dir => " . $this->_cache_dir ."\n";
$buffer .= "certs_dir => " . $this->_certs_dir ."\n";
$buffer .= "conf_dir => " . $this->_conf_dir ."\n";
$buffer .= "db_dir => " . $this->_db_dir ."\n";
$buffer .= "external_ssl_dir => " . $this->_external_ssl_dir ."\n";
$buffer .= "grammar_dir => " . $this->_grammar_dir ."\n";
$buffer .= "htdocs_dir => " . $this->_htdocs_dir ."\n";
$buffer .= "internal_ssl_dir => " . $this->_internal_ssl_dir ."\n";
$buffer .= "log_dir => " . $this->_log_dir ."\n";
$buffer .= "mod_dir => " . $this->_mod_dir ."\n";
$buffer .= "recordings_dir => " . $this->_recordings_dir ."\n";
$buffer .= "run_dir => " . $this->_run_dir ."\n";
$buffer .= "script_dir => " . $this->_script_dir ."\n";
$buffer .= "sounds_dir => " . $this->_sounds_dir ."\n";
$buffer .= "storage_dir => " . $this->_storage_dir ."\n";
$buffer .= "temp_dir => " . $this->_temp_dir ."\n";
return $buffer;
}
protected function connect_event_socket(){
$esl = new EventSocket;
if ($esl->connect($this->event_host, $this->event_port, $this->event_password)) {

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

@@ -23,24 +23,17 @@
Contributor(s):
Matthew Vale <github@mafoo.org>
*/
echo "<p>Detected Configuration</p>";
//fetch the values
require_once "core/install/resources/classes/detect_switch.php";
$switch_detect = new detect_switch($event_host, $event_port, $event_password);
//$switch_detect->event_port = 2021;
echo "<pre>";
$detect_ok = true;
try {
$switch_detect->detect();
} catch(Exception $e){
echo "Failed to detect confgiuration detect_switch reported: " . $e->getMessage() . "\n";
$messages[] = "Failed to detect confgiuration detect_switch reported: " . $e->getMessage();
$detect_ok = false;
}
if($detect_ok){
echo $switch_detect->show_config();
}
echo "</pre>";
echo "<form method='post' name='frm' action=''>\n";
echo "<input type='hidden' name='install_language' value='".$_SESSION['domain']['language']['code']."'/>\n";
echo "<input type='hidden' name='install_step' value='detect_config'/>\n";
@@ -94,6 +87,41 @@
echo "</table>";
echo "</form>";
if($detect_ok){
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 "</tr>\n";
$id = 0;
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='15%'>\n";
echo "Switch version\n";
echo "</td>\n";
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)
{
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++;
}
if($id % 2 == 1){ echo "</tr>\n"; }
echo "</table>";
}
?><script type='text/javascript'>
function disable_next() {
document.getElementById("next").style.display = 'none';