From c23f53ea3441d6fc9a0cb0d5be6daab5805d1949 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Mon, 29 Feb 2016 11:28:43 -0700 Subject: [PATCH] install_first_time.php rename to install.php. --- core/install/index.php | 5 +++-- core/install/resources/classes/install_switch.php | 11 ++++++++--- index.php | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/install/index.php b/core/install/index.php index 05f1611d17..639a266dd5 100644 --- a/core/install/index.php +++ b/core/install/index.php @@ -61,8 +61,8 @@ if (!if_group("superadmin")) { echo "

"; echo $text['description-install']; echo "

"; - - echo "
\n"; + + echo "\n"; echo "\n"; echo "\n"; echo "
\n"; @@ -79,4 +79,5 @@ if (!if_group("superadmin")) { //include the footer require_once "resources/footer.php"; + ?> \ No newline at end of file diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index 2f2b5925ae..c86bd72143 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -73,7 +73,7 @@ include "root.php"; throw new Exception("backup_dir() source directory '".$dir."' does not exist."); } $dst_tar = join( DIRECTORY_SEPARATOR, array(sys_get_temp_dir(), "$backup_name.tar")); - //pharData is the correct ay to do it, but it keeps creating incomplete archives + //pharData is the correct way to do it, but it keeps creating incomplete archives //$tar = new PharData($dst_tar); //$tar->buildFromDirectory($dir); $this->write_debug("backing up to $dst_tar"); @@ -106,18 +106,23 @@ include "root.php"; } protected function copy_conf() { - $this->write_progress("\tCopying Config"); + //send a message + $this->write_progress("\tCopying Config"); + //make a backup of the config if (file_exists($this->global_settings->switch_conf_dir())) { $this->backup_dir($this->global_settings->switch_conf_dir(), 'fusionpbx_switch_config'); recursive_delete($this->global_settings->switch_conf_dir()); } - //make sure the conf directory exists + + //make the directory + sure the conf directory exists if (!is_dir($this->global_settings->switch_conf_dir())) { if (!mkdir($this->global_settings->switch_conf_dir(), 0774, true)) { throw new Exception("Failed to create the switch conf directory '".$this->global_settings->switch_conf_dir()."'. "); } } + //copy resources/templates/conf to the freeswitch conf dir if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')){ $src_dir = "/usr/share/examples/fusionpbx/resources/templates/conf"; diff --git a/index.php b/index.php index 1ffe4ab5d6..3e0ca555b9 100644 --- a/index.php +++ b/index.php @@ -42,7 +42,7 @@ include "root.php"; } elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) { //bsd } else { - header("Location: ".PROJECT_PATH."/core/install/install_first_time.php"); + header("Location: ".PROJECT_PATH."/core/install/install.php"); exit; }