diff --git a/core/upgrade/app_defaults.php b/core/upgrade/app_defaults.php index e8a67c5c6e..f06b2de345 100644 --- a/core/upgrade/app_defaults.php +++ b/core/upgrade/app_defaults.php @@ -25,11 +25,24 @@ */ 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 - if ($domains_processed == 1) { - if (!is_dir($_SESSION['switch']['scripts']['dir']."/resources")) { mkdir($_SESSION['switch']['scripts']['dir']."/resources",0755,true); } - } - + //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); + } } + ?> \ No newline at end of file diff --git a/core/upgrade/upgrade_domains.php b/core/upgrade/upgrade_domains.php index 2464a532bf..ed724b62c2 100644 --- a/core/upgrade/upgrade_domains.php +++ b/core/upgrade/upgrade_domains.php @@ -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 $config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); $x=0;