dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pipe paths though realpath to normalize

Browse Source 
fixed extra }
This commit is contained in:
Matthew Vale
2015-12-01 09:53:18 +00:00
parent e340747009
commit 45b8f00ae4
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/resources/classes/detect_switch.php
+12 -9
View File
@@ -35,6 +35,7 @@ require_once "resources/classes/EventSocket.php";
// version information // version information
protected $_major; protected $_major;
protected $_minor; protected $_minor;
protected $_build;
// dirs - detected by from the switch // dirs - detected by from the switch
protected $_base_dir = ''; protected $_base_dir = '';
@@ -57,7 +58,8 @@ require_once "resources/classes/EventSocket.php";
public function major() { return $this->_major; } public function major() { return $this->_major; }
public function minor() { return $this->_minor; } 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 base_dir() { return $this->_base_dir; }
public function cache_dir() { return $this->_cache_dir; } public function cache_dir() { return $this->_cache_dir; }
public function certs_dir() { return $this->_certs_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'); throw new Exception('Failed to use event socket');
} }
$FS_Version = $this->event_socket_request('api version'); $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->_major = $matches[1];
$this->_minor = $matches[2]; $this->_minor = $matches[2];
$this->_build = $matches[3];
$FS_Vars = $this->event_socket_request('api global_getvar'); $FS_Vars = $this->event_socket_request('api global_getvar');
foreach (explode("\n",$FS_Vars) as $FS_Var){ foreach (explode("\n",$FS_Vars) as $FS_Var){
preg_match("/(\w+_dir)=(.*)/", $FS_Var, $matches); preg_match("/(\w+_dir)=(.*)/", $FS_Var, $matches);
if(count($matches) > 0 and property_exists($this, "_" . $matches[1])){ if(count($matches) > 0 and property_exists($this, "_" . $matches[1])){
$field = "_" . $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->_voicemail_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_storage_dir, "voicemail")));
$this->_phrases_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang")); $this->_phrases_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "lang")));
$this->_extensions_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory")); $this->_extensions_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "directory")));
$this->_sip_profiles_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles")); $this->_sip_profiles_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "sip_profiles")));
$this->_dialplan_vdir = join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan")); $this->_dialplan_vdir = realpath(join( DIRECTORY_SEPARATOR, array($this->_conf_dir, "dialplan")));
$this->_backup_vdir = sys_get_temp_dir(); $this->_backup_vdir = realpath(sys_get_temp_dir());
} }
protected function connect_event_socket(){ protected function connect_event_socket(){
core/install/resources/classes/install_fusionpbx.php
+17 -1
View File
@@ -213,6 +213,22 @@ include "root.php";
$this->$function(); $this->$function();
global $db; global $db;
$db = $this->dbh; $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() { protected function create_database_sqlite() {
@@ -367,7 +383,7 @@ include "root.php";
} }
elseif (strlen($this->db_port) == 0) { elseif (strlen($this->db_port) == 0) {
//leave out port if it is empty //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 { 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 = new PDO("mysql:host=$this->db_host;port=$this->db_port;", $connect_username, $connect_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));