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

move the copy scripts to app_defaults.php.

This commit is contained in:
Mark Crane 2014-05-25 06:45:30 +00:00
parent 9244908718
commit 955e290dc6
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/upgrade/app_defaults.php
View File

@ -25,11 +25,24 @@
*/ */
if (strlen($_SESSION['switch']['scripts']['dir']) > 0) { if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
if ($domains_processed == 1) {
//if the resource scripts resource directory does not exist then create it
if (!is_dir($_SESSION['switch']['scripts']['dir']."/resources")) {
mkdir($_SESSION['switch']['scripts']['dir']."/resources",0755,true);
}
//if the resource scripts resource directory does not exist then create it //copy the files and directories from resources/install
if ($domains_processed == 1) { //require_once "resources/classes/install.php";
if (!is_dir($_SESSION['switch']['scripts']['dir']."/resources")) { mkdir($_SESSION['switch']['scripts']['dir']."/resources",0755,true); } $install = new install;
} $install->domain_uuid = $domain_uuid;
$install->domain_name = $domain;
//$install->switch_conf_dir = $_SESSION['switch']['conf']['dir'];
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
//$install->switch_sounds_dir = $_SESSION['switch']['sounds']['dir'];
$install->copy_scripts();
//$install->copy_sounds();
//print_r($install->result);
}
} }
?> ?>

12
core/upgrade/upgrade_domains.php
View File

@ -47,18 +47,6 @@
} }
} }
//copy the files and directories from resources/install
require_once "resources/classes/install.php";
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->domain_name = $domain;
//$install->switch_conf_dir = $_SESSION['switch']['conf']['dir'];
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
//$install->switch_sounds_dir = $_SESSION['switch']['sounds']['dir'];
$install->copy_scripts();
//$install->copy_sounds();
//print_r($install->result);
//get the list of installed apps from the core and mod directories //get the list of installed apps from the core and mod directories
$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); $config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
$x=0; $x=0;