Browse Source

During the install copy all FreeSWITCH conf files.

Mark Crane 11 years ago
parent
commit
878db53696
2 changed files with 6 additions and 32 deletions
  1. 0 24
      resources/classes/install.php
  2. 6 8
      resources/install.php

+ 0 - 24
resources/classes/install.php

@@ -58,30 +58,6 @@ include "root.php";
 								copy($src.'/'.$file, $dst.'/'.$file);
 								//echo "copy(".$src."/".$file.", ".$dst."/".$file.");<br />\n";
 							}
-						//check the file type by ext
-							//if (substr($file, -3) == "lua") {
-								//set the exception default
-									//$exception = false;
-								//set the exceptions
-									//if ($file == "database_handle.lua") { $exception = true; }
-								//check for exceptions
-									//if ($exception) {
-									//	//file does not exist, save a copy in the destination directory
-									//	if (!file_exists($dst.'/'.$file)) {
-									//		copy($src.'/'.$file, $dst.'/'.$file);
-									//	}
-									//}
-									//else {
-										//write over the file
-									//	copy($src.'/'.$file, $dst.'/'.$file);
-									//}
-							//}
-							//else {
-								//file does not exist, save a copy in the destination directory
-								//if (!file_exists($dst.'/'.$file)) {
-								//	copy($src.'/'.$file, $dst.'/'.$file);
-								//}
-							//}
 					}
 				}
 			}

+ 6 - 8
resources/install.php

@@ -1273,16 +1273,14 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 				clearstatcache();
 
 			//copy resources/templates/conf to the freeswitch conf dir
-				if (file_exists($switch_conf_dir)) {
-					$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf";
-					$dst_dir = $switch_conf_dir;
-					if (!file_exists($dst_dir)) {
-						if (is_readable($dst_dir)) {
-							$install->recursive_copy($src_dir, $dst_dir);
-						}
+				$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf";
+				$dst_dir = $switch_conf_dir;
+				if (!file_exists($dst_dir)) {
+					if (is_readable($dst_dir)) {
+						$install->recursive_copy($src_dir, $dst_dir);
 					}
-					//print_r($install->result);
 				}
+				//print_r($install->result);
 
 			//create the dialplan/default.xml for single tenant or dialplan/domain.xml
 				if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/dialplan")) {