From f34d1480f57b3a792511a42bfc2fe6264d093a88 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Tue, 3 Jun 2014 17:45:24 +0000 Subject: [PATCH] Change the package path from /etc/fusionpbx/templates/provision to /etc/fusionpbx/resources/templates/provision --- app/devices/resources/classes/device.php | 8 ++++---- app/edit/filelist.php | 6 +++--- app/provision/resources/classes/provision.php | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/devices/resources/classes/device.php b/app/devices/resources/classes/device.php index aa445dfdf8..5dc52061eb 100644 --- a/app/devices/resources/classes/device.php +++ b/app/devices/resources/classes/device.php @@ -113,8 +113,8 @@ include "root.php"; case "Linux": //set the default template dir if (strlen($this->template_dir) == 0) { - if (file_exists('/etc/fusionpbx/templates/provision')) { - $this->template_dir = '/etc/fusionpbx/templates/provision'; + if (file_exists('/etc/fusionpbx/resources/templates/provision')) { + $this->template_dir = '/etc/fusionpbx/resources/templates/provision'; } else { $this->template_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/templates/provision'; @@ -123,9 +123,9 @@ include "root.php"; break; case "FreeBSD": //if the FreeBSD port is installed use the following paths by default. - if (file_exists('/usr/local/etc/fusionpbx/templates/provision')) { + if (file_exists('/usr/local/etc/fusionpbx/resources/templates/provision')) { if (strlen($this->template_dir) == 0) { - $this->template_dir = '/usr/local/etc/fusionpbx/templates/provision'; + $this->template_dir = '/usr/local/etc/fusionpbx/resources/templates/provision'; } else { $this->template_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/templates/provision'; diff --git a/app/edit/filelist.php b/app/edit/filelist.php index e53dac9c2b..4b9dde2da0 100644 --- a/app/edit/filelist.php +++ b/app/edit/filelist.php @@ -246,8 +246,8 @@ if ($_SESSION["app"]["edit"]["dir"] == "provision") { switch (PHP_OS) { case "Linux": - if (file_exists('/etc/fusionpbx/templates/provision')) { - echo recur_dir('/etc/fusionpbx/templates/provision'); + if (file_exists('/etc/fusionpbx/resources/templates/provision')) { + echo recur_dir('/etc/fusionpbx/resources/templates/provision'); } else { echo recur_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/provision/"); @@ -255,7 +255,7 @@ if ($_SESSION["app"]["edit"]["dir"] == "provision") { break; case "FreeBSD": //if the FreeBSD port is installed use the following paths by default. - if (file_exists('/usr/local/etc/fusionpbx/templates/provision')) { + if (file_exists('/usr/local/etc/fusionpbx/resources/templates/provision')) { echo recur_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/provision/"); } else { diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index a3db301072..1035fd5105 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -42,8 +42,8 @@ include "root.php"; case "Linux": //set the default template dir if (strlen($this->template_dir) == 0) { - if (file_exists('/etc/fusionpbx/templates/provision')) { - $this->template_dir = '/etc/fusionpbx/templates/provision'; + if (file_exists('/etc/fusionpbx/resources/templates/provision')) { + $this->template_dir = '/etc/fusionpbx/resources/templates/provision'; } else { $this->template_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/templates/provision'; @@ -52,9 +52,9 @@ include "root.php"; break; case "FreeBSD": //if the FreeBSD port is installed use the following paths by default. - if (file_exists('/usr/local/etc/fusionpbx/templates/provision')) { + if (file_exists('/usr/local/etc/fusionpbx/resources/templates/provision')) { if (strlen($this->template_dir) == 0) { - $this->template_dir = '/usr/local/etc/fusionpbx/templates/provision'; + $this->template_dir = '/usr/local/etc/fusionpbx/resources/templates/provision'; } else { $this->template_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/templates/provision';