nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fusionpbx/master' into Enhance-Languages

Browse Source 
Conflicts:
	app/extensions/app_languages.php
This commit is contained in:
Matthew Vale
2015-12-11 08:45:26 +00:00
parent f5bfeffe18 5a0d25ff06
commit 81b85c3caf
10 changed files with 899 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,12 @@ require_once "resources/classes/EventSocket.php";
protected $_major;
protected $_minor;
protected $_build;
protected $_bits;
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 bits() { return $this->_bits; }
public function version() { return $this->_major.".".$this->_minor.".".$this->_build." (".$this->_bits.")"; }
// dirs - detected by from the switch
protected $_base_dir = '';
@@ -126,7 +128,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+)?).*\(.*?(\d+\w+)\s*\)/", $FS_Version, $matches);
$this->_major = $matches[1];
$this->_minor = $matches[2];
$this->_build = $matches[3];