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

Implemented fix suggested in Issue 823 - Add DOCUMENT_ROOT to require_once path on domain edit [and contacts_vcard.php, and save_switch_xml() function].

This commit is contained in:
Nate Jones 2015-03-18 06:17:09 +00:00
parent 4ee20afa77
commit bd38f6b160
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/contacts/contacts_vcard.php
View File

@ -199,7 +199,7 @@ if (count($_GET)>0) {
} }
//include //include
require_once PROJECT_PATH."resources/qr/qrcode.php"; require_once $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/qr/qrcode.php";
//error correction level //error correction level
//QR_ERROR_CORRECT_LEVEL_L : $e = 0; //QR_ERROR_CORRECT_LEVEL_L : $e = 0;

2
core/domain_settings/domain_edit.php
View File

@ -511,7 +511,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
save_dialplan_xml(); save_dialplan_xml();
} }
if (is_readable($_SESSION['switch']['extensions']['dir'])) { if (is_readable($_SESSION['switch']['extensions']['dir'])) {
require_once PROJECT_PATH."app/extensions/resources/classes/extension.php"; require_once $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/extensions/resources/classes/extension.php";
$extension = new extension; $extension = new extension;
$extension->xml(); $extension->xml();
} }

8
resources/switch.php
View File

@ -320,10 +320,10 @@ function event_socket_request($fp, $cmd) {
} }
} }
usleep(50); //allow time for reponse usleep(20); //allow time for reponse
//prevent an endless loop //optional because of script timeout //prevent an endless loop //optional because of script timeout
if ($i > 3000) { break; } if ($i > 2000) { break; }
if ($content_length > 0) { //is content_length set if ($content_length > 0) { //is content_length set
//stop reading if all content has been read. //stop reading if all content has been read.
@ -2763,8 +2763,8 @@ if (!function_exists('save_switch_xml')) {
save_dialplan_xml(); save_dialplan_xml();
} }
if (is_readable($_SESSION['switch']['extensions']['dir'])) { if (is_readable($_SESSION['switch']['extensions']['dir'])) {
if (file_exists(PROJECT_PATH."/app/extensions/resources/classes/extension.php")) { if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/extensions/resources/classes/extension.php")) {
require_once PROJECT_PATH."app/extensions/resources/classes/extension.php"; require_once $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."app/extensions/resources/classes/extension.php";
$extension = new extension; $extension = new extension;
$extension->xml(); $extension->xml();
} }