Merge pull request #1337 from mafoo/BugFix-core/install

Removed dirs we don't use

core/install/resources/classes/detect_switch.php

@@ -50,13 +50,10 @@ require_once "resources/classes/EventSocket.php";
 		// dirs - detected by from the switch
 		protected $_base_dir = '';
 		protected $_cache_dir = '';
-		protected $_certs_dir = '';
 		protected $_conf_dir = '';
 		protected $_db_dir = '';
-		protected $_external_ssl_dir = '';
 		protected $_grammar_dir = '';
 		protected $_htdocs_dir = '';
-		protected $_internal_ssl_dir = '';
 		protected $_log_dir = '';
 		protected $_mod_dir = '';
 		protected $_recordings_dir = '';
@@ -67,13 +64,10 @@ require_once "resources/classes/EventSocket.php";
 		protected $_temp_dir = '';
 		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; }
@@ -128,11 +122,10 @@ 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+)?).*\(.*?(\d+\w+)\s*\)/", $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];
-			$this->_bits  = $matches[4];
 			$FS_Vars = $this->event_socket_request('api global_getvar');
 			foreach (explode("\n",$FS_Vars) as $FS_Var){
 				preg_match("/(\w+_dir)=(.*)/", $FS_Var, $matches);

core/install/resources/classes/global_settings.php

@@ -38,13 +38,10 @@ require_once "root.php";
 		// dirs - detected from the switch
 		protected $_switch_base_dir = '';
 		protected $_switch_cache_dir = '';
-		protected $_switch_certs_dir = '';
 		protected $_switch_conf_dir = '';
 		protected $_switch_db_dir = '';
-		protected $_switch_external_ssl_dir = '';
 		protected $_switch_grammar_dir = '';
 		protected $_switch_htdocs_dir = '';
-		protected $_switch_internal_ssl_dir = '';
 		protected $_switch_log_dir = '';
 		protected $_switch_mod_dir = '';
 		protected $_switch_recordings_dir = '';
@@ -55,13 +52,10 @@ require_once "root.php";
 		protected $_switch_temp_dir = '';
 		public function switch_base_dir()			{ return $this->_switch_base_dir; }
 		public function switch_cache_dir()			{ return $this->_switch_cache_dir; }
-		public function switch_certs_dir()			{ return $this->_switch_certs_dir; }
 		public function switch_conf_dir()			{ return $this->_switch_conf_dir; }
 		public function switch_db_dir()				{ return $this->_switch_db_dir; }
-		public function switch_external_ssl_dir()	{ return $this->_switch_external_ssl_dir; }
 		public function switch_grammar_dir()		{ return $this->_switch_grammar_dir; }
 		public function switch_htdocs_dir()			{ return $this->_switch_htdocs_dir; }
-		public function switch_internal_ssl_dir()	{ return $this->_switch_internal_ssl_dir; }
 		public function switch_log_dir()			{ return $this->_switch_log_dir; }
 		public function switch_mod_dir()			{ return $this->_switch_mod_dir; }
 		public function switch_recordings_dir()		{ return $this->_switch_recordings_dir; }