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

Change the path in the php files from includes/install to resources/install dir.

Browse Source
This commit is contained in:
Mark Crane
2013-06-09 02:52:13 +00:00
parent 567e554cb7
commit e37449ce1e
5 changed files with 216 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/classes/install.php
+4 -4
View File
@@ -112,7 +112,7 @@ include "root.php";
function copy_scripts() {
clearstatcache();
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/scripts';
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/scripts';
$dst_dir = $this->switch_scripts_dir;
if (is_readable($this->switch_scripts_dir)) {
$this->recursive_copy($src_dir, $dst_dir);
@@ -122,7 +122,7 @@ include "root.php";
function copy_sounds() {
clearstatcache();
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/sounds/en/us/callie/custom/8000';
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sounds/en/us/callie/custom/8000';
$dst_dir = $this->switch_sounds_dir.'/en/us/callie/custom/8000';
if (is_readable($this->switch_sounds_dir)) {
if ($handle = opendir($src_dir)) {
@@ -143,7 +143,7 @@ include "root.php";
}
}
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/sounds/en/us/callie/custom/16000';
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sounds/en/us/callie/custom/16000';
$dst_dir = $this->switch_sounds_dir.'/en/us/callie/custom/16000';
if ($handle = opendir($src_dir)) {
$i = 0;
@@ -168,7 +168,7 @@ include "root.php";
function copy_swf() {
clearstatcache();
$file = "slim.swf";
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/htdocs';
$src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/htdocs';
$dst_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/recordings';
if (copy($src_dir.'/'.$file, $dst_dir.'/'.$file)) {
$this->result['copy']['swf'][] = "copied from ".$src_dir."/".$file." to ".$dst_dir."/".$file."<br />\n";
resources/install.php
+6 -6
View File
@@ -499,7 +499,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
$schema->exec();
//get the contents of the sql file
$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/sql/sqlite.sql';
$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/sqlite.sql';
$file_contents = file_get_contents($filename);
unset($filename);
@@ -581,7 +581,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
$schema->exec();
//get the contents of the sql file
$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/sql/pgsql.sql';
$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/pgsql.sql';
$file_contents = file_get_contents($filename);
//replace \r\n with \n then explode on \n
@@ -749,7 +749,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
//add the defaults data into the database
//get the contents of the sql file
$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/install/sql/mysql.sql';
$filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/mysql.sql';
$file_contents = file_get_contents($filename);
//replace \r\n with \n then explode on \n
@@ -1246,8 +1246,8 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
if (!is_readable($switch_recordings_dir.'') && $switch_scripts_dir != "/recordings") { mkdir($switch_recordings_dir.'',0777,true); }
}
//copy the files and directories from includes/install
require_once "includes/classes/install.php";
//copy the files and directories from resources/install
require_once "resources/classes/install.php";
$install = new install;
$install->domain_uuid = $_SESSION["domain_uuid"];
$install->domain = $domain_name;
@@ -1554,7 +1554,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
if (strlen($db_port) == 0) { $db_port = '3306'; }
//if (strlen($db_name) == 0) { $db_name = 'fusionpbx'; }
//echo "However if preferred the database can be created manually with the <a href='". echo PROJECT_PATH; ."/includes/install/sql/mysql.sql' target='_blank'>mysql.sql</a> script. ";
//echo "However if preferred the database can be created manually with the <a href='". echo PROJECT_PATH; ."/resources/install/sql/mysql.sql' target='_blank'>mysql.sql</a> script. ";
echo "<div id='page' align='center'>\n";
echo "<form method='post' name='frm' action=''>\n";
echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";