瀏覽代碼

moved restart and unprotected app_defaults

Matthew Vale 9 年之前
父節點
當前提交
990463cbd3

+ 1 - 0
core/install/install_first_time.php

@@ -311,6 +311,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 				$fusionPBX->install();
 				$fusionPBX->install();
 				$switch->install();
 				$switch->install();
 				$fusionPBX->app_defaults();
 				$fusionPBX->app_defaults();
+				$detect_switch->restart_switch();
 			}catch(Exception $e){
 			}catch(Exception $e){
 				echo "</pre>\n";
 				echo "</pre>\n";
 				echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";
 				echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";

+ 1 - 1
core/install/resources/classes/install_fusionpbx.php

@@ -975,7 +975,7 @@ include "root.php";
 			}
 			}
 		}
 		}
 		
 		
-		protected function app_defaults() {
+		public function app_defaults() {
 			$this->write_progress("Running app_defaults");
 			$this->write_progress("Running app_defaults");
 			
 			
 		//set needed session settings
 		//set needed session settings

+ 0 - 3
core/install/resources/classes/install_switch.php

@@ -176,9 +176,6 @@ include "root.php";
 		function install() {
 		function install() {
 			$this->copy_conf();
 			$this->copy_conf();
 			$this->copy_scripts();
 			$this->copy_scripts();
-			//tell freeswitch to restart
-			$this->write_progress("Restarting switch");
-			$this->detect_switch->restart_switch();
 		}
 		}
 
 
 		function upgrade() {
 		function upgrade() {