diff --git a/app/dialplan/app_defaults.php b/app/dialplan/app_defaults.php index 286d5172df..7dbdfb6ae3 100644 --- a/app/dialplan/app_defaults.php +++ b/app/dialplan/app_defaults.php @@ -78,8 +78,8 @@ if (is_dir($_SESSION['switch']['dialplan']['dir'])) { //write the dialplan/default.xml if it does not exist //set the path - if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) { - $path = "/usr/share/fusionpbx/resources/templates/conf"; + if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')) { + $path = "/usr/share/examples/fusionpbx/resources/templates/conf"; } else { $path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/templates/conf'; diff --git a/app/dialplan/resources/classes/dialplan.php b/app/dialplan/resources/classes/dialplan.php index 7be3d114bc..0ced365c3d 100644 --- a/app/dialplan/resources/classes/dialplan.php +++ b/app/dialplan/resources/classes/dialplan.php @@ -182,8 +182,8 @@ include "root.php"; $switch_dialplan_dir = $this->switch_dialplan_dir; if (is_dir($switch_dialplan_dir)) { //copy resources/templates/conf to the freeswitch conf dir - if (file_exists('/usr/share/fusionpbx/resources/templates/conf')){ - $src_dir = "/usr/share/fusionpbx/resources/templates/conf"; + if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')){ + $src_dir = "/usr/share/examples/fusionpbx/resources/templates/conf"; } else { $src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf"; diff --git a/app/sip_profiles/app_defaults.php b/app/sip_profiles/app_defaults.php index df74222d55..f79bb844c6 100644 --- a/app/sip_profiles/app_defaults.php +++ b/app/sip_profiles/app_defaults.php @@ -33,7 +33,7 @@ if (file_exists('/etc/fusionpbx')) { //linux $custom = '/etc/fusionpbx/resources/templates/conf/sip_profiles'; - $source = '/usr/share/fusionpbx/resources/templates/conf/sip_profiles'; + $source = '/usr/share/examples/fusionpbx/resources/templates/conf/sip_profiles'; } if (file_exists('/usr/local/etc/fusionpbx')) { //bsd diff --git a/core/upgrade/index.php b/core/upgrade/index.php index 8748e0b2f5..f74f6da62c 100644 --- a/core/upgrade/index.php +++ b/core/upgrade/index.php @@ -122,7 +122,7 @@ echo "


"; echo "
\n"; -if (permission_exists("upgrade_svn") && !is_dir("/usr/share/fusionpbx")) { +if (permission_exists("upgrade_svn") && !is_dir("/usr/share/examples/fusionpbx")) { echo "\n"; echo "\n"; echo "
\n"; diff --git a/resources/classes/install.php b/resources/classes/install.php index b1d4097767..38f41217b5 100644 --- a/resources/classes/install.php +++ b/resources/classes/install.php @@ -162,7 +162,7 @@ include "root.php"; //function copy_sounds() { // if (file_exists($this->switch_sounds_dir)) { // if (file_exists('/usr/share/examples/fusionpbx/resources/install/sounds/en/us/callie/custom/')){ - // $src_dir = '/usr/share/fusionpbx/resources/install/sounds/en/us/callie/custom/'; + // $src_dir = '/usr/share/examples/fusionpbx/resources/install/sounds/en/us/callie/custom/'; // changes the output dir for testing // $dst_dir = $this->switch_sounds_dir.'/en/us/fusionpbx/custom/'; // } diff --git a/resources/install.php b/resources/install.php index b8e691147e..98a46634d9 100644 --- a/resources/install.php +++ b/resources/install.php @@ -541,8 +541,8 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist $schema->exec(); //get the contents of the sql file - if (file_exists('/usr/share/fusionpbx/resources/install/sql/sqlite.sql')){ - $filename = "/usr/share/fusionpbx/resources/install/sql/sqlite.sql"; + if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql')){ + $filename = "/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql"; } else { $filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/sqlite.sql'; @@ -631,8 +631,8 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist $schema->exec(); //get the contents of the sql file - if (file_exists('/usr/share/fusionpbx/resources/install/sql/pgsql.sql')){ - $filename = "/usr/share/fusionpbx/resources/install/sql/pgsql.sql"; + if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql')){ + $filename = "/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql"; } else { $filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/pgsql.sql'; @@ -803,8 +803,8 @@ 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 - if (file_exists('/usr/share/fusionpbx/resources/install/sql/mysql.sql')){ - $filename = "/usr/share/fusionpbx/resources/install/sql/mysql.sql"; + if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql')){ + $filename = "/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql"; } else { $filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/mysql.sql'; diff --git a/resources/switch.php b/resources/switch.php index bad82c3e6f..4820467736 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -2965,8 +2965,8 @@ if (!function_exists('save_call_center_xml')) { } //set the path - if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) { - $path = "/usr/share/fusionpbx/resources/templates/conf"; + if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')) { + $path = "/usr/share/examples/fusionpbx/resources/templates/conf"; } else { $path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf"; @@ -3006,8 +3006,8 @@ if (!function_exists('switch_conf_xml')) { global $db, $domain_uuid; //get the contents of the template - if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) { - $path = "/usr/share/fusionpbx/resources/templates/conf"; + if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')) { + $path = "/usr/share/examples/fusionpbx/resources/templates/conf"; } else { $path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf"; @@ -3053,8 +3053,8 @@ if (!function_exists('xml_cdr_conf_xml')) { global $db, $domain_uuid; //get the contents of the template - if (file_exists('/usr/share/fusionpbx/resources/templates/conf')) { - $path = "/usr/share/fusionpbx/resources/templates/conf"; + if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')) { + $path = "/usr/share/examples/fusionpbx/resources/templates/conf"; } else { $path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf";