diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index 55681a757..6f4d3957d 100644 --- a/app/access_controls/access_control_edit.php +++ b/app/access_controls/access_control_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/access_controls/access_control_import.php b/app/access_controls/access_control_import.php index 5f74e3c2b..d8e5c9b46 100644 --- a/app/access_controls/access_control_import.php +++ b/app/access_controls/access_control_import.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index 9915200b8..b0e6d2979 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/access_controls/access_controls_reload.php b/app/access_controls/access_controls_reload.php index 678d19c1a..090e9235e 100644 --- a/app/access_controls/access_controls_reload.php +++ b/app/access_controls/access_controls_reload.php @@ -24,22 +24,18 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions -if (permission_exists('access_control_view')) { - //access granted -} -else { - echo "access denied"; - exit; -} + if (permission_exists('access_control_view')) { + //access granted + } + else { + echo "access denied"; + exit; + } //set the variables $search = $_REQUEST['search'] ?? ''; diff --git a/app/basic_operator_panel/autocomplete.php b/app/basic_operator_panel/autocomplete.php index 58f7dc553..4b3044292 100644 --- a/app/basic_operator_panel/autocomplete.php +++ b/app/basic_operator_panel/autocomplete.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/basic_operator_panel/exec.php b/app/basic_operator_panel/exec.php index 5ce188d44..f3165c5ba 100644 --- a/app/basic_operator_panel/exec.php +++ b/app/basic_operator_panel/exec.php @@ -27,12 +27,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php index 7bf75a21d..24cf2ef34 100644 --- a/app/basic_operator_panel/index.php +++ b/app/basic_operator_panel/index.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/basic_operator_panel/resources/content.php b/app/basic_operator_panel/resources/content.php index 6d145c5da..9d909fae4 100644 --- a/app/basic_operator_panel/resources/content.php +++ b/app/basic_operator_panel/resources/content.php @@ -24,13 +24,8 @@ Mark J Crane */ -//includes -//set the include path -$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); -set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files -require_once "resources/require.php"; +require_once dirname(__DIR__, 3) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/bridges/bridge_edit.php b/app/bridges/bridge_edit.php index c981a22cb..9dc0c6ac5 100644 --- a/app/bridges/bridge_edit.php +++ b/app/bridges/bridge_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php index 750cb4827..3d1c41506 100644 --- a/app/bridges/bridges.php +++ b/app/bridges/bridges.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php index 66b502b03..b0c608f3c 100644 --- a/app/call_block/call_block.php +++ b/app/call_block/call_block.php @@ -27,12 +27,8 @@ All of it has been rewritten over years. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php index a5620b537..0636518f1 100644 --- a/app/call_block/call_block_edit.php +++ b/app/call_block/call_block_edit.php @@ -27,12 +27,8 @@ Original version of Call Block was written by Gerrit Visser */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index b3983ef30..a743c6360 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index 364dd446e..5c2e44a77 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php index cec6e1a85..759b6e800 100644 --- a/app/call_broadcast/call_broadcast_send.php +++ b/app/call_broadcast/call_broadcast_send.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //chec permissions diff --git a/app/call_broadcast/call_broadcast_stop.php b/app/call_broadcast/call_broadcast_stop.php index 8a17813ee..4355a8823 100644 --- a/app/call_broadcast/call_broadcast_stop.php +++ b/app/call_broadcast/call_broadcast_stop.php @@ -23,12 +23,9 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); //includes files -require_once "resources/require.php"; +require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_broadcast_send')) { //access granted diff --git a/app/call_center_active/call_center_active.php b/app/call_center_active/call_center_active.php index 5a2c75ffc..8fe00d194 100644 --- a/app/call_center_active/call_center_active.php +++ b/app/call_center_active/call_center_active.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php index 2fc31bf8f..e68f24a71 100644 --- a/app/call_center_active/call_center_active_inc.php +++ b/app/call_center_active/call_center_active_inc.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_center_active/call_center_exec.php b/app/call_center_active/call_center_exec.php index 215a14f3f..45b40dbfb 100644 --- a/app/call_center_active/call_center_exec.php +++ b/app/call_center_active/call_center_exec.php @@ -27,12 +27,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index 572307c98..e33e2f3d0 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php index 77c1b8b9d..288447e9c 100644 --- a/app/call_centers/call_center_agent_edit.php +++ b/app/call_centers/call_center_agent_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php index 5fe53c465..55b45904a 100644 --- a/app/call_centers/call_center_agent_status.php +++ b/app/call_centers/call_center_agent_status.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php index e44695e87..c220aa59b 100644 --- a/app/call_centers/call_center_agents.php +++ b/app/call_centers/call_center_agents.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php index 492309f8c..9ee740c9a 100644 --- a/app/call_centers/call_center_queue_edit.php +++ b/app/call_centers/call_center_queue_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php index 325707b8d..5298d587d 100644 --- a/app/call_centers/call_center_queues.php +++ b/app/call_centers/call_center_queues.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_centers/cmd.php b/app/call_centers/cmd.php index 768292b9d..fe00fb981 100644 --- a/app/call_centers/cmd.php +++ b/app/call_centers/cmd.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_centers/resources/dashboard/call_center_agents.php b/app/call_centers/resources/dashboard/call_center_agents.php index ae4d27443..c3e093cf9 100644 --- a/app/call_centers/resources/dashboard/call_center_agents.php +++ b/app/call_centers/resources/dashboard/call_center_agents.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_centers/resources/jobs/call_center_agents.php b/app/call_centers/resources/jobs/call_center_agents.php index 2ace1656b..2d17aabbf 100644 --- a/app/call_centers/resources/jobs/call_center_agents.php +++ b/app/call_centers/resources/jobs/call_center_agents.php @@ -2,14 +2,7 @@ //check the permission if (defined('STDIN')) { - $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); - preg_match("/^(.*)\/app\/.*$/", $document_root, $matches); - if (isset($matches[1])) { - $document_root = $matches[1]; - set_include_path($document_root); - $_SERVER["DOCUMENT_ROOT"] = $document_root; - } - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; } else { exit; diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index 6a62bf0cc..f31a57dbc 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -25,12 +25,8 @@ Lewis Hallam */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php index 0643f176a..8a6cf3f4b 100644 --- a/app/call_flows/call_flows.php +++ b/app/call_flows/call_flows.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/paging.php"; require_once "resources/check_auth.php"; diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php index 2ce1cff58..86933466c 100644 --- a/app/call_forward/call_forward.php +++ b/app/call_forward/call_forward.php @@ -28,12 +28,8 @@ //set default $is_included = false; -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php index 0139155f7..a1faa4305 100644 --- a/app/call_forward/call_forward_edit.php +++ b/app/call_forward/call_forward_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/call_forward/resources/dashboard/call_forward.php b/app/call_forward/resources/dashboard/call_forward.php index 11cdfb80b..4f6e01fc5 100644 --- a/app/call_forward/resources/dashboard/call_forward.php +++ b/app/call_forward/resources/dashboard/call_forward.php @@ -1,7 +1,7 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/call_recordings/download.php b/app/call_recordings/download.php index ad61ef73e..01f71feb8 100644 --- a/app/call_recordings/download.php +++ b/app/call_recordings/download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permisions diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php index 23dde499b..ce59e0a64 100644 --- a/app/calls_active/calls_active.php +++ b/app/calls_active/calls_active.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php index 33e25c94b..d68363876 100644 --- a/app/calls_active/calls_active_inc.php +++ b/app/calls_active/calls_active_inc.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/calls_active/calls_exec.php b/app/calls_active/calls_exec.php index 382162033..628b29705 100644 --- a/app/calls_active/calls_exec.php +++ b/app/calls_active/calls_exec.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes fileshp"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php index 2dbd421c9..0a536c935 100644 --- a/app/click_to_call/click_to_call.php +++ b/app/click_to_call/click_to_call.php @@ -30,12 +30,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index 35fc0848e..7eb55520f 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 6a0e97a9c..e280bff36 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index d5b6c72b4..0b9aa8f95 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 1aeaacf08..09b748569 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php index a1b2731c2..2634bde57 100644 --- a/app/conference_centers/conference_session_details.php +++ b/app/conference_centers/conference_session_details.php @@ -23,12 +23,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php index b44641bc5..b1ef42a2e 100644 --- a/app/conference_centers/conference_sessions.php +++ b/app/conference_centers/conference_sessions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_centers/download.php b/app/conference_centers/download.php index a6f6408d4..874494d12 100644 --- a/app/conference_centers/download.php +++ b/app/conference_centers/download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permisions require_once "resources/check_auth.php"; diff --git a/app/conference_controls/conference_control_detail_edit.php b/app/conference_controls/conference_control_detail_edit.php index 127e3b909..fa47aad64 100644 --- a/app/conference_controls/conference_control_detail_edit.php +++ b/app/conference_controls/conference_control_detail_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/conference_controls/conference_control_details.php b/app/conference_controls/conference_control_details.php index 2627097a8..5850ac384 100644 --- a/app/conference_controls/conference_control_details.php +++ b/app/conference_controls/conference_control_details.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_controls/conference_control_edit.php b/app/conference_controls/conference_control_edit.php index 28bd4907c..89734da20 100644 --- a/app/conference_controls/conference_control_edit.php +++ b/app/conference_controls/conference_control_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conference_controls/conference_controls.php b/app/conference_controls/conference_controls.php index 6e35f0111..2ea91f8c5 100644 --- a/app/conference_controls/conference_controls.php +++ b/app/conference_controls/conference_controls.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php index 55a3ef41c..0b18badf4 100644 --- a/app/conference_profiles/conference_profile_edit.php +++ b/app/conference_profiles/conference_profile_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conference_profiles/conference_profile_param_edit.php b/app/conference_profiles/conference_profile_param_edit.php index 15b1edb51..13ee24387 100644 --- a/app/conference_profiles/conference_profile_param_edit.php +++ b/app/conference_profiles/conference_profile_param_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conference_profiles/conference_profile_params.php b/app/conference_profiles/conference_profile_params.php index 02af38d13..1b7a8fbca 100644 --- a/app/conference_profiles/conference_profile_params.php +++ b/app/conference_profiles/conference_profile_params.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php index 38d3637bb..451cae6c9 100644 --- a/app/conference_profiles/conference_profiles.php +++ b/app/conference_profiles/conference_profiles.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index eb0fe0247..50930439e 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index bd4c33f27..182e2bd4f 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php index d6321fc5e..3ec5556fc 100644 --- a/app/conferences_active/conference_exec.php +++ b/app/conferences_active/conference_exec.php @@ -36,12 +36,8 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php index 6b04c9933..99752972d 100644 --- a/app/conferences_active/conference_interactive.php +++ b/app/conferences_active/conference_interactive.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index e521bab06..4b9315da1 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php index c05c92ba2..93c9ba3d8 100644 --- a/app/conferences_active/conferences_active.php +++ b/app/conferences_active/conferences_active.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index fbf13a5c3..7089bd1f1 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php index c3e9074ac..a5aa418d2 100644 --- a/app/contacts/contact_address_edit.php +++ b/app/contacts/contact_address_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_addresses.php b/app/contacts/contact_addresses.php index d17dee8b8..39fe827fe 100644 --- a/app/contacts/contact_addresses.php +++ b/app/contacts/contact_addresses.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_addresses_view.php b/app/contacts/contact_addresses_view.php index 511a98c28..2b2de8798 100644 --- a/app/contacts/contact_addresses_view.php +++ b/app/contacts/contact_addresses_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_attachment.php b/app/contacts/contact_attachment.php index 75759c7a8..d8ff8458a 100644 --- a/app/contacts/contact_attachment.php +++ b/app/contacts/contact_attachment.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //add multi-lingual support $language = new text; diff --git a/app/contacts/contact_attachment_edit.php b/app/contacts/contact_attachment_edit.php index e4eb0d720..17bd55b79 100644 --- a/app/contacts/contact_attachment_edit.php +++ b/app/contacts/contact_attachment_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_attachments.php b/app/contacts/contact_attachments.php index e01a95a0e..3db97f1ea 100644 --- a/app/contacts/contact_attachments.php +++ b/app/contacts/contact_attachments.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_attachments_view.php b/app/contacts/contact_attachments_view.php index 1d932b166..645f65dc2 100644 --- a/app/contacts/contact_attachments_view.php +++ b/app/contacts/contact_attachments_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_auth.php b/app/contacts/contact_auth.php index 9b5227705..b5c933596 100644 --- a/app/contacts/contact_auth.php +++ b/app/contacts/contact_auth.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files -require_once "resources/require.php"; +require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contact_add')) { //access granted diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index dc795c6b0..5ad312ed7 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php index 4e4603fc7..f08a50a91 100644 --- a/app/contacts/contact_email_edit.php +++ b/app/contacts/contact_email_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_emails.php b/app/contacts/contact_emails.php index ad1201916..be75fd7ab 100644 --- a/app/contacts/contact_emails.php +++ b/app/contacts/contact_emails.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_emails_view.php b/app/contacts/contact_emails_view.php index 2432a1c49..5b474a064 100644 --- a/app/contacts/contact_emails_view.php +++ b/app/contacts/contact_emails_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_extensions.php b/app/contacts/contact_extensions.php index 8d32280c4..f4a74a31d 100644 --- a/app/contacts/contact_extensions.php +++ b/app/contacts/contact_extensions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_extensions_view.php b/app/contacts/contact_extensions_view.php index 8bbc81377..253cd4d57 100644 --- a/app/contacts/contact_extensions_view.php +++ b/app/contacts/contact_extensions_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index 19bab8baf..ec34ba99c 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_import_google.php b/app/contacts/contact_import_google.php index fac4d597a..eed3f6d87 100644 --- a/app/contacts/contact_import_google.php +++ b/app/contacts/contact_import_google.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/functions/google_get_groups.php"; require_once "resources/functions/google_get_contacts.php"; diff --git a/app/contacts/contact_json.php b/app/contacts/contact_json.php index 58c40db77..1489a75dd 100644 --- a/app/contacts/contact_json.php +++ b/app/contacts/contact_json.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php index f4b6763b6..b3aecc351 100644 --- a/app/contacts/contact_note_edit.php +++ b/app/contacts/contact_note_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_notes.php b/app/contacts/contact_notes.php index 5e1e06f3d..e2c9c3dd5 100644 --- a/app/contacts/contact_notes.php +++ b/app/contacts/contact_notes.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_notes_view.php b/app/contacts/contact_notes_view.php index d72e1cc50..15d3bb5f5 100644 --- a/app/contacts/contact_notes_view.php +++ b/app/contacts/contact_notes_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index cea366dad..d87682c2e 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_phones.php b/app/contacts/contact_phones.php index c178233f6..3cf1f2dd0 100644 --- a/app/contacts/contact_phones.php +++ b/app/contacts/contact_phones.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_phones_view.php b/app/contacts/contact_phones_view.php index 54e91b27c..4f0cf2587 100644 --- a/app/contacts/contact_phones_view.php +++ b/app/contacts/contact_phones_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_relation_edit.php b/app/contacts/contact_relation_edit.php index 7161ef8a4..8c31417ae 100644 --- a/app/contacts/contact_relation_edit.php +++ b/app/contacts/contact_relation_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_relations.php b/app/contacts/contact_relations.php index 411d9183d..fc589f96f 100644 --- a/app/contacts/contact_relations.php +++ b/app/contacts/contact_relations.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_relations_view.php b/app/contacts/contact_relations_view.php index 5da2dddfe..42965f78b 100644 --- a/app/contacts/contact_relations_view.php +++ b/app/contacts/contact_relations_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_setting_edit.php b/app/contacts/contact_setting_edit.php index fcb3ef48d..0ada4714d 100644 --- a/app/contacts/contact_setting_edit.php +++ b/app/contacts/contact_setting_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_settings.php b/app/contacts/contact_settings.php index 87fc413ec..563f453c8 100644 --- a/app/contacts/contact_settings.php +++ b/app/contacts/contact_settings.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_time_edit.php b/app/contacts/contact_time_edit.php index d95edec0e..23253720b 100644 --- a/app/contacts/contact_time_edit.php +++ b/app/contacts/contact_time_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_timer.php b/app/contacts/contact_timer.php index 0cc005c1c..52cda7743 100644 --- a/app/contacts/contact_timer.php +++ b/app/contacts/contact_timer.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (!permission_exists('contact_time_add')) { echo "access denied"; exit; } diff --git a/app/contacts/contact_timer_inc.php b/app/contacts/contact_timer_inc.php index acd143c61..babff60c7 100644 --- a/app/contacts/contact_timer_inc.php +++ b/app/contacts/contact_timer_inc.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (!permission_exists('contact_time_add')) { echo "access denied"; exit; } diff --git a/app/contacts/contact_times.php b/app/contacts/contact_times.php index dc3cc0b65..222d87b2d 100644 --- a/app/contacts/contact_times.php +++ b/app/contacts/contact_times.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_times_view.php b/app/contacts/contact_times_view.php index 5d33f73a2..4b79468cf 100644 --- a/app/contacts/contact_times_view.php +++ b/app/contacts/contact_times_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php index 54b1defb5..710326df0 100644 --- a/app/contacts/contact_url_edit.php +++ b/app/contacts/contact_url_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_urls.php b/app/contacts/contact_urls.php index 08ae3a87a..e8d8e5e72 100644 --- a/app/contacts/contact_urls.php +++ b/app/contacts/contact_urls.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_urls_view.php b/app/contacts/contact_urls_view.php index 82e807563..a304779ff 100644 --- a/app/contacts/contact_urls_view.php +++ b/app/contacts/contact_urls_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contact_view.php b/app/contacts/contact_view.php index bbf50c4f6..bd14689da 100644 --- a/app/contacts/contact_view.php +++ b/app/contacts/contact_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index ff6f0b985..69b19d597 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/contacts/contacts_vcard.php b/app/contacts/contacts_vcard.php index 2c09e9ada..914352d76 100644 --- a/app/contacts/contacts_vcard.php +++ b/app/contacts/contacts_vcard.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path -$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); -set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files -require_once "resources/require.php"; +require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contact_view')) { //access granted diff --git a/app/database_transactions/database_transaction_edit.php b/app/database_transactions/database_transaction_edit.php index 848bc2873..4f83cba24 100644 --- a/app/database_transactions/database_transaction_edit.php +++ b/app/database_transactions/database_transaction_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php index 499de0636..b8f3525aa 100644 --- a/app/database_transactions/database_transactions.php +++ b/app/database_transactions/database_transactions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/destinations/destination_download.php b/app/destinations/destination_download.php index 83d8dd5ff..630133a96 100644 --- a/app/destinations/destination_download.php +++ b/app/destinations/destination_download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php index fefe5189b..0740024e5 100644 --- a/app/destinations/destination_edit.php +++ b/app/destinations/destination_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/destinations/destination_imports.php b/app/destinations/destination_imports.php index 1f3675326..f6d50c348 100644 --- a/app/destinations/destination_imports.php +++ b/app/destinations/destination_imports.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 9903b2db3..45c895d29 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/destinations/resources/destinations.php b/app/destinations/resources/destinations.php index 4e27e3b1b..40e7f4be5 100644 --- a/app/destinations/resources/destinations.php +++ b/app/destinations/resources/destinations.php @@ -1,11 +1,7 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/devices/device_copy.php b/app/devices/device_copy.php index 0bd6d20b9..0dc11f909 100644 --- a/app/devices/device_copy.php +++ b/app/devices/device_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/devices/device_download.php b/app/devices/device_download.php index 0d799be0c..6484bae92 100644 --- a/app/devices/device_download.php +++ b/app/devices/device_download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 71633037b..7f6148554 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -22,12 +22,8 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php index 23567a405..a2a16fda1 100644 --- a/app/devices/device_imports.php +++ b/app/devices/device_imports.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/devices/device_profile_copy.php b/app/devices/device_profile_copy.php index 1cf528f83..5fcd65369 100644 --- a/app/devices/device_profile_copy.php +++ b/app/devices/device_profile_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php index aed3b097b..5b65a1ace 100644 --- a/app/devices/device_profile_edit.php +++ b/app/devices/device_profile_edit.php @@ -23,12 +23,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php index a0ecb1f05..d4f8f443a 100644 --- a/app/devices/device_profiles.php +++ b/app/devices/device_profiles.php @@ -23,12 +23,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php index c31c30464..e25979862 100644 --- a/app/devices/device_vendor_edit.php +++ b/app/devices/device_vendor_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php index 249e60050..74947db33 100644 --- a/app/devices/device_vendor_function_edit.php +++ b/app/devices/device_vendor_function_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //add multi-lingual support $language = new text; diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php index 9d518621e..887fd1611 100644 --- a/app/devices/device_vendor_functions.php +++ b/app/devices/device_vendor_functions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/devices/device_vendor_restore.php b/app/devices/device_vendor_restore.php index ab3345e2c..e0a68378c 100644 --- a/app/devices/device_vendor_restore.php +++ b/app/devices/device_vendor_restore.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php index ac13f1b98..f944f63fe 100644 --- a/app/devices/device_vendors.php +++ b/app/devices/device_vendors.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/devices/devices.php b/app/devices/devices.php index e20cacf03..520825591 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/devices/resources/dashboard/device_keys.php b/app/devices/resources/dashboard/device_keys.php index cfc6e1501..23a5eeaf2 100644 --- a/app/devices/resources/dashboard/device_keys.php +++ b/app/devices/resources/dashboard/device_keys.php @@ -22,12 +22,8 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; require_once "resources/check_auth.php"; //add multi-lingual support diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php index 06674fb65..d9e2d2f20 100644 --- a/app/dialplan_inbound/dialplan_inbound_add.php +++ b/app/dialplan_inbound/dialplan_inbound_add.php @@ -26,12 +26,8 @@ Riccardo Granchi */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php index 67dae6530..0ccd3283b 100644 --- a/app/dialplan_outbound/dialplan_outbound_add.php +++ b/app/dialplan_outbound/dialplan_outbound_add.php @@ -28,12 +28,8 @@ Andrew Colin */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/dialplans/dialplan_add.php b/app/dialplans/dialplan_add.php index d484abe26..fe2fe629e 100644 --- a/app/dialplans/dialplan_add.php +++ b/app/dialplans/dialplan_add.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php index bca23d65e..a5fb95846 100644 --- a/app/dialplans/dialplan_edit.php +++ b/app/dialplans/dialplan_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php index 4d38ea4e9..ac4fc407f 100644 --- a/app/dialplans/dialplan_xml.php +++ b/app/dialplans/dialplan_xml.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php index ee6e1c27d..9cb7de6af 100644 --- a/app/dialplans/dialplans.php +++ b/app/dialplans/dialplans.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/domain_limits/resources/dashboard/domain_limits.php b/app/domain_limits/resources/dashboard/domain_limits.php index c03c1c6d2..8e7bc3629 100644 --- a/app/domain_limits/resources/dashboard/domain_limits.php +++ b/app/domain_limits/resources/dashboard/domain_limits.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permisions diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php index 99391a063..73b7c69cf 100644 --- a/app/email_queue/email_queue.php +++ b/app/email_queue/email_queue.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/email_queue/email_queue_delete.php b/app/email_queue/email_queue_delete.php index d69a6f7c0..e2a191fc3 100644 --- a/app/email_queue/email_queue_delete.php +++ b/app/email_queue/email_queue_delete.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/email_queue/email_queue_edit.php b/app/email_queue/email_queue_edit.php index c095b0efb..589c68919 100644 --- a/app/email_queue/email_queue_edit.php +++ b/app/email_queue/email_queue_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/email_templates/email_template_edit.php b/app/email_templates/email_template_edit.php index f60482032..6eb5a3d15 100644 --- a/app/email_templates/email_template_edit.php +++ b/app/email_templates/email_template_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php index 84902db33..2b4ba6077 100644 --- a/app/email_templates/email_templates.php +++ b/app/email_templates/email_templates.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/event_guard/event_guard_log_edit.php b/app/event_guard/event_guard_log_edit.php index 22bf3ee91..57fe155c3 100644 --- a/app/event_guard/event_guard_log_edit.php +++ b/app/event_guard/event_guard_log_edit.php @@ -20,12 +20,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/event_guard/event_guard_logs.php b/app/event_guard/event_guard_logs.php index 5ede53b9a..9884f0b3b 100644 --- a/app/event_guard/event_guard_logs.php +++ b/app/event_guard/event_guard_logs.php @@ -23,12 +23,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/extension_settings/extension_setting_edit.php b/app/extension_settings/extension_setting_edit.php index 94d01a2bd..c8a161513 100644 --- a/app/extension_settings/extension_setting_edit.php +++ b/app/extension_settings/extension_setting_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php index 304fc4707..1aeee7323 100644 --- a/app/extension_settings/extension_settings.php +++ b/app/extension_settings/extension_settings.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php index 6a59132b9..7d9559562 100644 --- a/app/extensions/extension_copy.php +++ b/app/extensions/extension_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php index 4bfad2583..6b72f49cb 100644 --- a/app/extensions/extension_download.php +++ b/app/extensions/extension_download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index c12c0d510..bd7b42fa3 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/extensions/extension_imports.php b/app/extensions/extension_imports.php index 21ea75464..9a440b39d 100644 --- a/app/extensions/extension_imports.php +++ b/app/extensions/extension_imports.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index b2b6eaab2..00937bed7 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/extensions/resources/dashboard/caller_id.php b/app/extensions/resources/dashboard/caller_id.php index 1a765b370..855db17ea 100644 --- a/app/extensions/resources/dashboard/caller_id.php +++ b/app/extensions/resources/dashboard/caller_id.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fax/fax.php b/app/fax/fax.php index 03bb40057..00b8c7f14 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php index 333ad685f..a6c49f699 100644 --- a/app/fax/fax_copy.php +++ b/app/fax/fax_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index 3da0377b6..76f01ab3d 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php index 0304ee933..d5084e20c 100644 --- a/app/fax/fax_emails.php +++ b/app/fax/fax_emails.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path -$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); -set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files -require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/functions/object_to_array.php"; require_once "resources/functions/parse_message.php"; require_once "resources/classes/text.php"; diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php index 5c34c6336..bd3a9d700 100644 --- a/app/fax/fax_files.php +++ b/app/fax/fax_files.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fax/fax_files_remote.php b/app/fax/fax_files_remote.php index 40ef8f32f..11c6d3c3e 100644 --- a/app/fax/fax_files_remote.php +++ b/app/fax/fax_files_remote.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/functions/object_to_array.php"; require_once "resources/functions/parse_message.php"; diff --git a/app/fax/fax_log_view.php b/app/fax/fax_log_view.php index f15c285d6..2693f540c 100644 --- a/app/fax/fax_log_view.php +++ b/app/fax/fax_log_view.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php index f1b2bb010..0d38bd265 100644 --- a/app/fax/fax_logs.php +++ b/app/fax/fax_logs.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fax/fax_outbox.php b/app/fax/fax_outbox.php index 089b19925..bf7d7a705 100644 --- a/app/fax/fax_outbox.php +++ b/app/fax/fax_outbox.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index d02a72f54..6d5cf8b02 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -37,12 +37,8 @@ //send email through browser if (!$included) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fax_queue/fax_queue.php b/app/fax_queue/fax_queue.php index 131e59084..7730b86cc 100644 --- a/app/fax_queue/fax_queue.php +++ b/app/fax_queue/fax_queue.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fax_queue/fax_queue_delete.php b/app/fax_queue/fax_queue_delete.php index af66f42c1..0a9f083a7 100644 --- a/app/fax_queue/fax_queue_delete.php +++ b/app/fax_queue/fax_queue_delete.php @@ -1,11 +1,7 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/fifo_list/fifo_exec.php b/app/fifo_list/fifo_exec.php index a14a46bbb..d84c6b501 100644 --- a/app/fifo_list/fifo_exec.php +++ b/app/fifo_list/fifo_exec.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php index b455614fc..9cb4feb60 100644 --- a/app/fifo_list/fifo_interactive.php +++ b/app/fifo_list/fifo_interactive.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php index 2adf27858..d652c8146 100644 --- a/app/fifo_list/fifo_interactive_inc.php +++ b/app/fifo_list/fifo_interactive_inc.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes filesp"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php index 578851d0e..ec236ec0f 100644 --- a/app/fifo_list/fifo_list.php +++ b/app/fifo_list/fifo_list.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php index 9cde6a9fa..f4b2a3935 100644 --- a/app/fifo_list/fifo_list_inc.php +++ b/app/fifo_list/fifo_list_inc.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php index 872023e20..5e69b5687 100644 --- a/app/gateways/gateway_copy.php +++ b/app/gateways/gateway_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 53c91b7ec..f56b77bfa 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index 0ef0ee1a6..5aa10fd0a 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/gswave/index.php b/app/gswave/index.php index 05ffa7745..157f26384 100644 --- a/app/gswave/index.php +++ b/app/gswave/index.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/ivr_menus/ivr_menu_copy.php b/app/ivr_menus/ivr_menu_copy.php index bce52b0da..44088aa5e 100644 --- a/app/ivr_menus/ivr_menu_copy.php +++ b/app/ivr_menus/ivr_menu_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php index 47b12f4d4..e472c7ce7 100644 --- a/app/ivr_menus/ivr_menu_edit.php +++ b/app/ivr_menus/ivr_menu_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php index 909ea7b38..22a814a7e 100644 --- a/app/ivr_menus/ivr_menus.php +++ b/app/ivr_menus/ivr_menus.php @@ -24,12 +24,8 @@ Mark J. Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php index 2b6625f17..4f01a9724 100644 --- a/app/log_viewer/log_viewer.php +++ b/app/log_viewer/log_viewer.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php index 163618b97..eb482483b 100644 --- a/app/modules/module_edit.php +++ b/app/modules/module_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/modules/modules.php b/app/modules/modules.php index a9a7d7353..01d6a5b3d 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 2c5a116b0..b4887a16e 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php index 2f03425e7..8d4ab1661 100644 --- a/app/music_on_hold/music_on_hold_edit.php +++ b/app/music_on_hold/music_on_hold_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/number_translations/cmd.php b/app/number_translations/cmd.php index a73003adc..ddb1f45a6 100644 --- a/app/number_translations/cmd.php +++ b/app/number_translations/cmd.php @@ -24,12 +24,8 @@ Matthew Vale */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/number_translations/number_translation_edit.php b/app/number_translations/number_translation_edit.php index 220baf4e4..53e0c29a5 100644 --- a/app/number_translations/number_translation_edit.php +++ b/app/number_translations/number_translation_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php index 221446795..ebab021f2 100644 --- a/app/number_translations/number_translations.php +++ b/app/number_translations/number_translations.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php index cfaa85ed4..e1f9c474e 100644 --- a/app/phrases/phrase_edit.php +++ b/app/phrases/phrase_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index d63dd46a0..0b80b72c9 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/pin_numbers/pin_download.php b/app/pin_numbers/pin_download.php index f8b5461e0..d16c4b11d 100644 --- a/app/pin_numbers/pin_download.php +++ b/app/pin_numbers/pin_download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/pin_numbers/pin_number_edit.php b/app/pin_numbers/pin_number_edit.php index eb6ca7260..d6a9455ca 100644 --- a/app/pin_numbers/pin_number_edit.php +++ b/app/pin_numbers/pin_number_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/pin_numbers/pin_numbers.php b/app/pin_numbers/pin_numbers.php index 68dffc454..86fbfcdaa 100644 --- a/app/pin_numbers/pin_numbers.php +++ b/app/pin_numbers/pin_numbers.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/provision/index.php b/app/provision/index.php index 808310000..0cfdcd4bc 100644 --- a/app/provision/index.php +++ b/app/provision/index.php @@ -24,12 +24,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/functions/device_by.php"; //logging diff --git a/app/provision/resources/functions/device_by.php b/app/provision/resources/functions/device_by.php index 62d5def97..0290d6bf6 100644 --- a/app/provision/resources/functions/device_by.php +++ b/app/provision/resources/functions/device_by.php @@ -8,7 +8,6 @@ function device_by_mac($mac) { $database = new database; $row = $database->select($sql, $parameters, 'row'); return is_array($row) && @sizeof($row) != 0 ? $row : false; - unset($sql, $parameters, $row); } function device_by_ext($ext, $domain) { @@ -25,7 +24,6 @@ function device_by_ext($ext, $domain) { $database = new database; $row = $database->select($sql, $parameters, 'row'); return is_array($row) && @sizeof($row) != 0 ? $row : false; - unset($sql, $parameters, $row); } ?> \ No newline at end of file diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php index c4e5959e9..2d6ba29e0 100644 --- a/app/recordings/recording_edit.php +++ b/app/recordings/recording_edit.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/recordings/recording_play.php b/app/recordings/recording_play.php index 71c8a2917..9949600e0 100644 --- a/app/recordings/recording_play.php +++ b/app/recordings/recording_play.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index d5a19a134..733c2212a 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -28,12 +28,8 @@ //set the max php execution time ini_set('max_execution_time', 7200); -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/registrations/registration_reload.php b/app/registrations/registration_reload.php index aa2ec790a..f6c23ba14 100644 --- a/app/registrations/registration_reload.php +++ b/app/registrations/registration_reload.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/registrations/registrations.php b/app/registrations/registrations.php index ab5bc7602..02c8dff23 100644 --- a/app/registrations/registrations.php +++ b/app/registrations/registrations.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes fileshp"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/ring_groups/resources/dashboard/ring_group_forward.php b/app/ring_groups/resources/dashboard/ring_group_forward.php index e1c0ef6b9..0c3061a2e 100644 --- a/app/ring_groups/resources/dashboard/ring_group_forward.php +++ b/app/ring_groups/resources/dashboard/ring_group_forward.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; //add multi-lingual support $language = new text; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index 6e4582183..99755816b 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -26,12 +26,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/classes/ringbacks.php"; diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index 4e29cc0c3..24f07bedf 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php index dc6c58973..8ae3ce0f4 100644 --- a/app/settings/setting_edit.php +++ b/app/settings/setting_edit.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php index 9f7f3c632..a20325135 100644 --- a/app/sip_profiles/sip_profile_copy.php +++ b/app/sip_profiles/sip_profile_copy.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php index 800a5c04c..899049214 100644 --- a/app/sip_profiles/sip_profile_edit.php +++ b/app/sip_profiles/sip_profile_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index bb6cd77ed..0997d2c47 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/sip_status/cmd.php b/app/sip_status/cmd.php index d526b8584..1b4f9e469 100644 --- a/app/sip_status/cmd.php +++ b/app/sip_status/cmd.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php index 20635f51c..5cafceff7 100644 --- a/app/sip_status/sip_status.php +++ b/app/sip_status/sip_status.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/sofia_global_settings/sofia_global_setting_edit.php b/app/sofia_global_settings/sofia_global_setting_edit.php index e6ae3744d..a2bba6a24 100644 --- a/app/sofia_global_settings/sofia_global_setting_edit.php +++ b/app/sofia_global_settings/sofia_global_setting_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php index 9df22293f..656ad3514 100644 --- a/app/sofia_global_settings/sofia_global_settings.php +++ b/app/sofia_global_settings/sofia_global_settings.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/streams/stream_edit.php b/app/streams/stream_edit.php index 171f2797d..ae03b6f2f 100644 --- a/app/streams/stream_edit.php +++ b/app/streams/stream_edit.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/streams/streams.php b/app/streams/streams.php index 869b5e3fa..210568363 100644 --- a/app/streams/streams.php +++ b/app/streams/streams.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/system/system.php b/app/system/system.php index df881173c..e9312a541 100644 --- a/app/system/system.php +++ b/app/system/system.php @@ -25,12 +25,8 @@ James Rose */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php index 069222b53..11a89d786 100644 --- a/app/time_conditions/time_condition_edit.php +++ b/app/time_conditions/time_condition_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php index 0e29d4675..cfc468d58 100644 --- a/app/time_conditions/time_conditions.php +++ b/app/time_conditions/time_conditions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php index 482487646..c1f2ffa37 100644 --- a/app/vars/var_edit.php +++ b/app/vars/var_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/vars/vars.php b/app/vars/vars.php index 2dc274371..cc9dfac1a 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php index 8c0c189be..d65a8f05e 100644 --- a/app/voicemail_greetings/voicemail_greeting_edit.php +++ b/app/voicemail_greetings/voicemail_greeting_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index efb1eb66b..b12ce0f12 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/voicemails/resources/dashboard/voicemails.php b/app/voicemails/resources/dashboard/voicemails.php index 07595149b..d0dbf1ff6 100644 --- a/app/voicemails/resources/dashboard/voicemails.php +++ b/app/voicemails/resources/dashboard/voicemails.php @@ -1,11 +1,7 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/voicemails/voicemail_imports.php b/app/voicemails/voicemail_imports.php index d968734cf..408bcb7e9 100644 --- a/app/voicemails/voicemail_imports.php +++ b/app/voicemails/voicemail_imports.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/voicemails/voicemail_message_toggle.php b/app/voicemails/voicemail_message_toggle.php index c7478657d..46227bbd5 100644 --- a/app/voicemails/voicemail_message_toggle.php +++ b/app/voicemails/voicemail_message_toggle.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index 1846633e1..028923a4f 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/paging.php"; //download the message diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 675581e73..04b35319b 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/xml_cdr/download.php b/app/xml_cdr/download.php index ad138d833..82e6fff56 100644 --- a/app/xml_cdr/download.php +++ b/app/xml_cdr/download.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //check permisions require_once "resources/check_auth.php"; diff --git a/app/xml_cdr/report.php b/app/xml_cdr/report.php index 1753688ff..91a79063f 100644 --- a/app/xml_cdr/report.php +++ b/app/xml_cdr/report.php @@ -25,13 +25,8 @@ James Rose Mark J Crane */ -//includes -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php index 8328150e1..0c469f298 100644 --- a/app/xml_cdr/resources/dashboard/missed_calls.php +++ b/app/xml_cdr/resources/dashboard/missed_calls.php @@ -1,11 +1,7 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/xml_cdr/xml_cdr_archive.php b/app/xml_cdr/xml_cdr_archive.php index dc408c1a2..6c371ba5f 100644 --- a/app/xml_cdr/xml_cdr_archive.php +++ b/app/xml_cdr/xml_cdr_archive.php @@ -28,9 +28,8 @@ //set archive flag $archive_request = true; -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; //includes files require_once "xml_cdr.php"; diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php index aecb797de..dd4677a19 100644 --- a/app/xml_cdr/xml_cdr_details.php +++ b/app/xml_cdr/xml_cdr_details.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/xml_cdr/xml_cdr_export.php b/app/xml_cdr/xml_cdr_export.php index b924a2fa3..2f35d5280 100644 --- a/app/xml_cdr/xml_cdr_export.php +++ b/app/xml_cdr/xml_cdr_export.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php index fa25f550b..3268a693c 100644 --- a/app/xml_cdr/xml_cdr_extension_summary.php +++ b/app/xml_cdr/xml_cdr_extension_summary.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //permisisions diff --git a/app/xml_cdr/xml_cdr_import.php b/app/xml_cdr/xml_cdr_import.php index f7ee4adba..8d6322ebf 100644 --- a/app/xml_cdr/xml_cdr_import.php +++ b/app/xml_cdr/xml_cdr_import.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/pdo.php"; //check the domain cidr range diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index 1c2169329..e97598b8c 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php index 254e1961b..c31dbb4e8 100644 --- a/app/xml_cdr/xml_cdr_search.php +++ b/app/xml_cdr/xml_cdr_search.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index 2e6f6f701..dff55f289 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "xml_cdr_statistics_inc.php"; diff --git a/app/xml_cdr/xml_cdr_statistics_csv.php b/app/xml_cdr/xml_cdr_statistics_csv.php index 8a14f29ca..da2ba1e09 100644 --- a/app/xml_cdr/xml_cdr_statistics_csv.php +++ b/app/xml_cdr/xml_cdr_statistics_csv.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php index f6e0d7ecb..98d192612 100644 --- a/app/xml_cdr/xml_cdr_statistics_inc.php +++ b/app/xml_cdr/xml_cdr_statistics_inc.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/dashboard/dashboard.php b/core/dashboard/dashboard.php index f92c76d9a..e746fb5ed 100644 --- a/core/dashboard/dashboard.php +++ b/core/dashboard/dashboard.php @@ -21,12 +21,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php index 0cbae8b8d..eb470bebd 100644 --- a/core/dashboard/dashboard_edit.php +++ b/core/dashboard/dashboard_edit.php @@ -22,12 +22,8 @@ the Initial Developer. All Rights Reserved. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/dashboard/index.php b/core/dashboard/index.php index 8561bd900..2390d91f0 100644 --- a/core/dashboard/index.php +++ b/core/dashboard/index.php @@ -24,9 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; //if config.conf file does not exist then redirect to the install page if (file_exists("/usr/local/etc/fusionpbx/config.conf")){ diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php index c91c128bc..b408f972c 100644 --- a/core/databases/database_edit.php +++ b/core/databases/database_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/databases/databases.php b/core/databases/databases.php index b78c9f5aa..42ffe08f4 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index a07dabe04..edffd1cdf 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/default_settings/default_setting_toggle.php b/core/default_settings/default_setting_toggle.php index 5c051bfad..1ae444846 100644 --- a/core/default_settings/default_setting_toggle.php +++ b/core/default_settings/default_setting_toggle.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index 14f09b621..cadc5da61 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/default_settings/default_settings_reload.php b/core/default_settings/default_settings_reload.php index 5ac9a854d..1400e7b97 100644 --- a/core/default_settings/default_settings_reload.php +++ b/core/default_settings/default_settings_reload.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 27e23d34e..e8dfe7b44 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index a5f400e83..fa68af05e 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php index e6fe64fc8..691baae90 100644 --- a/core/domains/domain_edit.php +++ b/core/domains/domain_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/domains/domain_json.php b/core/domains/domain_json.php index 675e30b7b..ae6b41f59 100644 --- a/core/domains/domain_json.php +++ b/core/domains/domain_json.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/domains/domains.php b/core/domains/domains.php index 4ebb4018a..89f33318f 100644 --- a/core/domains/domains.php +++ b/core/domains/domains.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/core/groups/group_edit.php b/core/groups/group_edit.php index 8b873e260..80437efbe 100644 --- a/core/groups/group_edit.php +++ b/core/groups/group_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/groups/group_member_add.php b/core/groups/group_member_add.php index 75911fc77..82025ed7a 100644 --- a/core/groups/group_member_add.php +++ b/core/groups/group_member_add.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/groups/group_members.php b/core/groups/group_members.php index 8df988db2..d447b4b06 100644 --- a/core/groups/group_members.php +++ b/core/groups/group_members.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php index c512972a4..25677d163 100644 --- a/core/groups/group_permissions.php +++ b/core/groups/group_permissions.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/groups/groups.php b/core/groups/groups.php index 7912fdcee..44246f011 100644 --- a/core/groups/groups.php +++ b/core/groups/groups.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/core/groups/permissions_copy.php b/core/groups/permissions_copy.php index 2a3583340..c10f16dcf 100644 --- a/core/groups/permissions_copy.php +++ b/core/groups/permissions_copy.php @@ -24,12 +24,8 @@ Sérgio Reis */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/groups/permissions_default.php b/core/groups/permissions_default.php index 5c9b21fa5..1c610cec2 100644 --- a/core/groups/permissions_default.php +++ b/core/groups/permissions_default.php @@ -31,7 +31,7 @@ set_include_path(parse_ini_file($conf[0])['document.root']); //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_edit')) { //access granted @@ -59,4 +59,4 @@ return; } -?> \ No newline at end of file +?> diff --git a/core/install/install.php b/core/install/install.php index cda6bb867..bbdc27e87 100644 --- a/core/install/install.php +++ b/core/install/install.php @@ -128,30 +128,16 @@ //process and save the data if (count($_POST) > 0) { foreach($_POST as $key => $value) { - //$_SESSION['install'][$key] = $value; - if ($key == 'admin_username') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'admin_password') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'domain_name') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'database_host') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'database_port') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'database_name') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'database_username') { - $_SESSION['install'][$key] = $value; - } - if ($key == 'database_password') { - $_SESSION['install'][$key] = $value; + switch($key) { + case 'admin_username': + case 'admin_password': + case 'domain_name': + case 'database_host': + case 'database_port': + case 'database_name': + case 'database_username': + case 'database_password': + $_SESSION['install'][$key] = $value; } } if ($_REQUEST["step"] == "install") { @@ -187,7 +173,7 @@ $output = shell_exec('cd '.$_SERVER["DOCUMENT_ROOT"].' && php /var/www/fusionpbx/core/upgrade/upgrade_schema.php'); //includes - this includes the config.php - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //get the domain name $domain_name = $_SESSION['install']['domain_name']; diff --git a/core/menu/menu.php b/core/menu/menu.php index 1095fd576..c0ae33f26 100644 --- a/core/menu/menu.php +++ b/core/menu/menu.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 234cf226f..252d8277f 100644 --- a/core/menu/menu_edit.php +++ b/core/menu/menu_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index 23e0025d5..f02f68468 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php index 5e4d40973..7fb4b7666 100644 --- a/core/menu/menu_item_list.php +++ b/core/menu/menu_item_list.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php index 6002a1c05..fa95e7ca2 100644 --- a/core/menu/menu_item_move_down.php +++ b/core/menu/menu_item_move_down.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php index 0a077b459..488f1d4c3 100644 --- a/core/menu/menu_item_move_up.php +++ b/core/menu/menu_item_move_up.php @@ -23,12 +23,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_reload.php b/core/menu/menu_reload.php index e9e3882c5..32fcdb440 100644 --- a/core/menu/menu_reload.php +++ b/core/menu/menu_reload.php @@ -62,4 +62,4 @@ header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".urlencode($menu_uuid)); return; -?> \ No newline at end of file +?> diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index 80bc999cb..56d0f737d 100644 --- a/core/menu/menu_restore_default.php +++ b/core/menu/menu_restore_default.php @@ -31,7 +31,7 @@ set_include_path(parse_ini_file($conf[0])['document.root']); //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_restore')) { //access granted diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php index 0958a8ce8..52341a900 100644 --- a/core/notifications/notification_edit.php +++ b/core/notifications/notification_edit.php @@ -24,12 +24,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/upgrade/index.php b/core/upgrade/index.php index a0f0e9408..52f7d6d52 100644 --- a/core/upgrade/index.php +++ b/core/upgrade/index.php @@ -27,12 +27,8 @@ //set a timeout set_time_limit(15*60); //15 minutes -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check the permission diff --git a/core/upgrade/upgrade_domains.php b/core/upgrade/upgrade_domains.php index 3a0bd78b1..99931b27a 100644 --- a/core/upgrade/upgrade_domains.php +++ b/core/upgrade/upgrade_domains.php @@ -26,22 +26,14 @@ //check the permission if(defined('STDIN')) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; $_SERVER["DOCUMENT_ROOT"] = $document_root; $display_type = 'text'; //html, text } else if (!$included) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('upgrade_apps') || if_group("superadmin")) { //echo "access granted"; diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php index 186c02f21..1f5203a29 100644 --- a/core/upgrade/upgrade_schema.php +++ b/core/upgrade/upgrade_schema.php @@ -29,12 +29,8 @@ //check the permission if(defined('STDIN')) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/functions.php"; //set the format diff --git a/core/user_logs/user_log_edit.php b/core/user_logs/user_log_edit.php index cd49d09c9..c48ade8c6 100644 --- a/core/user_logs/user_log_edit.php +++ b/core/user_logs/user_log_edit.php @@ -1,11 +1,7 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/user_settings/user_setting_set.php b/core/user_settings/user_setting_set.php index 3c80ed67c..467ac66ac 100644 --- a/core/user_settings/user_setting_set.php +++ b/core/user_settings/user_setting_set.php @@ -24,12 +24,8 @@ Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //add multi-lingual support diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php index 7f9e2a687..f6035056f 100644 --- a/core/user_settings/user_settings.php +++ b/core/user_settings/user_settings.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/core/users/user_edit.php b/core/users/user_edit.php index 6733eb5e0..8045c2a71 100644 --- a/core/users/user_edit.php +++ b/core/users/user_edit.php @@ -25,12 +25,8 @@ Luis Daniel Lucio Quiroz */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //add multi-lingual support diff --git a/core/users/user_imports.php b/core/users/user_imports.php index d0bfa4244..38706e773 100644 --- a/core/users/user_imports.php +++ b/core/users/user_imports.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/users/user_json.php b/core/users/user_json.php index df4f0d3b0..8be3c6384 100644 --- a/core/users/user_json.php +++ b/core/users/user_json.php @@ -24,9 +24,8 @@ Mark J Crane */ -//includes - require_once "root.php"; - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/users/users.php b/core/users/users.php index 9b44048f9..9f4ea9359 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/paging.php"; diff --git a/index.php b/index.php index b87c2052e..cff652518 100644 --- a/index.php +++ b/index.php @@ -24,10 +24,6 @@ Mark J. Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //start the session ini_set("session.cookie_httponly", True); if (!isset($_SESSION)) { session_start(); } @@ -44,8 +40,8 @@ exit; } -//adds multiple includes - require_once "resources/require.php"; +//includes files + require_once __DIR__ . "/resources/require.php"; //if logged in, redirect to login destination if (isset($_SESSION["username"])) { diff --git a/login.php b/login.php index 6d1c6fa18..a169e6d14 100644 --- a/login.php +++ b/login.php @@ -23,12 +23,8 @@ Contributor(s): Mark J. Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once __DIR__ . "/resources/require.php"; //start session if (!isset($_SESSION)) { session_start(); } diff --git a/logout.php b/logout.php index 2fd1226a6..0f9b7bf69 100644 --- a/logout.php +++ b/logout.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once __DIR__ . "/resources/require.php"; //destroy session session_unset(); diff --git a/resources/check_auth.php b/resources/check_auth.php index 2d2194d10..1302edabb 100644 --- a/resources/check_auth.php +++ b/resources/check_auth.php @@ -24,8 +24,8 @@ Mark J Crane */ -//includes - require_once "resources/require.php"; +//includes files + require_once __DIR__ . "/require.php"; //add multi-lingual support $language = new text; diff --git a/resources/classes/events.php b/resources/classes/events.php index 6de189928..d5ca29e81 100644 --- a/resources/classes/events.php +++ b/resources/classes/events.php @@ -8,12 +8,8 @@ * $e->execute_event(ADD, $params) event type, params is an associative array */ -//set the include path -$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); -set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files -require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; define ("MODULE_LOAD", 1); // when loading a FS module with FS diff --git a/resources/fonts/web_font_loader.php b/resources/fonts/web_font_loader.php index 78fa9e142..2eba29ae8 100644 --- a/resources/fonts/web_font_loader.php +++ b/resources/fonts/web_font_loader.php @@ -1,10 +1,6 @@ */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once __DIR__ . "/require.php"; //set variables if not set //if (!isset($_SESSION["template_content"])) { $_SESSION["template_content"] = null; } diff --git a/resources/header.php b/resources/header.php index 46f13eccd..11fa8f3a6 100644 --- a/resources/header.php +++ b/resources/header.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once __DIR__ . "/require.php"; //if reloadxml then run the command if (permission_exists('dialplan_edit') && isset($_SESSION["reload_xml"])) { diff --git a/resources/login.php b/resources/login.php index 0494a39ef..bd536e376 100644 --- a/resources/login.php +++ b/resources/login.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once __DIR__ . "/require.php"; //add multi-lingual support $language = new text; diff --git a/resources/pdo.php b/resources/pdo.php index b05a537f3..18ccf7f53 100644 --- a/resources/pdo.php +++ b/resources/pdo.php @@ -25,11 +25,8 @@ Raymond Chandler */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files + require_once __DIR__ . "/require.php"; require_once "resources/functions.php"; //set defaults diff --git a/resources/pdo_vm.php b/resources/pdo_vm.php index 65f07dcc6..481fdafe1 100644 --- a/resources/pdo_vm.php +++ b/resources/pdo_vm.php @@ -24,12 +24,8 @@ Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require "resources/require.php"; + require_once __DIR__ . "/require.php"; //get the contents of xml_cdr.conf.xml $conf_xml_string = file_get_contents($_SESSION['switch']['conf']['dir'].'/autoload_configs/voicemail.conf.xml'); @@ -71,4 +67,4 @@ echo 'Connection failed: ' . $e->getMessage(); } - ?> \ No newline at end of file + ?> diff --git a/resources/switch.php b/resources/switch.php index 2c3bfd8cd..27f2c464e 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -26,12 +26,8 @@ Riccardo Granchi */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - -//includes files"; - require_once "resources/require.php"; +//includes files + require_once __DIR__ . "/require.php"; //get the event socket information if (file_exists($_SERVER["PROJECT_ROOT"]."/app/settings/app_config.php")) { diff --git a/resources/uuid.php b/resources/uuid.php index b7e177abb..8ed8b8b3b 100644 --- a/resources/uuid.php +++ b/resources/uuid.php @@ -1,11 +1,7 @@ */ -$output_type = "file"; //file or console +//file or console + $output_type = "file"; -if (defined('STDIN')) { - //get the document root php file must be executed with the full path - $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); - $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); - preg_match("/^(.*)\/secure\/.*$/", $document_root, $matches); - $document_root = $matches[1]; - //set the include path - set_include_path($document_root); - $_SERVER["DOCUMENT_ROOT"] = $document_root; - //echo "$document_root is document_root\n"; -} +//only allow command line + if (!defined('STDIN')) { + exit; + } -$IS_WINDOWS = stristr(PHP_OS, 'WIN') ? true : false; +//determine if windows is true or false + $IS_WINDOWS = stristr(PHP_OS, 'WIN') ? true : false; if (!function_exists('exec_in_dir')) { function exec_in_dir($dir, $cmd, &$ok) { @@ -204,12 +199,8 @@ if (!function_exists('fax_split_dtmf')) { } } -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__) . "/resources/require.php"; include "resources/classes/event_socket.php"; include "resources/phpmailer/class.phpmailer.php"; include "resources/phpmailer/class.smtp.php"; // optional, gets called from within class.phpmailer.php if not already loaded diff --git a/secure/index.php b/secure/index.php index 54eb95224..7f76f305c 100644 --- a/secure/index.php +++ b/secure/index.php @@ -26,11 +26,10 @@ //block directory browsing and send the user to the main index -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); +//includes files + require_once dirname(__DIR__) . "/resources/require.php"; //set a redirect - header("Location: ".PROJECT_PATH."/index.php"); + header("Location: /core/dashboard/index.php"); -?> \ No newline at end of file +?> diff --git a/secure/v_mailto.php b/secure/v_mailto.php index f727a6e80..55687f657 100644 --- a/secure/v_mailto.php +++ b/secure/v_mailto.php @@ -25,17 +25,13 @@ Luis Daniel Lucio Quiroz */ -//set the include path - if (defined('STDIN')) { - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - } - else { +//only allow command line + if (!defined('STDIN')) { exit; } -//include files - require_once "resources/require.php"; +//includes files + require_once dirname(__DIR__) . "/resources/require.php"; //define a function to remove html tags if (!function_exists('remove_tags')) { diff --git a/themes/default/css.php b/themes/default/css.php index 8622725ff..7d29b749f 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -1,11 +1,7 @@