From d7bbcd89f56e7a38169a43a37a9dcec4f79cee4c Mon Sep 17 00:00:00 2001 From: frytimo Date: Thu, 15 Jun 2023 14:28:23 -0300 Subject: [PATCH] Use magic constant dir (#6711) * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ * use magic constant __DIR__ to load only functions.php * replace spaces with tab character * update dirname command to use levels instead of nesting * use magic constant __DIR__ * update dirname command to use levels instead of nesting * Update access_control_edit.php * Update access_control_import.php * Update access_controls.php * Update dnd.php * Update access_controls_reload.php * Update call_center_agents.php * Update call_center_agents.php * Update fax_queue.php * Update login.php * Update pdo.php * Update pdo_vm.php * Update switch.php * Update index.php * Update css.php * Update v_mailto.php * Update fax_to_email.php --------- Co-authored-by: FusionPBX --- app/access_controls/access_control_edit.php | 6 +--- app/access_controls/access_control_import.php | 6 +--- app/access_controls/access_controls.php | 6 +--- .../access_controls_reload.php | 20 +++++------ app/basic_operator_panel/autocomplete.php | 6 +--- app/basic_operator_panel/exec.php | 6 +--- app/basic_operator_panel/index.php | 6 +--- .../resources/content.php | 7 +--- app/bridges/bridge_edit.php | 6 +--- app/bridges/bridges.php | 6 +--- app/call_block/call_block.php | 6 +--- app/call_block/call_block_edit.php | 6 +--- app/call_broadcast/call_broadcast.php | 6 +--- app/call_broadcast/call_broadcast_edit.php | 6 +--- app/call_broadcast/call_broadcast_send.php | 6 +--- app/call_broadcast/call_broadcast_stop.php | 5 +-- app/call_center_active/call_center_active.php | 6 +--- .../call_center_active_inc.php | 6 +--- app/call_center_active/call_center_exec.php | 6 +--- app/call_center_active/call_center_queue.php | 6 +--- app/call_centers/call_center_agent_edit.php | 6 +--- app/call_centers/call_center_agent_status.php | 6 +--- app/call_centers/call_center_agents.php | 6 +--- app/call_centers/call_center_queue_edit.php | 6 +--- app/call_centers/call_center_queues.php | 6 +--- app/call_centers/cmd.php | 6 +--- .../dashboard/call_center_agents.php | 6 +--- .../resources/jobs/call_center_agents.php | 9 +---- app/call_flows/call_flow_edit.php | 6 +--- app/call_flows/call_flows.php | 6 +--- app/call_forward/call_forward.php | 6 +--- app/call_forward/call_forward_edit.php | 6 +--- .../resources/dashboard/call_forward.php | 4 +-- app/call_forward/resources/jobs/dnd.php | 6 +--- app/call_recordings/call_recordings.php | 6 +--- app/call_recordings/download.php | 6 +--- app/calls_active/calls_active.php | 6 +--- app/calls_active/calls_active_inc.php | 6 +--- app/calls_active/calls_exec.php | 8 ++--- app/click_to_call/click_to_call.php | 6 +--- .../conference_center_edit.php | 6 +--- app/conference_centers/conference_centers.php | 6 +--- .../conference_room_edit.php | 6 +--- app/conference_centers/conference_rooms.php | 6 +--- .../conference_session_details.php | 6 +--- .../conference_sessions.php | 6 +--- app/conference_centers/download.php | 6 +--- .../conference_control_detail_edit.php | 6 +--- .../conference_control_details.php | 6 +--- .../conference_control_edit.php | 6 +--- .../conference_controls.php | 6 +--- .../conference_profile_edit.php | 6 +--- .../conference_profile_param_edit.php | 6 +--- .../conference_profile_params.php | 6 +--- .../conference_profiles.php | 6 +--- app/conferences/conference_edit.php | 6 +--- app/conferences/conferences.php | 6 +--- app/conferences_active/conference_exec.php | 8 ++--- .../conference_interactive.php | 6 +--- .../conference_interactive_inc.php | 6 +--- app/conferences_active/conferences_active.php | 6 +--- .../conferences_active_inc.php | 6 +--- app/contacts/contact_address_edit.php | 6 +--- app/contacts/contact_addresses.php | 6 +--- app/contacts/contact_addresses_view.php | 6 +--- app/contacts/contact_attachment.php | 6 +--- app/contacts/contact_attachment_edit.php | 6 +--- app/contacts/contact_attachments.php | 6 +--- app/contacts/contact_attachments_view.php | 6 +--- app/contacts/contact_auth.php | 6 +--- app/contacts/contact_edit.php | 6 +--- app/contacts/contact_email_edit.php | 6 +--- app/contacts/contact_emails.php | 6 +--- app/contacts/contact_emails_view.php | 6 +--- app/contacts/contact_extensions.php | 6 +--- app/contacts/contact_extensions_view.php | 6 +--- app/contacts/contact_import.php | 6 +--- app/contacts/contact_import_google.php | 6 +--- app/contacts/contact_json.php | 6 +--- app/contacts/contact_note_edit.php | 6 +--- app/contacts/contact_notes.php | 6 +--- app/contacts/contact_notes_view.php | 6 +--- app/contacts/contact_phone_edit.php | 6 +--- app/contacts/contact_phones.php | 6 +--- app/contacts/contact_phones_view.php | 6 +--- app/contacts/contact_relation_edit.php | 6 +--- app/contacts/contact_relations.php | 6 +--- app/contacts/contact_relations_view.php | 6 +--- app/contacts/contact_setting_edit.php | 6 +--- app/contacts/contact_settings.php | 6 +--- app/contacts/contact_time_edit.php | 6 +--- app/contacts/contact_timer.php | 6 +--- app/contacts/contact_timer_inc.php | 6 +--- app/contacts/contact_times.php | 6 +--- app/contacts/contact_times_view.php | 6 +--- app/contacts/contact_url_edit.php | 6 +--- app/contacts/contact_urls.php | 6 +--- app/contacts/contact_urls_view.php | 6 +--- app/contacts/contact_view.php | 6 +--- app/contacts/contacts.php | 6 +--- app/contacts/contacts_vcard.php | 6 +--- .../database_transaction_edit.php | 6 +--- .../database_transactions.php | 6 +--- app/destinations/destination_download.php | 6 +--- app/destinations/destination_edit.php | 6 +--- app/destinations/destination_imports.php | 6 +--- app/destinations/destinations.php | 6 +--- app/destinations/resources/destinations.php | 6 +--- app/devices/cmd.php | 6 +--- app/devices/device_copy.php | 6 +--- app/devices/device_download.php | 6 +--- app/devices/device_edit.php | 6 +--- app/devices/device_imports.php | 6 +--- app/devices/device_profile_copy.php | 8 ++--- app/devices/device_profile_edit.php | 6 +--- app/devices/device_profiles.php | 6 +--- app/devices/device_vendor_edit.php | 6 +--- app/devices/device_vendor_function_edit.php | 6 +--- app/devices/device_vendor_functions.php | 8 ++--- app/devices/device_vendor_restore.php | 6 +--- app/devices/device_vendors.php | 6 +--- app/devices/devices.php | 6 +--- .../resources/dashboard/device_keys.php | 6 +--- app/dialplan_inbound/dialplan_inbound_add.php | 6 +--- .../dialplan_outbound_add.php | 6 +--- app/dialplans/dialplan_add.php | 6 +--- app/dialplans/dialplan_edit.php | 6 +--- app/dialplans/dialplan_xml.php | 6 +--- app/dialplans/dialplans.php | 6 +--- .../resources/dashboard/domain_limits.php | 6 +--- app/email_queue/email_queue.php | 6 +--- app/email_queue/email_queue_delete.php | 6 +--- app/email_queue/email_queue_edit.php | 6 +--- app/email_templates/email_template_edit.php | 6 +--- app/email_templates/email_templates.php | 6 +--- app/event_guard/event_guard_log_edit.php | 6 +--- app/event_guard/event_guard_logs.php | 8 ++--- .../extension_setting_edit.php | 6 +--- app/extension_settings/extension_settings.php | 6 +--- app/extensions/extension_copy.php | 6 +--- app/extensions/extension_download.php | 6 +--- app/extensions/extension_edit.php | 6 +--- app/extensions/extension_imports.php | 6 +--- app/extensions/extensions.php | 6 +--- .../resources/dashboard/caller_id.php | 6 +--- app/fax/fax.php | 6 +--- app/fax/fax_copy.php | 6 +--- app/fax/fax_edit.php | 8 ++--- app/fax/fax_emails.php | 6 +--- app/fax/fax_files.php | 6 +--- app/fax/fax_files_remote.php | 6 +--- app/fax/fax_log_view.php | 6 +--- app/fax/fax_logs.php | 6 +--- app/fax/fax_outbox.php | 6 +--- app/fax/fax_send.php | 6 +--- app/fax_queue/fax_queue.php | 6 +--- app/fax_queue/fax_queue_delete.php | 6 +--- app/fax_queue/fax_queue_edit.php | 6 +--- app/fax_queue/resources/job/fax_queue.php | 6 +--- app/fax_queue/resources/job/fax_send.php | 6 +--- app/fax_queue/resources/service/fax_queue.php | 11 ++---- app/fifo/fifo_add.php | 6 +--- app/fifo_list/fifo_exec.php | 6 +--- app/fifo_list/fifo_interactive.php | 6 +--- app/fifo_list/fifo_interactive_inc.php | 8 ++--- app/fifo_list/fifo_list.php | 6 +--- app/fifo_list/fifo_list_inc.php | 6 +--- app/gateways/gateway_copy.php | 6 +--- app/gateways/gateway_edit.php | 6 +--- app/gateways/gateways.php | 6 +--- app/gswave/index.php | 6 +--- app/ivr_menus/ivr_menu_copy.php | 6 +--- app/ivr_menus/ivr_menu_edit.php | 6 +--- app/ivr_menus/ivr_menus.php | 6 +--- app/log_viewer/log_viewer.php | 6 +--- app/modules/module_edit.php | 6 +--- app/modules/modules.php | 6 +--- app/music_on_hold/music_on_hold.php | 6 +--- app/music_on_hold/music_on_hold_edit.php | 6 +--- app/number_translations/cmd.php | 6 +--- .../number_translation_edit.php | 6 +--- .../number_translations.php | 6 +--- app/phrases/phrase_edit.php | 6 +--- app/phrases/phrases.php | 6 +--- app/pin_numbers/pin_download.php | 6 +--- app/pin_numbers/pin_number_edit.php | 6 +--- app/pin_numbers/pin_numbers.php | 6 +--- app/provision/index.php | 6 +--- .../resources/functions/device_by.php | 2 -- app/recordings/recording_edit.php | 6 +--- app/recordings/recording_play.php | 6 +--- app/recordings/recordings.php | 6 +--- app/registrations/registration_reload.php | 6 +--- app/registrations/registrations.php | 8 ++--- .../dashboard/ring_group_forward.php | 6 +--- app/ring_groups/ring_group_edit.php | 6 +--- app/ring_groups/ring_groups.php | 6 +--- app/settings/setting_edit.php | 6 +--- app/sip_profiles/sip_profile_copy.php | 8 ++--- app/sip_profiles/sip_profile_edit.php | 6 +--- app/sip_profiles/sip_profiles.php | 6 +--- app/sip_status/cmd.php | 6 +--- app/sip_status/sip_status.php | 6 +--- .../sofia_global_setting_edit.php | 6 +--- .../sofia_global_settings.php | 8 ++--- app/streams/stream_edit.php | 6 +--- app/streams/streams.php | 6 +--- app/system/system.php | 6 +--- app/time_conditions/time_condition_edit.php | 6 +--- app/time_conditions/time_conditions.php | 6 +--- app/vars/var_edit.php | 6 +--- app/vars/vars.php | 6 +--- .../voicemail_greeting_edit.php | 6 +--- .../voicemail_greetings.php | 6 +--- .../resources/dashboard/voicemails.php | 6 +--- app/voicemails/voicemail_edit.php | 6 +--- app/voicemails/voicemail_imports.php | 6 +--- app/voicemails/voicemail_message_toggle.php | 6 +--- app/voicemails/voicemail_messages.php | 6 +--- app/voicemails/voicemails.php | 6 +--- app/xml_cdr/download.php | 6 +--- app/xml_cdr/report.php | 7 +--- .../resources/dashboard/missed_calls.php | 6 +--- .../resources/dashboard/recent_calls.php | 6 +--- app/xml_cdr/xml_cdr.php | 6 +--- app/xml_cdr/xml_cdr_archive.php | 5 ++- app/xml_cdr/xml_cdr_details.php | 6 +--- app/xml_cdr/xml_cdr_export.php | 6 +--- app/xml_cdr/xml_cdr_extension_summary.php | 6 +--- app/xml_cdr/xml_cdr_import.php | 6 +--- app/xml_cdr/xml_cdr_inc.php | 6 +--- app/xml_cdr/xml_cdr_search.php | 6 +--- app/xml_cdr/xml_cdr_statistics.php | 6 +--- app/xml_cdr/xml_cdr_statistics_csv.php | 6 +--- app/xml_cdr/xml_cdr_statistics_inc.php | 6 +--- core/dashboard/dashboard.php | 6 +--- core/dashboard/dashboard_edit.php | 6 +--- core/dashboard/index.php | 5 ++- core/databases/database_edit.php | 6 +--- core/databases/databases.php | 6 +--- .../default_settings/default_setting_edit.php | 6 +--- .../default_setting_toggle.php | 6 +--- core/default_settings/default_settings.php | 6 +--- .../default_settings_reload.php | 6 +--- core/domain_settings/domain_setting_edit.php | 6 +--- core/domain_settings/domain_settings.php | 6 +--- core/domains/domain_edit.php | 6 +--- core/domains/domain_json.php | 6 +--- core/domains/domains.php | 6 +--- core/groups/group_edit.php | 6 +--- core/groups/group_member_add.php | 6 +--- core/groups/group_members.php | 6 +--- core/groups/group_permissions.php | 6 +--- core/groups/groups.php | 6 +--- core/groups/permissions_copy.php | 6 +--- core/groups/permissions_default.php | 4 +-- core/install/install.php | 36 ++++++------------- core/menu/menu.php | 6 +--- core/menu/menu_edit.php | 6 +--- core/menu/menu_item_edit.php | 8 ++--- core/menu/menu_item_list.php | 6 +--- core/menu/menu_item_move_down.php | 6 +--- core/menu/menu_item_move_up.php | 6 +--- core/menu/menu_reload.php | 2 +- core/menu/menu_restore_default.php | 2 +- core/notifications/notification_edit.php | 6 +--- core/upgrade/index.php | 6 +--- core/upgrade/upgrade_domains.php | 12 ++----- core/upgrade/upgrade_schema.php | 6 +--- core/user_logs/user_log_edit.php | 6 +--- core/user_logs/user_logs.php | 6 +--- core/user_settings/user_dashboard.php | 6 +--- core/user_settings/user_setting_edit.php | 6 +--- core/user_settings/user_setting_set.php | 6 +--- core/user_settings/user_settings.php | 6 +--- core/users/user_edit.php | 6 +--- core/users/user_imports.php | 6 +--- core/users/user_json.php | 5 ++- core/users/users.php | 6 +--- index.php | 8 ++--- login.php | 6 +--- logout.php | 6 +--- resources/check_auth.php | 4 +-- resources/classes/events.php | 6 +--- resources/fonts/web_font_loader.php | 8 ++--- resources/footer.php | 6 +--- resources/header.php | 6 +--- resources/login.php | 6 +--- resources/pdo.php | 5 +-- resources/pdo_vm.php | 8 ++--- resources/switch.php | 8 ++--- resources/uuid.php | 6 +--- secure/fax_to_email.php | 27 +++++--------- secure/index.php | 9 +++-- secure/v_mailto.php | 12 +++---- themes/default/css.php | 6 +--- 296 files changed, 350 insertions(+), 1523 deletions(-) diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index 55681a7576..6f4d3957d2 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 5f74e3c2b3..d8e5c9b465 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 9915200b8b..b0e6d29796 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 678d19c1ad..090e9235e3 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 58f7dc5533..4b30442929 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 5ce188d441..f3165c5ba6 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 7bf75a21dd..24cf2ef348 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 6d145c5da9..9d909fae4c 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 c981a22cbc..9dc0c6ac5a 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 750cb48273..3d1c415068 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 66b502b03c..b0c608f3c7 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 a5620b5376..0636518f13 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 b3983ef308..a743c63603 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 364dd446ee..5c2e44a775 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 cec6e1a851..759b6e8005 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 8a17813eeb..4355a88235 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 5a2c75ffcc..8fe00d1942 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 2fc31bf8f1..e68f24a71f 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 215a14f3fa..45b40dbfba 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 572307c984..e33e2f3d0b 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 77c1b8b9db..288447e9c7 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 5fe53c465e..55b45904ad 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 e44695e878..c220aa59b4 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 492309f8c5..9ee740c9ad 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 325707b8dc..5298d587d6 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 768292b9d5..fe00fb9815 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 ae4d27443b..c3e093cf99 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 2ace1656b4..2d17aabbfb 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 6a62bf0cca..f31a57dbcd 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 0643f176a1..8a6cf3f4b1 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 2ce1cff58d..86933466cb 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 0139155f7c..a1faa43059 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 11cdfb80b1..4f6e01fc54 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 ad61ef73e7..01f71feb8a 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 23dde499b1..ce59e0a640 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 33e25c94b5..d68363876b 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 3821620331..628b297053 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 2dbd421c9e..0a536c9353 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 35fc0848e9..7eb55520f9 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 6a0e97a9c7..e280bff36c 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 d5b6c72b47..0b9aa8f957 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 1aeaacf087..09b748569e 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 a1b2731c28..2634bde577 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 b44641bc5f..b1ef42a2ec 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 a6f6408d45..874494d128 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 127e3b909f..fa47aad646 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 2627097a89..5850ac384f 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 28bd4907c0..89734da20b 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 6e35f0111f..2ea91f8c52 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 55a3ef41c3..0b18badf4b 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 15b1edb51e..13ee243877 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 02af38d136..1b7a8fbca1 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 38d3637bb1..451cae6c9e 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 eb0fe0247e..50930439ef 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 bd4c33f27e..182e2bd4fa 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 d6321fc5ee..3ec5556fcc 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 6b04c99333..99752972d1 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 e521bab063..4b9315da13 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 c05c92ba2e..93c9ba3d8b 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 fbf13a5c3e..7089bd1f19 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 c3e9074ac6..a5aa418d24 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 d17dee8b81..39fe827fe1 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 511a98c283..2b2de87980 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 75759c7a8c..d8ff8458a4 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 e4eb0d7209..17bd55b799 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 e01a95a0eb..3db97f1ea5 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 1d932b1665..645f65dc29 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 9b52277050..b5c9335960 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 dc795c6b06..5ad312ed78 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 4e4603fc74..f08a50a917 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 ad12019163..be75fd7ab7 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 2432a1c49b..5b474a0648 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 8d32280c4c..f4a74a31d9 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 8bbc813776..253cd4d577 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 19bab8baf7..ec34ba99c4 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 fac4d597a9..eed3f6d878 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 58c40db776..1489a75dd6 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 f4b6763b6f..b3aecc351a 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 5e1e06f3de..e2c9c3dd52 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 d72e1cc505..15d3bb5f5d 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 cea366dadf..d87682c2e0 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 c178233f6c..3cf1f2dd04 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 54e91b27c1..4f0cf25874 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 7161ef8a4f..8c31417ae4 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 411d9183dc..fc589f96fb 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 5da2dddfe5..42965f78b1 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 fcb3ef48d5..0ada4714dc 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 87fc413ec6..563f453c8d 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 d95edec0ec..23253720bc 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 0cc005c1cd..52cda7743b 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 acd143c61a..babff60c7c 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 dc3cc0b656..222d87b2d5 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 5d33f73a2d..4b79468cf7 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 54b1defb53..710326df03 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 08ae3a87a5..e8d8e5e720 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 82e8075632..a304779ff3 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 bbf50c4f6d..bd14689da3 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 ff6f0b9851..69b19d5970 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 2c09e9ada2..914352d763 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 848bc28736..4f83cba244 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 499de06361..b8f3525aa2 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 83d8dd5ffb..630133a961 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 fefe5189b3..0740024e52 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 1f36753266..f6d50c348e 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 9903b2db3b..45c895d294 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 4e27e3b1b3..40e7f4be51 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 0bd6d20b93..0dc11f9090 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 0d799be0cb..6484bae929 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 71633037b9..7f61485541 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 23567a4054..a2a16fda17 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 1cf528f83f..5fcd653694 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 aed3b097b9..5b65a1ace7 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 a0ecb1f05d..d4f8f443ab 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 c31c30464e..e25979862b 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 249e600502..74947db333 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 9d518621e9..887fd16113 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 ab3345e2c9..e0a68378c3 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 ac13f1b986..f944f63fe6 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 e20cacf035..520825591a 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 cfc6e15014..23a5eeaf2e 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 06674fb654..d9e2d2f20b 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 67dae65309..0ccd3283bd 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 d484abe262..fe2fe629e8 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 bca23d65ec..a5fb95846b 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 4d38ea4e98..ac4fc407f1 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 ee6e1c27d7..9cb7de6afd 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 c03c1c6d20..8e7bc36290 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 99391a063b..73b7c69cf1 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 d69a6f7c07..e2a191fc3a 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 c095b0efb3..589c68919f 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 f60482032e..6eb5a3d15a 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 84902db335..2b4ba6077e 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 22bf3ee915..57fe155c31 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 5ede53b9a4..9884f0b3b5 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 94d01a2bd3..c8a1615133 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 304fc47078..1aeee73236 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 6a59132b9f..7d9559562b 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 4bfad25831..6b72f49cbd 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 c12c0d5109..bd7b42fa35 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 21ea754642..9a440b39d9 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 b2b6eaab20..00937bed74 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 1a765b370a..855db17ea5 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 03bb40057a..00b8c7f149 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 333ad685f9..a6c49f699f 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 3da0377b6a..76f01ab3d4 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 0304ee9331..d5084e20c6 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 5c34c63369..bd3a9d7003 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 40ef8f32fe..11c6d3c3e4 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 f15c285d64..2693f540c5 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 f1b2bb0103..0d38bd2651 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 089b19925a..bf7d7a7054 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 d02a72f546..6d5cf8b02b 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 131e590847..7730b86cc0 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 af66f42c11..0a9f083a76 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 a14a46bbb4..d84c6b501f 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 b455614fc9..9cb4feb60b 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 2adf27858a..d652c8146e 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 578851d0ee..ec236ec0ff 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 9cde6a9fab..f4b2a3935e 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 872023e208..5e69b56872 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 53c91b7ec8..f56b77bfae 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 0ef0ee1a66..5aa10fd0ae 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 05ffa77452..157f26384b 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 bce52b0da6..44088aa5e8 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 47b12f4d43..e472c7ce7b 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 909ea7b38d..22a814a7e7 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 2b6625f178..4f01a97245 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 163618b97d..eb482483b9 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 a9a7d73535..01d6a5b3d0 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 2c5a116b0d..b4887a16e7 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 2f03425e75..8d4ab16615 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 a73003adc3..ddb1f45a67 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 220baf4e48..53e0c29a51 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 2214467955..ebab021f2b 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 cfaa85ed48..e1f9c474e1 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 d63dd46a0b..0b80b72c96 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 f8b5461e02..d16c4b11d3 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 eb6ca72608..d6a9455ca4 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 68dffc4546..86fbfcdaa4 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 8083100000..0cfdcd4bcf 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 62d5def975..0290d6bf69 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 c4e5959e95..2d6ba29e04 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 71c8a29174..9949600e0e 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 d5a19a134f..733c2212a1 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 aa2ec790a1..f6c23ba148 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 ab5bc7602a..02c8dff236 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 e1c0ef6b98..0c3061a2ee 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 6e45821837..99755816ba 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 4e29cc0c3a..24f07bedf6 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 dc6c58973c..8ae3ce0f42 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 9f7f3c6325..a203251351 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 800a5c04c3..8990492143 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 bb6cd77ed9..0997d2c479 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 d526b85841..1b4f9e469f 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 20635f51cb..5cafceff7d 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 e6ae3744d9..a2bba6a24b 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 9df22293f6..656ad35145 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 171f2797da..ae03b6f2f7 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 869b5e3faa..210568363e 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 df881173c4..e9312a541e 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 069222b537..11a89d786a 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 0e29d4675f..cfc468d581 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 4824876469..c1f2ffa370 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 2dc274371b..cc9dfac1a1 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 8c0c189bee..d65a8f05ee 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 efb1eb66bc..b12ce0f127 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 07595149bd..d0dbf1ff6d 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 d968734cf5..408bcb7e99 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 c7478657d3..46227bbd55 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 1846633e16..028923a4fc 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 675581e739..04b35319b6 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 ad138d8334..82e6fff561 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 1753688ff3..91a79063f7 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 8328150e1c..0c469f298e 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 dc408c1a22..6c371ba5fe 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 aecb797ded..dd4677a197 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 b924a2fa37..2f35d52808 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 fa25f550b7..3268a693c9 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 f7ee4adba8..8d6322ebf1 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 1c21693294..e97598b8ce 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 254e1961be..c31dbb4e8e 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 2e6f6f7019..dff55f2895 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 8a14f29cac..da2ba1e09f 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 f6e0d7ecbe..98d1926126 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 f92c76d9a4..e746fb5ed5 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 0cbae8b8df..eb470bebd9 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 8561bd9008..2390d91f03 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 c91c128bc2..b408f972c9 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 b78c9f5aad..42ffe08f4a 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 a07dabe04b..edffd1cdfb 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 5c051bfadb..1ae444846c 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 14f09b6212..cadc5da616 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 5ac9a854d5..1400e7b976 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 27e23d34e8..e8dfe7b442 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 a5f400e835..fa68af05eb 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 e6fe64fc86..691baae90a 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 675e30b7b2..ae6b41f593 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 4ebb4018a8..89f33318fd 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 8b873e2603..80437efbe7 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 75911fc775..82025ed7af 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 8df988db23..d447b4b065 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 c512972a47..25677d1633 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 7912fdceea..44246f0115 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 2a35833409..c10f16dcf5 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 5c9b21fa5f..1c610cec2a 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 cda6bb8671..bbdc27e876 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 1095fd5760..c0ae33f265 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 234cf226f3..252d8277f2 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 23e0025d5d..f02f684682 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 5e4d409737..7fb4b76666 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 6002a1c05b..fa95e7ca23 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 0a077b4593..488f1d4c31 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 e9e3882c51..32fcdb4407 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 80bc999cb9..56d0f737d8 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 0958a8ce8b..52341a9001 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 a0f0e94081..52f7d6d52f 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 3a0bd78b12..99931b27a1 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 186c02f213..1f5203a296 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 cd49d09c9c..c48ade8c63 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 3c80ed67c2..467ac66ac5 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 7f9e2a6870..f6035056fb 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 6733eb5e00..8045c2a71f 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 d0bfa42444..38706e773c 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 df4f0d3b0a..8be3c63847 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 9b44048f9a..9f4ea9359f 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 b87c2052e6..cff652518b 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 6d1c6fa188..a169e6d144 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 2fd1226a67..0f9b7bf694 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 2d2194d10d..1302edabb9 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 6de1899289..d5ca29e81f 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 78fa9e1428..2eba29ae86 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 46f13eccd7..11fa8f3a65 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 0494a39efc..bd536e376c 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 b05a537f31..18ccf7f53b 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 65f07dcc6c..481fdafe1f 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 2c3bfd8cd5..27f2c464ed 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 b7e177abb3..8ed8b8b3b6 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 54eb95224f..7f76f305c0 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 f727a6e807..55687f657f 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 8622725ff5..7d29b749fa 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -1,11 +1,7 @@