diff --git a/app/adminer/adminer.php b/app/adminer/adminer.php index 0a3e99d870..8e9e5ceeb0 100644 --- a/app/adminer/adminer.php +++ b/app/adminer/adminer.php @@ -2,7 +2,7 @@ //customization - begin //includes include "root.php"; - require_once "includes/require.php"; + require_once "resources/require.php"; require_once "resources/check_auth.php"; //only allow users in the superadmin group to use this feature if (if_group("superadmin")) { diff --git a/app/adminer/index.php b/app/adminer/index.php index 71efae4653..f79242b1fb 100644 --- a/app/adminer/index.php +++ b/app/adminer/index.php @@ -2,7 +2,7 @@ //includes include "root.php"; - require_once "includes/require.php"; + require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permission diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index 5d2066f9d6..102bbb70f3 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "app_languages.php"; if (permission_exists('call_broadcast_view')) { diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php index be7a1ba001..a163000698 100644 --- a/app/call_broadcast/call_broadcast_delete.php +++ b/app/call_broadcast/call_broadcast_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_broadcast_delete')) { //access granted diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index 737f0849c0..da899eae60 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_broadcast_edit')) { //access granted diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php index 4d71e85373..400018baa2 100644 --- a/app/call_broadcast/call_broadcast_send.php +++ b/app/call_broadcast/call_broadcast_send.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_broadcast_send')) { //access granted diff --git a/app/call_center/call_center_agent_delete.php b/app/call_center/call_center_agent_delete.php index 63e3e7ed3c..d2d2fe1ba6 100644 --- a/app/call_center/call_center_agent_delete.php +++ b/app/call_center/call_center_agent_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_agents_delete')) { //access granted diff --git a/app/call_center/call_center_agent_edit.php b/app/call_center/call_center_agent_edit.php index 32c797c7a7..1c9e47ba98 100644 --- a/app/call_center/call_center_agent_edit.php +++ b/app/call_center/call_center_agent_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_agents_add') || permission_exists('call_center_agents_edit')) { //access granted diff --git a/app/call_center/call_center_agent_status.php b/app/call_center/call_center_agent_status.php index d464a62a08..31c2ddd5b7 100644 --- a/app/call_center/call_center_agent_status.php +++ b/app/call_center/call_center_agent_status.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_agents_edit')) { //access granted diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php index 77674367e8..bb1d89c946 100644 --- a/app/call_center/call_center_agents.php +++ b/app/call_center/call_center_agents.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_agents_view')) { //access granted diff --git a/app/call_center/call_center_queue_delete.php b/app/call_center/call_center_queue_delete.php index 950ab203df..bb233e929c 100644 --- a/app/call_center/call_center_queue_delete.php +++ b/app/call_center/call_center_queue_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_queues_delete')) { //access granted diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php index 83d393bfd3..c885e249b9 100644 --- a/app/call_center/call_center_queue_edit.php +++ b/app/call_center/call_center_queue_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_queues_add') || permission_exists('call_center_queues_edit')) { //access granted diff --git a/app/call_center/call_center_queues.php b/app/call_center/call_center_queues.php index 6ad655df23..f9d8b85b2f 100644 --- a/app/call_center/call_center_queues.php +++ b/app/call_center/call_center_queues.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_queues_view')) { //access granted diff --git a/app/call_center/call_center_tier_delete.php b/app/call_center/call_center_tier_delete.php index 6a5f8073fc..2e4afee9bc 100644 --- a/app/call_center/call_center_tier_delete.php +++ b/app/call_center/call_center_tier_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_tiers_delete')) { //access granted diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php index f0bde290e8..ebc258dbfd 100644 --- a/app/call_center/call_center_tier_edit.php +++ b/app/call_center/call_center_tier_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_tiers_add') || permission_exists('call_center_tiers_edit')) { //access granted diff --git a/app/call_center/call_center_tiers.php b/app/call_center/call_center_tiers.php index fe9d6ef4db..d57a97710b 100644 --- a/app/call_center/call_center_tiers.php +++ b/app/call_center/call_center_tiers.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_tiers_view')) { //access granted diff --git a/app/call_center/cmd.php b/app/call_center/cmd.php index 0e79850aa0..4b92aeed1f 100644 --- a/app/call_center/cmd.php +++ b/app/call_center/cmd.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_queues_add') || permission_exists('call_center_queues_edit')) { //access granted diff --git a/app/call_center_active/call_center_active.php b/app/call_center_active/call_center_active.php index 69b3c14dd1..0dca86fc87 100644 --- a/app/call_center_active/call_center_active.php +++ b/app/call_center_active/call_center_active.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_active_view')) { //access granted diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php index 21f48dd52a..fd29215a7f 100644 --- a/app/call_center_active/call_center_active_inc.php +++ b/app/call_center_active/call_center_active_inc.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_active_view')) { //access granted diff --git a/app/call_center_active/call_center_exec.php b/app/call_center_active/call_center_exec.php index 2835bb1918..6134b3472f 100644 --- a/app/call_center_active/call_center_exec.php +++ b/app/call_center_active/call_center_exec.php @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_active_view')) { //access granted diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index ac25f27d0e..79edc3d659 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_center_active_view')) { //access granted diff --git a/app/call_flows/call_flow_delete.php b/app/call_flows/call_flow_delete.php index 6096aba62a..a05a44a118 100644 --- a/app/call_flows/call_flow_delete.php +++ b/app/call_flows/call_flow_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_flow_delete')) { //access granted diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index 1afe28adb0..ad983bb12b 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_flow_add') || permission_exists('call_flow_edit')) { //access granted diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php index 740fefdef4..7f3fe812d6 100644 --- a/app/call_flows/call_flows.php +++ b/app/call_flows/call_flows.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('call_flow_view')) { //access granted diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php index 4e793a4a03..2cd8dd4f43 100644 --- a/app/calls/call_edit.php +++ b/app/calls/call_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "app_languages.php"; if (permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb')) { diff --git a/app/calls/calls.php b/app/calls/calls.php index 91861b31c4..4827d4f09c 100644 --- a/app/calls/calls.php +++ b/app/calls/calls.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb')) { //access granted diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php index 9f48898a6d..8657e2a2a2 100644 --- a/app/calls_active/calls_active.php +++ b/app/calls_active/calls_active.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; if (permission_exists('calls_active_view')) { diff --git a/app/calls_active/calls_active_assigned_extensions_inc.php b/app/calls_active/calls_active_assigned_extensions_inc.php index 771598895c..9fa57beaac 100644 --- a/app/calls_active/calls_active_assigned_extensions_inc.php +++ b/app/calls_active/calls_active_assigned_extensions_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; if (permission_exists('extensions_active_assigned_view')) { diff --git a/app/calls_active/calls_active_extensions.php b/app/calls_active/calls_active_extensions.php index fae118e17d..6545f8728a 100644 --- a/app/calls_active/calls_active_extensions.php +++ b/app/calls_active/calls_active_extensions.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; if (permission_exists('extensions_active_view')) { diff --git a/app/calls_active/calls_active_extensions_inc.php b/app/calls_active/calls_active_extensions_inc.php index 301acafefe..5a9bc0609a 100644 --- a/app/calls_active/calls_active_extensions_inc.php +++ b/app/calls_active/calls_active_extensions_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; if (permission_exists('extensions_active_view')) { diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php index 8c45e9650d..bd78231dfb 100644 --- a/app/calls_active/calls_active_inc.php +++ b/app/calls_active/calls_active_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; if (permission_exists('calls_active_view')) { diff --git a/app/calls_active/calls_exec.php b/app/calls_active/calls_exec.php index efc266e10f..ea5f3b6978 100644 --- a/app/calls_active/calls_exec.php +++ b/app/calls_active/calls_exec.php @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('calls_active_view') || permission_exists('extensions_active_view')) { //access granted diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php index 007b5dcddb..369847d08c 100644 --- a/app/click_to_call/click_to_call.php +++ b/app/click_to_call/click_to_call.php @@ -31,7 +31,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('click_to_call_view')) { //access granted diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php index a04ca63092..df19039185 100644 --- a/app/conference_centers/conference_center_delete.php +++ b/app/conference_centers/conference_center_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_center_delete')) { //access granted diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index 8b149e9f24..9633563fcb 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_center_add') || permission_exists('conference_center_edit')) { //access granted diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 9e7bdc47f6..6e7484068c 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_center_view')) { //access granted diff --git a/app/conference_centers/conference_room_delete.php b/app/conference_centers/conference_room_delete.php index 16d07bc6b8..b534d05275 100644 --- a/app/conference_centers/conference_room_delete.php +++ b/app/conference_centers/conference_room_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_room_delete')) { //access granted diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index da81fafeb9..04f4b70e9b 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_room_add') || permission_exists('conference_room_edit')) { //access granted diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 9c0bf0be28..1afc416d8b 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_room_view')) { //access granted diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php index f2867dee0c..fc567d6076 100644 --- a/app/conference_centers/conference_session_details.php +++ b/app/conference_centers/conference_session_details.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_session_view')) { //access granted diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php index 8f54dcd9e7..b91dd7187e 100644 --- a/app/conference_centers/conference_sessions.php +++ b/app/conference_centers/conference_sessions.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_session_view')) { //access granted diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php index 54b0586726..be899231bf 100644 --- a/app/conferences/conference_delete.php +++ b/app/conferences/conference_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_delete')) { //access granted diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index f874875c55..3bc41caa34 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_add') || permission_exists('conference_edit')) { //access granted diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index eeeac4cf90..e622c505c4 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conference_view')) { //access granted diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php index d4b291fd15..937a992a13 100644 --- a/app/conferences_active/conference_exec.php +++ b/app/conferences_active/conference_exec.php @@ -39,7 +39,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conferences_active_view')) { //access granted diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php index bccaeae707..539f75b8f7 100644 --- a/app/conferences_active/conference_interactive.php +++ b/app/conferences_active/conference_interactive.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conferences_active_view')) { //access granted diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index 3c715674d4..dfe709a818 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conferences_active_view')) { //access granted diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php index f7da86c222..43ab5f90f2 100644 --- a/app/conferences_active/conferences_active.php +++ b/app/conferences_active/conferences_active.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conferences_active_advanced_view')) { //access granted diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index fac5dc4c1a..3425454fb1 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('conferences_active_advanced_view')) { //access granted diff --git a/app/contacts/contact_addresses.php b/app/contacts/contact_addresses.php index 680ffe4811..4041984444 100644 --- a/app/contacts/contact_addresses.php +++ b/app/contacts/contact_addresses.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_view')) { //access granted diff --git a/app/contacts/contact_addresses_delete.php b/app/contacts/contact_addresses_delete.php index 4ece9e5507..4d83869cde 100644 --- a/app/contacts/contact_addresses_delete.php +++ b/app/contacts/contact_addresses_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_delete')) { //access granted diff --git a/app/contacts/contact_addresses_edit.php b/app/contacts/contact_addresses_edit.php index 261d44f0a2..ebb4267a93 100644 --- a/app/contacts/contact_addresses_edit.php +++ b/app/contacts/contact_addresses_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_edit')) { //access granted diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index 2c0f01dd9d..d668ade3df 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_add')) { //access granted diff --git a/app/contacts/contact_notes.php b/app/contacts/contact_notes.php index e6737095db..792ad4de0e 100644 --- a/app/contacts/contact_notes.php +++ b/app/contacts/contact_notes.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_view')) { //access granted diff --git a/app/contacts/contact_notes_delete.php b/app/contacts/contact_notes_delete.php index ecfd176864..27f5771adb 100644 --- a/app/contacts/contact_notes_delete.php +++ b/app/contacts/contact_notes_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_delete')) { //access granted diff --git a/app/contacts/contact_notes_edit.php b/app/contacts/contact_notes_edit.php index 461a897f41..be1b2cfeff 100644 --- a/app/contacts/contact_notes_edit.php +++ b/app/contacts/contact_notes_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_edit')) { //access granted diff --git a/app/contacts/contact_phones.php b/app/contacts/contact_phones.php index 1f354993ee..ee7cce70f9 100644 --- a/app/contacts/contact_phones.php +++ b/app/contacts/contact_phones.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_view')) { //access granted diff --git a/app/contacts/contact_phones_delete.php b/app/contacts/contact_phones_delete.php index 70b7159715..b05872e892 100644 --- a/app/contacts/contact_phones_delete.php +++ b/app/contacts/contact_phones_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_delete')) { //access granted diff --git a/app/contacts/contact_phones_edit.php b/app/contacts/contact_phones_edit.php index f8f209d82a..1c9ea62dcc 100644 --- a/app/contacts/contact_phones_edit.php +++ b/app/contacts/contact_phones_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_edit')) { //access granted diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index c1f6ac76f6..98e4712155 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_view')) { //access granted diff --git a/app/contacts/contacts_delete.php b/app/contacts/contacts_delete.php index 421a0752e3..e5986616e9 100644 --- a/app/contacts/contacts_delete.php +++ b/app/contacts/contacts_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_delete')) { //access granted diff --git a/app/contacts/contacts_edit.php b/app/contacts/contacts_edit.php index fee72d2b08..1d178ded76 100644 --- a/app/contacts/contacts_edit.php +++ b/app/contacts/contacts_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_edit')) { //access granted diff --git a/app/contacts/contacts_vcard.php b/app/contacts/contacts_vcard.php index 84f15d94b9..469bc65f91 100644 --- a/app/contacts/contacts_vcard.php +++ b/app/contacts/contacts_vcard.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('contacts_view')) { //access granted diff --git a/app/content/index.php b/app/content/index.php index 5259778ffa..c34770126d 100644 --- a/app/content/index.php +++ b/app/content/index.php @@ -26,7 +26,7 @@ return; //disable include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('content_view')) { //access granted diff --git a/app/content/rss.php b/app/content/rss.php index 509cbf14af..d7887a97f4 100644 --- a/app/content/rss.php +++ b/app/content/rss.php @@ -26,7 +26,7 @@ */ return; //disable include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rssadd.php b/app/content/rssadd.php index 697b259a6b..206584ce89 100644 --- a/app/content/rssadd.php +++ b/app/content/rssadd.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_add')) { diff --git a/app/content/rsscontent.php b/app/content/rsscontent.php index 77630f5fcb..9ff3c3aa04 100644 --- a/app/content/rsscontent.php +++ b/app/content/rsscontent.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rssdelete.php b/app/content/rssdelete.php index 100154f30e..a71e22d4c9 100644 --- a/app/content/rssdelete.php +++ b/app/content/rssdelete.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_delete')) { diff --git a/app/content/rsslist.php b/app/content/rsslist.php index b116d09022..e2142928e0 100644 --- a/app/content/rsslist.php +++ b/app/content/rsslist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rssmovedown.php b/app/content/rssmovedown.php index 5e0a138cb4..d02f83b751 100644 --- a/app/content/rssmovedown.php +++ b/app/content/rssmovedown.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_edit')) { diff --git a/app/content/rssmoveup.php b/app/content/rssmoveup.php index ec18ed8d3c..5eee40fb66 100644 --- a/app/content/rssmoveup.php +++ b/app/content/rssmoveup.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rsssearch.php b/app/content/rsssearch.php index 7d2bcd88a5..471550d16a 100644 --- a/app/content/rsssearch.php +++ b/app/content/rsssearch.php @@ -27,7 +27,7 @@ return; //disabled include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rsssubadd.php b/app/content/rsssubadd.php index 7270be8251..a2b2d828aa 100644 --- a/app/content/rsssubadd.php +++ b/app/content/rsssubadd.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_add')) { diff --git a/app/content/rsssubcategoryadd.php b/app/content/rsssubcategoryadd.php index a415f4ad0b..ebd884097b 100644 --- a/app/content/rsssubcategoryadd.php +++ b/app/content/rsssubcategoryadd.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_add')) { diff --git a/app/content/rsssubcategorylist.php b/app/content/rsssubcategorylist.php index 3ee9456e6e..dc8a2b248b 100644 --- a/app/content/rsssubcategorylist.php +++ b/app/content/rsssubcategorylist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rsssubcategoryupdate.php b/app/content/rsssubcategoryupdate.php index bd375be326..da2130ba3f 100644 --- a/app/content/rsssubcategoryupdate.php +++ b/app/content/rsssubcategoryupdate.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_edit')) { diff --git a/app/content/rsssubdelete.php b/app/content/rsssubdelete.php index d3be48de79..acc49751c8 100644 --- a/app/content/rsssubdelete.php +++ b/app/content/rsssubdelete.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_delete')) { diff --git a/app/content/rsssublist.php b/app/content/rsssublist.php index 443c7e0c88..88a422b917 100644 --- a/app/content/rsssublist.php +++ b/app/content/rsssublist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rsssubsearch.php b/app/content/rsssubsearch.php index f42c65633f..1e95d1fa64 100644 --- a/app/content/rsssubsearch.php +++ b/app/content/rsssubsearch.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_view')) { diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php index e389718d9c..2f2f84db91 100644 --- a/app/content/rsssubupdate.php +++ b/app/content/rsssubupdate.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_edit')) { diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php index d8eeda2bf3..9a09596cf0 100644 --- a/app/content/rssupdate.php +++ b/app/content/rssupdate.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "config.php"; if (permission_exists('content_edit')) { diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php index f119a64bd8..a6aa89d7e4 100644 --- a/app/destinations/destination_delete.php +++ b/app/destinations/destination_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('destination_delete')) { //access granted diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php index be74ec1e4c..81bd3e4414 100644 --- a/app/destinations/destination_edit.php +++ b/app/destinations/destination_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('destination_add') || permission_exists('destination_edit')) { //access granted diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 4e5cd674a6..b7c4f37bad 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/app/devices/device_delete.php b/app/devices/device_delete.php index a86c6a68d1..87b4b0f49b 100644 --- a/app/devices/device_delete.php +++ b/app/devices/device_delete.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('device_delete')) { //access granted diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 295bbd0a75..7f7afe86f8 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //check permissions require_once "resources/check_auth.php"; diff --git a/app/devices/device_line_delete.php b/app/devices/device_line_delete.php index 6079a3172b..136c329d59 100644 --- a/app/devices/device_line_delete.php +++ b/app/devices/device_line_delete.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('device_delete')) { //access granted diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php index 6d7bf1bc40..b42dae44cc 100644 --- a/app/devices/device_line_edit.php +++ b/app/devices/device_line_edit.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('device_add') || permission_exists('device_edit')) { //access granted diff --git a/app/devices/devices.php b/app/devices/devices.php index e7b31c2aeb..63f4a98ed7 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -23,7 +23,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('device_view')) { //access granted diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php index e163851eda..842d290d87 100644 --- a/app/dialplan/dialplan_add.php +++ b/app/dialplan/dialplan_add.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('dialplan_add')) { //access granted diff --git a/app/dialplan/dialplan_advanced.php b/app/dialplan/dialplan_advanced.php index 886c36e36f..feba2ea677 100644 --- a/app/dialplan/dialplan_advanced.php +++ b/app/dialplan/dialplan_advanced.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('dialplan_advanced_view')) { //access granted diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php index 534cde05ba..8be522ff4c 100644 --- a/app/dialplan/dialplan_copy.php +++ b/app/dialplan/dialplan_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('dialplan_add') diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php index 9b75fe7a20..5ad9e1e936 100644 --- a/app/dialplan/dialplan_delete.php +++ b/app/dialplan/dialplan_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('dialplan_delete') || permission_exists('inbound_route_delete') diff --git a/app/dialplan/dialplan_details_delete.php b/app/dialplan/dialplan_details_delete.php index 90fdaafb49..5f2403deb6 100644 --- a/app/dialplan/dialplan_details_delete.php +++ b/app/dialplan/dialplan_details_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('dialplan_delete') || permission_exists('inbound_route_delete') diff --git a/app/dialplan/dialplan_details_edit.php b/app/dialplan/dialplan_details_edit.php index 3770b52b67..30f1d1e319 100644 --- a/app/dialplan/dialplan_details_edit.php +++ b/app/dialplan/dialplan_details_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('dialplan_add') || permission_exists('dialplan_edit') diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php index 5b2b72e8c5..f31c030409 100644 --- a/app/dialplan/dialplan_edit.php +++ b/app/dialplan/dialplan_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('dialplan_add') diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php index 2205a111fd..16ca201e78 100644 --- a/app/dialplan/dialplans.php +++ b/app/dialplan/dialplans.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('dialplan_view')) { //access granted diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php index d939f5e697..dc9c1e671c 100644 --- a/app/dialplan_inbound/dialplan_inbound_add.php +++ b/app/dialplan_inbound/dialplan_inbound_add.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('inbound_route_add')) { //access granted diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php index 1750ed9e7c..ee7ef184ba 100644 --- a/app/dialplan_outbound/dialplan_outbound_add.php +++ b/app/dialplan_outbound/dialplan_outbound_add.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('outbound_route_add')) { //access granted diff --git a/app/edit/clipadd.php b/app/edit/clipadd.php index 6ef5a2ae34..9824d2a03d 100644 --- a/app/edit/clipadd.php +++ b/app/edit/clipadd.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/clipdelete.php b/app/edit/clipdelete.php index ae31f54559..942c5b0573 100644 --- a/app/edit/clipdelete.php +++ b/app/edit/clipdelete.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/cliplist.php b/app/edit/cliplist.php index e2c4c3245e..ceb1a04ff3 100644 --- a/app/edit/cliplist.php +++ b/app/edit/cliplist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { diff --git a/app/edit/clipoptions.php b/app/edit/clipoptions.php index 6e85a4e6b8..a152af6e4d 100644 --- a/app/edit/clipoptions.php +++ b/app/edit/clipoptions.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { //access granted diff --git a/app/edit/clipoptionslist.php b/app/edit/clipoptionslist.php index 3a1ce516a7..d11f489b14 100644 --- a/app/edit/clipoptionslist.php +++ b/app/edit/clipoptionslist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('php_editor_view')) { //access granted diff --git a/app/edit/clipupdate.php b/app/edit/clipupdate.php index 35bb980d63..45520aaa53 100644 --- a/app/edit/clipupdate.php +++ b/app/edit/clipupdate.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/filedelete.php b/app/edit/filedelete.php index c437e6d618..dec8fd8db6 100644 --- a/app/edit/filedelete.php +++ b/app/edit/filedelete.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/filelist.php b/app/edit/filelist.php index 203493882a..29ed991708 100644 --- a/app/edit/filelist.php +++ b/app/edit/filelist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { //access granted diff --git a/app/edit/filenew.php b/app/edit/filenew.php index c930584cfb..62b11c9995 100644 --- a/app/edit/filenew.php +++ b/app/edit/filenew.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/fileoptions.php b/app/edit/fileoptions.php index 1a95045794..8fe7a025f3 100644 --- a/app/edit/fileoptions.php +++ b/app/edit/fileoptions.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { //access granted diff --git a/app/edit/fileoptionslist.php b/app/edit/fileoptionslist.php index df345e5e13..5d3c533b01 100644 --- a/app/edit/fileoptionslist.php +++ b/app/edit/fileoptionslist.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { //access granted diff --git a/app/edit/fileread.php b/app/edit/fileread.php index 00aff5f253..95a3424d97 100644 --- a/app/edit/fileread.php +++ b/app/edit/fileread.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { //access granted diff --git a/app/edit/filerename.php b/app/edit/filerename.php index dc01fca61e..91d1dd5d75 100644 --- a/app/edit/filerename.php +++ b/app/edit/filerename.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/filesave.php b/app/edit/filesave.php index 7b94251643..84c503c1cd 100644 --- a/app/edit/filesave.php +++ b/app/edit/filesave.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/folderdelete.php b/app/edit/folderdelete.php index b4ce481613..db22dad949 100644 --- a/app/edit/folderdelete.php +++ b/app/edit/folderdelete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/foldernew.php b/app/edit/foldernew.php index e8b3d38063..14b3911890 100644 --- a/app/edit/foldernew.php +++ b/app/edit/foldernew.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_save')) { //access granted diff --git a/app/edit/index.php b/app/edit/index.php index b1d25e91ef..b85d40a705 100644 --- a/app/edit/index.php +++ b/app/edit/index.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('script_editor_view')) { //access granted diff --git a/app/exec/exec.php b/app/exec/exec.php index a27ff56ff3..a90af4db96 100644 --- a/app/exec/exec.php +++ b/app/exec/exec.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('exec_command_line') || permission_exists('exec_php_command') || permission_exists('exec_switch')) { //access granted diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php index 04ddf7d191..b0eaadea3a 100644 --- a/app/extensions/extension_copy.php +++ b/app/extensions/extension_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('extension_add')) { diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php index ab741e026f..ea9c694f1e 100644 --- a/app/extensions/extension_delete.php +++ b/app/extensions/extension_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('extension_delete')) { //access granted diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 8bc882a4cb..a3aa649d35 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -23,7 +23,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('extension_add') || permission_exists('extension_edit')) { //access granted diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 0946037bc9..5edfb83985 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('extension_view')) { //access granted diff --git a/app/fax/fax.php b/app/fax/fax.php index 11cacea58f..90d7c9ca1a 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fax_extension_view')) { //access granted diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php index 16aefa8836..19c277d90d 100644 --- a/app/fax/fax_copy.php +++ b/app/fax/fax_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('fax_extension_add')) { diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php index 8fef4b34c5..fd8b0613c0 100644 --- a/app/fax/fax_delete.php +++ b/app/fax/fax_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fax_extension_delete')) { //access granted diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index beea8e4d4f..9b12707bb3 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fax_extension_add') || permission_exists('fax_extension_edit') || permission_exists('fax_extension_delete')) { //access granted diff --git a/app/fax/fax_view.php b/app/fax/fax_view.php index c1a73fc2f7..aabf2dc725 100644 --- a/app/fax/fax_view.php +++ b/app/fax/fax_view.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fax_extension_view')) { //access granted diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php index 2e47190be0..8bed15545f 100644 --- a/app/fifo/fifo.php +++ b/app/fifo/fifo.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fifo_view')) { //access granted diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php index 2079dbadc9..2b6366ae37 100644 --- a/app/fifo/fifo_add.php +++ b/app/fifo/fifo_add.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fifo_add')) { //access granted diff --git a/app/fifo/fifo_delete.php b/app/fifo/fifo_delete.php index 699ffe31f9..93389dd044 100644 --- a/app/fifo/fifo_delete.php +++ b/app/fifo/fifo_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fifo_delete')) { //access granted diff --git a/app/fifo/fifo_detail_delete.php b/app/fifo/fifo_detail_delete.php index d2db239222..10926a4e24 100644 --- a/app/fifo/fifo_detail_delete.php +++ b/app/fifo/fifo_detail_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists("fifo_delete")) { //access granted diff --git a/app/fifo/fifo_detail_edit.php b/app/fifo/fifo_detail_edit.php index 386e24716e..7800957bbe 100644 --- a/app/fifo/fifo_detail_edit.php +++ b/app/fifo/fifo_detail_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('fifo_add') || permission_exists('fifo_edit')) { //access granted diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php index 506ddd18a5..c9fc35a8b5 100644 --- a/app/fifo/fifo_edit.php +++ b/app/fifo/fifo_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('fifo_add') || permission_exists('fifo_edit')) { diff --git a/app/fifo_list/fifo_exec.php b/app/fifo_list/fifo_exec.php index 0a61c16d20..4e0df454a4 100644 --- a/app/fifo_list/fifo_exec.php +++ b/app/fifo_list/fifo_exec.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('active_queues_edit')) { //access granted diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php index e5361339c8..c8f11a55fa 100644 --- a/app/fifo_list/fifo_interactive.php +++ b/app/fifo_list/fifo_interactive.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('active_queues_view')) { //access granted diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php index cbd48bcf07..ec89cde752 100644 --- a/app/fifo_list/fifo_interactive_inc.php +++ b/app/fifo_list/fifo_interactive_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('active_queues_view')) { //access granted diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php index 1562a473b6..44c589eaca 100644 --- a/app/fifo_list/fifo_list.php +++ b/app/fifo_list/fifo_list.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('active_queues_view')) { //access granted diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php index f23b2d47f6..07d951ffe3 100644 --- a/app/fifo_list/fifo_list_inc.php +++ b/app/fifo_list/fifo_list_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('active_queues_view')) { //access granted diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php index 105484f085..45e6f64d5f 100644 --- a/app/gateways/gateway_copy.php +++ b/app/gateways/gateway_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('gateway_add')) { diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php index bd42ffb167..665fa8a391 100644 --- a/app/gateways/gateway_delete.php +++ b/app/gateways/gateway_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('gateway_delete')) { //access granted diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 3bce5ef60e..8034ce6cdf 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('gateway_add') || permission_exists('gateway_edit')) { //access granted diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index 49a764679d..d4c67d24bc 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('gateway_view')) { //access granted diff --git a/app/hot_desking/extension_delete.php b/app/hot_desking/extension_delete.php index e65bdbf9bc..17377b1a32 100644 --- a/app/hot_desking/extension_delete.php +++ b/app/hot_desking/extension_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('extension_delete')) { //access granted diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php index c41b1c04c4..26cc074176 100644 --- a/app/hot_desking/extension_edit.php +++ b/app/hot_desking/extension_edit.php @@ -23,7 +23,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('extension_add') || permission_exists('extension_edit')) { //access granted diff --git a/app/hot_desking/index.php b/app/hot_desking/index.php index b7b4dc1157..ad0f09863e 100644 --- a/app/hot_desking/index.php +++ b/app/hot_desking/index.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('extension_view')) { //access granted diff --git a/app/hunt_groups/hunt_group_call_forward.php b/app/hunt_groups/hunt_group_call_forward.php index 125d68ce3b..b1d7b4ae54 100644 --- a/app/hunt_groups/hunt_group_call_forward.php +++ b/app/hunt_groups/hunt_group_call_forward.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/hunt_groups/hunt_group_call_forward_edit.php b/app/hunt_groups/hunt_group_call_forward_edit.php index b4c5a249ee..cc2b0642c4 100644 --- a/app/hunt_groups/hunt_group_call_forward_edit.php +++ b/app/hunt_groups/hunt_group_call_forward_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/hunt_groups/hunt_group_copy.php b/app/hunt_groups/hunt_group_copy.php index 10dfd0daee..6ef3541b39 100644 --- a/app/hunt_groups/hunt_group_copy.php +++ b/app/hunt_groups/hunt_group_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; diff --git a/app/hunt_groups/hunt_group_delete.php b/app/hunt_groups/hunt_group_delete.php index 73f0ad3b2d..3611493059 100644 --- a/app/hunt_groups/hunt_group_delete.php +++ b/app/hunt_groups/hunt_group_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/hunt_groups/hunt_group_destination_delete.php b/app/hunt_groups/hunt_group_destination_delete.php index 82062f7a1f..212fdfbb16 100644 --- a/app/hunt_groups/hunt_group_destination_delete.php +++ b/app/hunt_groups/hunt_group_destination_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/hunt_groups/hunt_group_destination_edit.php b/app/hunt_groups/hunt_group_destination_edit.php index 7837e65aee..24128a0684 100644 --- a/app/hunt_groups/hunt_group_destination_edit.php +++ b/app/hunt_groups/hunt_group_destination_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/hunt_groups/hunt_group_edit.php b/app/hunt_groups/hunt_group_edit.php index 4f3100e0d8..4cdd275b80 100644 --- a/app/hunt_groups/hunt_group_edit.php +++ b/app/hunt_groups/hunt_group_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; diff --git a/app/hunt_groups/hunt_groups.php b/app/hunt_groups/hunt_groups.php index 1790ae0ace..f28206bd9b 100644 --- a/app/hunt_groups/hunt_groups.php +++ b/app/hunt_groups/hunt_groups.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/ivr_menu/ivr_menu_copy.php b/app/ivr_menu/ivr_menu_copy.php index 498f6d0f61..c81b2c7c10 100644 --- a/app/ivr_menu/ivr_menu_copy.php +++ b/app/ivr_menu/ivr_menu_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('ivr_menu_edit')) { diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php index 944efacfa7..a522d30b29 100644 --- a/app/ivr_menu/ivr_menu_delete.php +++ b/app/ivr_menu/ivr_menu_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ivr_menu_delete')) { //access granted diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php index e8b2f5a284..4640d45a6c 100644 --- a/app/ivr_menu/ivr_menu_edit.php +++ b/app/ivr_menu/ivr_menu_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ivr_menu_add') || permission_exists('ivr_menu_edit')) { //access granted diff --git a/app/ivr_menu/ivr_menu_option_delete.php b/app/ivr_menu/ivr_menu_option_delete.php index 0d325ff516..da498139ae 100644 --- a/app/ivr_menu/ivr_menu_option_delete.php +++ b/app/ivr_menu/ivr_menu_option_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ivr_menu_delete')) { //access granted diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php index 78a2fbce07..14be4f6d96 100644 --- a/app/ivr_menu/ivr_menu_option_edit.php +++ b/app/ivr_menu/ivr_menu_option_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ivr_menu_add') || permission_exists('ivr_menu_edit')) { //access granted diff --git a/app/ivr_menu/ivr_menu_options.php b/app/ivr_menu/ivr_menu_options.php index 6b7c6cf8c4..2e56a1fa4d 100644 --- a/app/ivr_menu/ivr_menu_options.php +++ b/app/ivr_menu/ivr_menu_options.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ivr_menu_view')) { //access granted diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php index 7ec3cbcfbc..81e2473fbf 100644 --- a/app/ivr_menu/ivr_menus.php +++ b/app/ivr_menu/ivr_menus.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ivr_menu_view')) { //access granted diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php index 01fb1add65..f99c1bd6bf 100644 --- a/app/log_viewer/log_viewer.php +++ b/app/log_viewer/log_viewer.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('log_view')) { //access granted diff --git a/app/modules/modules.php b/app/modules/modules.php index 4aa0cd8209..9eaad9511e 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('modules_view')) { //access granted diff --git a/app/modules/modules_delete.php b/app/modules/modules_delete.php index e4c54358e6..402c80d2e0 100644 --- a/app/modules/modules_delete.php +++ b/app/modules/modules_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('modules_delete')) { //access granted diff --git a/app/modules/modules_edit.php b/app/modules/modules_edit.php index 8310ed6810..fe9f71ab4d 100644 --- a/app/modules/modules_edit.php +++ b/app/modules/modules_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('modules_add') || permission_exists('modules_edit')) { //access granted diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 9a11872978..2f5224e42f 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -26,7 +26,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('music_on_hold_view') || permission_exists('music_on_hold_default_view')) { //access granted diff --git a/app/music_on_hold/music_on_hold_play.php b/app/music_on_hold/music_on_hold_play.php index 7fd6c042b7..9777ee973b 100644 --- a/app/music_on_hold/music_on_hold_play.php +++ b/app/music_on_hold/music_on_hold_play.php @@ -25,7 +25,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('music_on_hold_view')) { //access granted diff --git a/app/provision/index.php b/app/provision/index.php index e7acf11fd0..32b8c0f66a 100644 --- a/app/provision/index.php +++ b/app/provision/index.php @@ -23,7 +23,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //set default variables $dir_count = 0; diff --git a/app/provision/provision_write.php b/app/provision/provision_write.php index 75cd94773a..65d2a643b9 100644 --- a/app/provision/provision_write.php +++ b/app/provision/provision_write.php @@ -23,7 +23,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 58c5699909..72fa30f030 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('recordings_view')) { //access granted diff --git a/app/recordings/recordings_delete.php b/app/recordings/recordings_delete.php index 369eb96e1e..2e6d5d33b3 100644 --- a/app/recordings/recordings_delete.php +++ b/app/recordings/recordings_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('recordings_delete')) { //access granted diff --git a/app/recordings/recordings_edit.php b/app/recordings/recordings_edit.php index e10a55fe25..7b9fc7dddd 100644 --- a/app/recordings/recordings_edit.php +++ b/app/recordings/recordings_edit.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('recordings_add') || permission_exists('recordings_edit')) { //access granted diff --git a/app/recordings/recordings_play.php b/app/recordings/recordings_play.php index 240e21159f..e916dfd3f3 100644 --- a/app/recordings/recordings_play.php +++ b/app/recordings/recordings_play.php @@ -25,7 +25,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('recordings_play')) { //access granted diff --git a/app/registrations/status_registrations.php b/app/registrations/status_registrations.php index 5258e985bf..279a28ade0 100644 --- a/app/registrations/status_registrations.php +++ b/app/registrations/status_registrations.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index abf2e244c2..91a630331e 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -25,7 +25,7 @@ James Rose */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ring_group_view')) { //access granted diff --git a/app/ring_groups/ring_groups_delete.php b/app/ring_groups/ring_groups_delete.php index 70902153c1..dd46f1952b 100644 --- a/app/ring_groups/ring_groups_delete.php +++ b/app/ring_groups/ring_groups_delete.php @@ -25,7 +25,7 @@ James Rose */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ring_group_add')) { //access granted diff --git a/app/ring_groups/ring_groups_edit.php b/app/ring_groups/ring_groups_edit.php index 43959f9c7f..8346af0b5b 100644 --- a/app/ring_groups/ring_groups_edit.php +++ b/app/ring_groups/ring_groups_edit.php @@ -25,7 +25,7 @@ James Rose */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('ring_group_add') || permission_exists('ring_group_edit')) { //access granted diff --git a/app/schemas/schema_data_delete.php b/app/schemas/schema_data_delete.php index ed62b4c575..0c4564fc9f 100644 --- a/app/schemas/schema_data_delete.php +++ b/app/schemas/schema_data_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_delete')) { //access granted diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php index b33a19406f..3033e4a497 100644 --- a/app/schemas/schema_data_edit.php +++ b/app/schemas/schema_data_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_data_add') || permission_exists('schema_data_edit')) { //access granted diff --git a/app/schemas/schema_data_view.php b/app/schemas/schema_data_view.php index 7264ceb2fe..524f996d2e 100644 --- a/app/schemas/schema_data_view.php +++ b/app/schemas/schema_data_view.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_data_view')) { //access granted diff --git a/app/schemas/schema_delete.php b/app/schemas/schema_delete.php index 81ed83d834..fedd34ba7b 100644 --- a/app/schemas/schema_delete.php +++ b/app/schemas/schema_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_delete')) { //access granted diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php index c80bdca625..46067b322c 100644 --- a/app/schemas/schema_edit.php +++ b/app/schemas/schema_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_add') || permission_exists('schema_edit')) { //access granted diff --git a/app/schemas/schema_field_delete.php b/app/schemas/schema_field_delete.php index 9739952a95..9e1fc68864 100644 --- a/app/schemas/schema_field_delete.php +++ b/app/schemas/schema_field_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_delete')) { //access granted diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php index 7d4d7e2f11..ca26a66273 100644 --- a/app/schemas/schema_field_edit.php +++ b/app/schemas/schema_field_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_add') || permission_exists('schema_edit')) { //access granted diff --git a/app/schemas/schema_fields.php b/app/schemas/schema_fields.php index 1a57434012..b517cc192f 100644 --- a/app/schemas/schema_fields.php +++ b/app/schemas/schema_fields.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_view')) { //access granted diff --git a/app/schemas/schema_import.php b/app/schemas/schema_import.php index 079dd797bb..aeb737ba3f 100644 --- a/app/schemas/schema_import.php +++ b/app/schemas/schema_import.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_edit')) { //access granted diff --git a/app/schemas/schema_name_value_delete.php b/app/schemas/schema_name_value_delete.php index 5101d30cd5..da1071451d 100644 --- a/app/schemas/schema_name_value_delete.php +++ b/app/schemas/schema_name_value_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_delete')) { //access granted diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php index a35460f561..14f6073c0a 100644 --- a/app/schemas/schema_name_value_edit.php +++ b/app/schemas/schema_name_value_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_edit')) { //access granted diff --git a/app/schemas/schema_name_values.php b/app/schemas/schema_name_values.php index cbfb053cc1..a2398688d8 100644 --- a/app/schemas/schema_name_values.php +++ b/app/schemas/schema_name_values.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_edit')) { //access granted diff --git a/app/schemas/schemas.php b/app/schemas/schemas.php index ed753b20e0..d1b0edcd0d 100644 --- a/app/schemas/schemas.php +++ b/app/schemas/schemas.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('schema_view')) { //access granted diff --git a/app/services/service_delete.php b/app/services/service_delete.php index 196a8b2579..452890d436 100644 --- a/app/services/service_delete.php +++ b/app/services/service_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('services_delete')) { //access granted diff --git a/app/services/service_edit.php b/app/services/service_edit.php index 8af85ed2ad..1d55da87da 100644 --- a/app/services/service_edit.php +++ b/app/services/service_edit.php @@ -25,7 +25,7 @@ James Rose */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('services_add') || permission_exists('services_edit')) { //access granted diff --git a/app/services/services.php b/app/services/services.php index ca4ac21434..fc608931fb 100644 --- a/app/services/services.php +++ b/app/services/services.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('services_view')) { //access granted diff --git a/app/settings/settings_edit.php b/app/settings/settings_edit.php index 9479c44171..c3a551c8e9 100644 --- a/app/settings/settings_edit.php +++ b/app/settings/settings_edit.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('settings_view') || if_group("superadmin")) { //access granted diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php index 22fcd555c7..61fc1039f7 100644 --- a/app/sip_profiles/sip_profile_copy.php +++ b/app/sip_profiles/sip_profile_copy.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/paging.php"; if (permission_exists('dialplan_add') diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php index 0236765981..d3f1086c9f 100644 --- a/app/sip_profiles/sip_profile_settings.php +++ b/app/sip_profiles/sip_profile_settings.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sip_profile_view')) { //access granted diff --git a/app/sip_profiles/sip_profile_settings_delete.php b/app/sip_profiles/sip_profile_settings_delete.php index c7e9f350f7..5ea2b45e05 100644 --- a/app/sip_profiles/sip_profile_settings_delete.php +++ b/app/sip_profiles/sip_profile_settings_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sip_profile_delete')) { //access granted diff --git a/app/sip_profiles/sip_profile_settings_edit.php b/app/sip_profiles/sip_profile_settings_edit.php index 13ee32d685..c99cb15f43 100644 --- a/app/sip_profiles/sip_profile_settings_edit.php +++ b/app/sip_profiles/sip_profile_settings_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit')) { //access granted diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index c76e8eeda5..ba831238e8 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sip_profile_view')) { //access granted diff --git a/app/sip_profiles/sip_profiles_delete.php b/app/sip_profiles/sip_profiles_delete.php index dadb3e878e..1b5beaaff7 100644 --- a/app/sip_profiles/sip_profiles_delete.php +++ b/app/sip_profiles/sip_profiles_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sip_profile_delete')) { //access granted diff --git a/app/sip_profiles/sip_profiles_edit.php b/app/sip_profiles/sip_profiles_edit.php index a0c04a9328..68b2a24748 100644 --- a/app/sip_profiles/sip_profiles_edit.php +++ b/app/sip_profiles/sip_profiles_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit')) { //access granted diff --git a/app/sip_status/cmd.php b/app/sip_status/cmd.php index 66250037a1..f5849b3ed2 100644 --- a/app/sip_status/cmd.php +++ b/app/sip_status/cmd.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("superadmin")) { //access granted diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php index a70c2422fc..6d8e270337 100644 --- a/app/sip_status/sip_status.php +++ b/app/sip_status/sip_status.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('system_status_sofia_status') diff --git a/app/sql_query/sql_backup.php b/app/sql_query/sql_backup.php index f8d7ccb21c..951c1d4516 100644 --- a/app/sql_query/sql_backup.php +++ b/app/sql_query/sql_backup.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sql_query_backup')) { //access granted diff --git a/app/sql_query/sql_db_conversion.php b/app/sql_query/sql_db_conversion.php index 63b53f5689..bf4255daeb 100644 --- a/app/sql_query/sql_db_conversion.php +++ b/app/sql_query/sql_db_conversion.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/lib_schema.php"; diff --git a/app/sql_query/sql_query.php b/app/sql_query/sql_query.php index 2083fcdc12..cbc82e9884 100644 --- a/app/sql_query/sql_query.php +++ b/app/sql_query/sql_query.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sql_query_execute')) { //access granted @@ -174,6 +174,6 @@ else { echo "\n"; //show the footer - include "includes/require.php"; + include "resources/require.php"; require_once "includes/footer.php"; ?> \ No newline at end of file diff --git a/app/sql_query/sql_query_db.php b/app/sql_query/sql_query_db.php index c6193e34ef..fec7c0cc98 100644 --- a/app/sql_query/sql_query_db.php +++ b/app/sql_query/sql_query_db.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/app/sql_query/sql_query_pdo.php b/app/sql_query/sql_query_pdo.php index 17f6e8e1ce..f1e4e8ec94 100644 --- a/app/sql_query/sql_query_pdo.php +++ b/app/sql_query/sql_query_pdo.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/app/sql_query/sql_query_result.php b/app/sql_query/sql_query_result.php index a0f3958e25..0e4b07668d 100644 --- a/app/sql_query/sql_query_result.php +++ b/app/sql_query/sql_query_result.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('sql_query_execute')) { //access granted diff --git a/app/system/system.php b/app/system/system.php index 72ac23f603..4c532ff241 100644 --- a/app/system/system.php +++ b/app/system/system.php @@ -25,7 +25,7 @@ James Rose */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('system_view_info') || permission_exists('system_view_cpu') diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php index 77412331ea..26488bbe8f 100644 --- a/app/time_conditions/time_condition_add.php +++ b/app/time_conditions/time_condition_add.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('time_conditions_add')) { //access granted diff --git a/app/traffic_graph/status_graph.php b/app/traffic_graph/status_graph.php index 49566ae2fb..539f5a786f 100644 --- a/app/traffic_graph/status_graph.php +++ b/app/traffic_graph/status_graph.php @@ -33,7 +33,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('traffic_graph_view')) { //access granted diff --git a/app/traffic_graph/status_interface.php b/app/traffic_graph/status_interface.php index 83ef21a13e..2e81f1a283 100644 --- a/app/traffic_graph/status_interface.php +++ b/app/traffic_graph/status_interface.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('traffic_graph_view')) { //access granted diff --git a/app/traffic_graph/svg_graph.php b/app/traffic_graph/svg_graph.php index 956e41c329..1fc6a2836e 100644 --- a/app/traffic_graph/svg_graph.php +++ b/app/traffic_graph/svg_graph.php @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('traffic_graph_view')) { //access granted diff --git a/app/vars/var_delete.php b/app/vars/var_delete.php index 327ceb15ad..e4e15d72e3 100644 --- a/app/vars/var_delete.php +++ b/app/vars/var_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('variables_delete')) { //access granted diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php index 755e9ad33a..fa51a779e5 100644 --- a/app/vars/var_edit.php +++ b/app/vars/var_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('variables_add') || permission_exists('variables_edit')) { //access granted diff --git a/app/vars/vars.php b/app/vars/vars.php index ae6e65b7e5..54968d825a 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('variables_view')) { //access granted diff --git a/app/vars/vars_textarea.php b/app/vars/vars_textarea.php index 43f36bcd8d..5719a2cd0f 100644 --- a/app/vars/vars_textarea.php +++ b/app/vars/vars_textarea.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('variables_view')) { //access granted diff --git a/app/voicemail_greetings/voicemail_greeting_delete.php b/app/voicemail_greetings/voicemail_greeting_delete.php index 94627b77b0..4cd9fa0773 100644 --- a/app/voicemail_greetings/voicemail_greeting_delete.php +++ b/app/voicemail_greetings/voicemail_greeting_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_greetings_delete')) { //access granted diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php index 510b54e3ae..8aea4a5879 100644 --- a/app/voicemail_greetings/voicemail_greeting_edit.php +++ b/app/voicemail_greetings/voicemail_greeting_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_greetings_add') || permission_exists('voicemail_greetings_edit')) { //access granted diff --git a/app/voicemail_greetings/voicemail_greeting_play.php b/app/voicemail_greetings/voicemail_greeting_play.php index 0838d4f049..4e71c92c3f 100644 --- a/app/voicemail_greetings/voicemail_greeting_play.php +++ b/app/voicemail_greetings/voicemail_greeting_play.php @@ -25,7 +25,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_greetings_play')) { //access granted diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index f4c3034980..9237de7833 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_greetings_view')) { //access granted diff --git a/app/voicemails/voicemail_delete.php b/app/voicemails/voicemail_delete.php index c6f4bfa63e..99d4658a6c 100644 --- a/app/voicemails/voicemail_delete.php +++ b/app/voicemails/voicemail_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_delete')) { //access granted diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php index d6ac46080e..2db35635c2 100644 --- a/app/voicemails/voicemail_edit.php +++ b/app/voicemails/voicemail_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_add') || permission_exists('voicemail_edit')) { //access granted diff --git a/app/voicemails/voicemail_message_delete.php b/app/voicemails/voicemail_message_delete.php index 1bbccacfeb..5c3e51374b 100644 --- a/app/voicemails/voicemail_message_delete.php +++ b/app/voicemails/voicemail_message_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_message_delete')) { //access granted diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php index fab233a10d..b91686f519 100644 --- a/app/voicemails/voicemail_message_edit.php +++ b/app/voicemails/voicemail_message_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_message_add') || permission_exists('voicemail_message_edit')) { //access granted diff --git a/app/voicemails/voicemail_message_play.php b/app/voicemails/voicemail_message_play.php index 1fdadec8eb..06b026ed94 100644 --- a/app/voicemails/voicemail_message_play.php +++ b/app/voicemails/voicemail_message_play.php @@ -25,7 +25,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_view')) { //access granted diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index 100fa24a87..bd4958c5e7 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_message_view')) { //access granted diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index ad65ca0625..890f2da64e 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('voicemail_view')) { //access granted diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php index 8eec2d3cab..e936e70109 100644 --- a/app/xml_cdr/v_xml_cdr_import.php +++ b/app/xml_cdr/v_xml_cdr_import.php @@ -31,12 +31,12 @@ $document_root = $matches[1]; set_include_path($document_root); $_SERVER["DOCUMENT_ROOT"] = $document_root; - require_once "includes/require.php"; + require_once "resources/require.php"; $display_type = 'text'; //html, text } else { include "root.php"; - require_once "includes/require.php"; + require_once "resources/require.php"; } //set debug diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index a450ccab69..f5627cac83 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "app_languages.php"; if (permission_exists('xml_cdr_view')) { diff --git a/app/xml_cdr/xml_cdr_csv.php b/app/xml_cdr/xml_cdr_csv.php index ecdd3ad67d..47bb49b729 100644 --- a/app/xml_cdr/xml_cdr_csv.php +++ b/app/xml_cdr/xml_cdr_csv.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { //access granted diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php index 476d0d2c03..9aca5af2c2 100644 --- a/app/xml_cdr/xml_cdr_details.php +++ b/app/xml_cdr/xml_cdr_details.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { diff --git a/app/xml_cdr/xml_cdr_import_update.php b/app/xml_cdr/xml_cdr_import_update.php index 4c087b768e..13b896a441 100644 --- a/app/xml_cdr/xml_cdr_import_update.php +++ b/app/xml_cdr/xml_cdr_import_update.php @@ -30,7 +30,7 @@ preg_match("/^(.*)\/mod\/.*$/", $document_root, $matches); $document_root = $matches[1]; set_include_path($document_root); - require_once "includes/require.php"; + require_once "resources/require.php"; $_SERVER["DOCUMENT_ROOT"] = $document_root; $display_type = 'text'; //html, text } diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index 1f3e0351b5..8741ee0236 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { //access granted diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php index 3548cf98f2..7259c5dffa 100644 --- a/app/xml_cdr/xml_cdr_search.php +++ b/app/xml_cdr/xml_cdr_search.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { //access granted diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index ba7ad336d0..803fd3ce30 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { //access granted diff --git a/app/xml_cdr/xml_cdr_statistics_csv.php b/app/xml_cdr/xml_cdr_statistics_csv.php index 8cddcad54c..d3d7501613 100644 --- a/app/xml_cdr/xml_cdr_statistics_csv.php +++ b/app/xml_cdr/xml_cdr_statistics_csv.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { //access granted diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php index 090f808ab2..50b1eef365 100644 --- a/app/xml_cdr/xml_cdr_statistics_inc.php +++ b/app/xml_cdr/xml_cdr_statistics_inc.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xml_cdr_view')) { //access granted diff --git a/app/xmpp/profile_delete.php b/app/xmpp/profile_delete.php index c871c84ab6..ca47a9183d 100644 --- a/app/xmpp/profile_delete.php +++ b/app/xmpp/profile_delete.php @@ -26,7 +26,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xmpp_delete')) { //access granted diff --git a/app/xmpp/xmpp.php b/app/xmpp/xmpp.php index 4c507b66de..91b91a8da0 100644 --- a/app/xmpp/xmpp.php +++ b/app/xmpp/xmpp.php @@ -26,7 +26,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xmpp_view')) { //access granted diff --git a/app/xmpp/xmpp_profile_edit.php b/app/xmpp/xmpp_profile_edit.php index 8430116af4..4544f3ffb6 100644 --- a/app/xmpp/xmpp_profile_edit.php +++ b/app/xmpp/xmpp_profile_edit.php @@ -27,7 +27,7 @@ */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('xmpp_add') || permission_exists('xmpp_edit')) { diff --git a/core/apps/apps.php b/core/apps/apps.php index 03a3dee9f2..56e7f6e171 100644 --- a/core/apps/apps.php +++ b/core/apps/apps.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/core/apps/apps_delete.php b/core/apps/apps_delete.php index dd3b275ce9..def9c6910c 100644 --- a/core/apps/apps_delete.php +++ b/core/apps/apps_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("superadmin")) { //access granted diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php index deeed23299..b6f52d5ad1 100644 --- a/core/apps/apps_edit.php +++ b/core/apps/apps_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("superadmin")) { //access granted diff --git a/core/backup/backup.php b/core/backup/backup.php index 3e23832a57..3f65791dc8 100644 --- a/core/backup/backup.php +++ b/core/backup/backup.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("superadmin")) { diff --git a/core/backup/backupandrestore.php b/core/backup/backupandrestore.php index b39a8718e7..8fb7dd7454 100644 --- a/core/backup/backupandrestore.php +++ b/core/backup/backupandrestore.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("superadmin")) { diff --git a/core/databases/database_delete.php b/core/databases/database_delete.php index ef3fd26872..b719ff26a3 100644 --- a/core/databases/database_delete.php +++ b/core/databases/database_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('database_delete')) { //access granted diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php index 3d007ba1df..c6f92710bc 100644 --- a/core/databases/database_edit.php +++ b/core/databases/database_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('database_add') || permission_exists('database_edit')) { //access granted diff --git a/core/databases/databases.php b/core/databases/databases.php index c87e6748bd..692d84d13c 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("superadmin")) { //access granted diff --git a/core/default_settings/default_setting_delete.php b/core/default_settings/default_setting_delete.php index 24d8a6b5cc..d3771c3708 100644 --- a/core/default_settings/default_setting_delete.php +++ b/core/default_settings/default_setting_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('default_setting_delete')) { //access granted diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index afde5753d9..df265a8085 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('default_setting_add') || permission_exists('default_setting_edit')) { //access granted diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index d8f40108c6..3d2c7e72e1 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('default_setting_view')) { //access granted diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index cf66ab139a..bd6e4ea4e2 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('domain_setting_view')) { //access granted diff --git a/core/domain_settings/domain_settings_delete.php b/core/domain_settings/domain_settings_delete.php index cced0cd4ce..bb7ea2da96 100644 --- a/core/domain_settings/domain_settings_delete.php +++ b/core/domain_settings/domain_settings_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('domain_setting_delete')) { //access granted diff --git a/core/domain_settings/domain_settings_edit.php b/core/domain_settings/domain_settings_edit.php index 0043ea0f8b..a3b2b18507 100644 --- a/core/domain_settings/domain_settings_edit.php +++ b/core/domain_settings/domain_settings_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('domain_setting_add') || permission_exists('domain_setting_edit')) { //access granted diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 9b8f619203..9c079e6d57 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('domain_view')) { //access granted diff --git a/core/domain_settings/domains_delete.php b/core/domain_settings/domains_delete.php index e879dd6f52..2feaf9fc45 100644 --- a/core/domain_settings/domains_delete.php +++ b/core/domain_settings/domains_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('domain_delete')) { //access granted diff --git a/core/domain_settings/domains_edit.php b/core/domain_settings/domains_edit.php index ce1875d9d3..1e14114f39 100644 --- a/core/domain_settings/domains_edit.php +++ b/core/domain_settings/domains_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('domain_add') || permission_exists('domain_edit')) { //access granted diff --git a/core/menu/menu.php b/core/menu/menu.php index 8e1d8c32fd..0f3808b017 100644 --- a/core/menu/menu.php +++ b/core/menu/menu.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) { //access granted diff --git a/core/menu/menu_delete.php b/core/menu/menu_delete.php index 10018e32b0..b97fe6723d 100644 --- a/core/menu/menu_delete.php +++ b/core/menu/menu_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 55022e9ed7..71451467a8 100644 --- a/core/menu/menu_edit.php +++ b/core/menu/menu_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_add') || permission_exists('menu_edit')) { //access granted diff --git a/core/menu/menu_item_delete.php b/core/menu/menu_item_delete.php index 9db1567337..e7f0bda667 100644 --- a/core/menu/menu_item_delete.php +++ b/core/menu/menu_item_delete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_delete')) { //access granted diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index d8fd888538..2e34303546 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_add') || permission_exists('menu_edit')) { //access granted diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php index 9f98f54551..a104a5a21d 100644 --- a/core/menu/menu_item_list.php +++ b/core/menu/menu_item_list.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) { //access granted diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php index 1b12a81a9f..30be8d020b 100644 --- a/core/menu/menu_item_move_down.php +++ b/core/menu/menu_item_move_down.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_edit')) { //access granted diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php index 3fc9d23e4d..d4ea218da0 100644 --- a/core/menu/menu_item_move_up.php +++ b/core/menu/menu_item_move_up.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_edit')) { //access granted diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index dffcc0585a..c4b55e2bb7 100644 --- a/core/menu/menu_restore_default.php +++ b/core/menu/menu_restore_default.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('menu_restore')) { //access granted diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php index 48c45a2c26..de0322ce7d 100644 --- a/core/upgrade/upgrade.php +++ b/core/upgrade/upgrade.php @@ -30,7 +30,7 @@ preg_match("/^(.*)\/core\/.*$/", $document_root, $matches); $document_root = $matches[1]; set_include_path($document_root); - require_once "includes/require.php"; + require_once "resources/require.php"; $_SERVER["DOCUMENT_ROOT"] = $document_root; $display_type = 'text'; //html, text @@ -42,7 +42,7 @@ } else { include "root.php"; - require_once "includes/require.php"; + require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('upgrade_schema') || permission_exists('upgrade_svn') || if_group("superadmin")) { //echo "access granted"; diff --git a/core/upgrade/upgrade_domains.php b/core/upgrade/upgrade_domains.php index 24fca5e1ca..2923ee59c6 100644 --- a/core/upgrade/upgrade_domains.php +++ b/core/upgrade/upgrade_domains.php @@ -30,13 +30,13 @@ preg_match("/^(.*)\/core\/.*$/", $document_root, $matches); $document_root = $matches[1]; set_include_path($document_root); - require_once "includes/require.php"; + require_once "resources/require.php"; $_SERVER["DOCUMENT_ROOT"] = $document_root; $display_type = 'text'; //html, text } else { include "root.php"; - require_once "includes/require.php"; + require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('upgrade_schema') || permission_exists('upgrade_svn') || if_group("superadmin")) { //echo "access granted"; diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php index 2830d13da8..d3c17ad190 100644 --- a/core/upgrade/upgrade_schema.php +++ b/core/upgrade/upgrade_schema.php @@ -30,7 +30,7 @@ preg_match("/^(.*)\/core\/.*$/", $document_root, $matches); $document_root = $matches[1]; set_include_path($document_root); - require_once "includes/require.php"; + require_once "resources/require.php"; $_SERVER["DOCUMENT_ROOT"] = $document_root; $display_type = 'text'; //html, text @@ -42,7 +42,7 @@ } else { include "root.php"; - require_once "includes/require.php"; + require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('upgrade_schema') || if_group("superadmin")) { //echo "access granted"; diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index fc5529996b..d5319cd662 100644 --- a/core/user_settings/user_dashboard.php +++ b/core/user_settings/user_dashboard.php @@ -28,7 +28,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php")) header("Location: ".PROJECT_PATH."/install.php"); exit; } -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; require_once "includes/header.php"; diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php index bedcae9c76..677657e219 100644 --- a/core/user_settings/user_edit.php +++ b/core/user_settings/user_edit.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php index 5fca21d20f..4df8d583e2 100644 --- a/core/users/group_permissions.php +++ b/core/users/group_permissions.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_permissions') || if_group("superadmin")) { //access granted diff --git a/core/users/groupadd.php b/core/users/groupadd.php index e4682d4133..5de6d2e2f6 100644 --- a/core/users/groupadd.php +++ b/core/users/groupadd.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_add')) { //access allowed diff --git a/core/users/groupdelete.php b/core/users/groupdelete.php index 56f0da816c..bbf264e8d3 100644 --- a/core/users/groupdelete.php +++ b/core/users/groupdelete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_delete') || if_group("superadmin")) { //access allowed diff --git a/core/users/groupmemberadd.php b/core/users/groupmemberadd.php index bdffd8da1e..485fe18de2 100644 --- a/core/users/groupmemberadd.php +++ b/core/users/groupmemberadd.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_member_add') || if_group("superadmin")) { //access allowed diff --git a/core/users/groupmemberdelete.php b/core/users/groupmemberdelete.php index 4378800b74..425798ecd6 100644 --- a/core/users/groupmemberdelete.php +++ b/core/users/groupmemberdelete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_member_delete') || if_group("superadmin")) { //access allowed diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php index e7a457894e..2862f18ebd 100644 --- a/core/users/groupmembers.php +++ b/core/users/groupmembers.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_members_view') || if_group("superadmin")) { //access allowed diff --git a/core/users/groups.php b/core/users/groups.php index 6efc736663..7743869d5a 100644 --- a/core/users/groups.php +++ b/core/users/groups.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //check the permissions require_once "resources/check_auth.php"; diff --git a/core/users/index.php b/core/users/index.php index 836cec0416..3b6a5b822c 100644 --- a/core/users/index.php +++ b/core/users/index.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('user_view') || if_group("superadmin")) { //access allowed diff --git a/core/users/permissions_default.php b/core/users/permissions_default.php index 52f4d4647f..1e6b955cb6 100644 --- a/core/users/permissions_default.php +++ b/core/users/permissions_default.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('group_edit')) { //access granted diff --git a/core/users/signup.php b/core/users/signup.php index eb1a5508ac..837ad19104 100644 --- a/core/users/signup.php +++ b/core/users/signup.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { diff --git a/core/users/userdelete.php b/core/users/userdelete.php index b5ae8d4200..0b51e17194 100644 --- a/core/users/userdelete.php +++ b/core/users/userdelete.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('user_delete')) { //access allowed diff --git a/core/users/userlist.php b/core/users/userlist.php index 16dd468ace..19ddd570f5 100644 --- a/core/users/userlist.php +++ b/core/users/userlist.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists("user_view") || if_group("superadmin")) { //access granted diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php index a2f92519f1..e8175da86b 100644 --- a/core/users/usersupdate.php +++ b/core/users/usersupdate.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists("user_add") || permission_exists("user_edit") || diff --git a/includes/footer.php b/includes/footer.php index 8c57e050f3..7516b8e425 100644 --- a/includes/footer.php +++ b/includes/footer.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //get the output from the buffer $body = $content_from_db.ob_get_contents(); @@ -67,19 +67,19 @@ require_once "includes/require.php"; ob_end_clean(); //clean the buffer //get the menu - require_once "includes/menu.php"; + require_once "resources/menu.php"; //prepare the template to display the output $custom_head = ''; $output = str_replace ("", $page["title"], $template); // defined in each individual page $output = str_replace ("", $custom_head, $output); // defined in each individual page if (strlen($v_menu) > 0) { - $output = str_replace ("", $v_menu, $output); //defined in /includes/menu.php + $output = str_replace ("", $v_menu, $output); //defined in /resources/menu.php } else { - $output = str_replace ("", $_SESSION["menu"], $output); //defined in /includes/menu.php + $output = str_replace ("", $_SESSION["menu"], $output); //defined in /resources/menu.php } - $output = str_replace ("", PROJECT_PATH, $output); //defined in /includes/menu.php + $output = str_replace ("", PROJECT_PATH, $output); //defined in /resources/menu.php $pos = strrpos($output, ""); if ($pos === false) { diff --git a/includes/header.php b/includes/header.php index 50dd7c740a..a7e28e3fb7 100644 --- a/includes/header.php +++ b/includes/header.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //if reloadxml then run the command if (isset($_SESSION["reload_xml"])) { diff --git a/includes/lib_pdo_vm.php b/includes/lib_pdo_vm.php index e5b75d4120..58221e17c1 100644 --- a/includes/lib_pdo_vm.php +++ b/includes/lib_pdo_vm.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require "includes/require.php"; +require "resources/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'); diff --git a/includes/lib_schema.php b/includes/lib_schema.php index 013538164f..901d12f8cf 100644 --- a/includes/lib_schema.php +++ b/includes/lib_schema.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -//require_once "includes/require.php"; +//require_once "resources/require.php"; //require_once "includes/classes/database.php"; //$db = new database; //$db->db = $db; diff --git a/includes/lib_switch.php b/includes/lib_switch.php index 91e0fe1e28..4af8a35e29 100644 --- a/includes/lib_switch.php +++ b/includes/lib_switch.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //preferences $v_label_show = false; diff --git a/includes/menu.php b/includes/menu.php index 02f82b2fe0..8522c6401d 100644 --- a/includes/menu.php +++ b/includes/menu.php @@ -24,7 +24,7 @@ Mark J Crane */ require_once "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //define the variable $v_menu = ''; diff --git a/index.php b/index.php index b4d0733c20..874552bbbe 100644 --- a/index.php +++ b/index.php @@ -39,14 +39,14 @@ include "root.php"; } //adds multiple includes - require_once "includes/require.php"; + require_once "resources/require.php"; //show the index page if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/index.php")){ require_once "themes/".$_SESSION['domain']['template']['name']."/index.php"; } else { - require_once "includes/require.php"; + require_once "resources/require.php"; require_once "includes/header.php"; echo "

\n"; require_once "includes/footer.php"; diff --git a/login.php b/login.php index ccac639b80..d9b026c5ca 100644 --- a/login.php +++ b/login.php @@ -31,7 +31,7 @@ include "root.php"; } //adds multiple includes - require_once "includes/require.php"; + require_once "resources/require.php"; //include the login if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/login.php")){ diff --git a/resources/cmd.php b/resources/cmd.php index 07e93d1cd4..c8bb3c24f7 100644 --- a/resources/cmd.php +++ b/resources/cmd.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; if (if_group("admin") || if_group("superadmin")) { //access granted diff --git a/resources/download.php b/resources/download.php index a9f0dea160..d04325fa3c 100644 --- a/resources/download.php +++ b/resources/download.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; //require_once "resources/check_auth.php"; $file = $_GET["f"]; diff --git a/resources/install.php b/resources/install.php index 87baac7e83..505cb33b01 100644 --- a/resources/install.php +++ b/resources/install.php @@ -1187,7 +1187,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist unset($db_tmp); //include additional files - require "includes/require.php"; + require "resources/require.php"; //set the defaults $menu_name = 'default'; diff --git a/resources/secure_download.php b/resources/secure_download.php index 47808ebbc3..ce61e9a085 100644 --- a/resources/secure_download.php +++ b/resources/secure_download.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/require.php"; +require_once "resources/require.php"; require_once "resources/check_auth.php"; //clears if file exists cache diff --git a/secure/fax_to_email.php b/secure/fax_to_email.php index 58b7a9c1d6..5ba228eab3 100644 --- a/secure/fax_to_email.php +++ b/secure/fax_to_email.php @@ -39,7 +39,7 @@ if (defined('STDIN')) { //includes if (!defined('STDIN')) { include "root.php"; } - require_once "includes/require.php"; + require_once "resources/require.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/v_mailto.php b/secure/v_mailto.php index 8b374a7109..41271c36a9 100644 --- a/secure/v_mailto.php +++ b/secure/v_mailto.php @@ -36,7 +36,7 @@ //includes if (!defined('STDIN')) { include "root.php"; } - require_once "includes/require.php"; + require_once "resources/require.php"; //set init settings ini_set('max_execution_time',1800); //30 minutes