diff --git a/app/adminer/adminer.php b/app/adminer/adminer.php
index fa6a60d3a..0a3e99d87 100644
--- a/app/adminer/adminer.php
+++ b/app/adminer/adminer.php
@@ -3,7 +3,7 @@
 	//includes
 		include "root.php";
 		require_once "includes/require.php";
-		require_once "includes/checkauth.php";
+		require_once "resources/check_auth.php";
 	//only allow users in the superadmin group to use this feature
 		if (if_group("superadmin")) {
 			//echo "access granted";
diff --git a/app/adminer/index.php b/app/adminer/index.php
index 9f6ea0688..71efae465 100644
--- a/app/adminer/index.php
+++ b/app/adminer/index.php
@@ -3,7 +3,7 @@
 //includes
 	include "root.php";
 	require_once "includes/require.php";
-	require_once "includes/checkauth.php";
+	require_once "resources/check_auth.php";
 
 //check permission
 	if (permission_exists('adminer')) {
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index a204b83f3..5d2066f9d 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "app_languages.php";
 if (permission_exists('call_broadcast_view')) {
 	//access granted
diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php
index ef3c66fbe..be7a1ba00 100644
--- a/app/call_broadcast/call_broadcast_delete.php
+++ b/app/call_broadcast/call_broadcast_delete.php
@@ -25,7 +25,7 @@
 */
 require "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 5a2f1696c..737f0849c 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9f001a714..4d71e8537 100644
--- a/app/call_broadcast/call_broadcast_send.php
+++ b/app/call_broadcast/call_broadcast_send.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 5c5749c96..63e3e7ed3 100644
--- a/app/call_center/call_center_agent_delete.php
+++ b/app/call_center/call_center_agent_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c3929b622..32c797c7a 100644
--- a/app/call_center/call_center_agent_edit.php
+++ b/app/call_center/call_center_agent_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b175cb8ae..d464a62a0 100644
--- a/app/call_center/call_center_agent_status.php
+++ b/app/call_center/call_center_agent_status.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 3515dd203..77674367e 100644
--- a/app/call_center/call_center_agents.php
+++ b/app/call_center/call_center_agents.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2a83db960..950ab203d 100644
--- a/app/call_center/call_center_queue_delete.php
+++ b/app/call_center/call_center_queue_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b602ebb95..83d393bfd 100644
--- a/app/call_center/call_center_queue_edit.php
+++ b/app/call_center/call_center_queue_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ff8a886ce..6ad655df2 100644
--- a/app/call_center/call_center_queues.php
+++ b/app/call_center/call_center_queues.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f57ebee66..6a5f8073f 100644
--- a/app/call_center/call_center_tier_delete.php
+++ b/app/call_center/call_center_tier_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b742bc529..f0bde290e 100644
--- a/app/call_center/call_center_tier_edit.php
+++ b/app/call_center/call_center_tier_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 487ac9209..fe9d6ef4d 100644
--- a/app/call_center/call_center_tiers.php
+++ b/app/call_center/call_center_tiers.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e70a822d8..0e79850aa 100644
--- a/app/call_center/cmd.php
+++ b/app/call_center/cmd.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d0ff85743..69b3c14dd 100644
--- a/app/call_center_active/call_center_active.php
+++ b/app/call_center_active/call_center_active.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 bec7347d4..21f48dd52 100644
--- a/app/call_center_active/call_center_active_inc.php
+++ b/app/call_center_active/call_center_active_inc.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 aa7e48a4b..2835bb191 100644
--- a/app/call_center_active/call_center_exec.php
+++ b/app/call_center_active/call_center_exec.php
@@ -28,7 +28,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 fa475f49f..ac25f27d0 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 747b7eaec..6096aba62 100644
--- a/app/call_flows/call_flow_delete.php
+++ b/app/call_flows/call_flow_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 4822a4b6a..1afe28adb 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2885af8c2..740fefdef 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 3331b2cd9..4e793a4a0 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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')) {
 	//access granted
diff --git a/app/calls/calls.php b/app/calls/calls.php
index 274d30f99..91861b31c 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9688b9d9a..9f48898a6 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 include "app_languages.php";
 if (permission_exists('calls_active_view')) {
 	//access granted
diff --git a/app/calls_active/calls_active_assigned_extensions_inc.php b/app/calls_active/calls_active_assigned_extensions_inc.php
index 8b8ed7cb7..771598895 100644
--- a/app/calls_active/calls_active_assigned_extensions_inc.php
+++ b/app/calls_active/calls_active_assigned_extensions_inc.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 abf565354..fae118e17 100644
--- a/app/calls_active/calls_active_extensions.php
+++ b/app/calls_active/calls_active_extensions.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 include "app_languages.php";
 if (permission_exists('extensions_active_view')) {
 	//access granted
diff --git a/app/calls_active/calls_active_extensions_inc.php b/app/calls_active/calls_active_extensions_inc.php
index 4ac7b7776..301acafef 100644
--- a/app/calls_active/calls_active_extensions_inc.php
+++ b/app/calls_active/calls_active_extensions_inc.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 include "app_languages.php";
 if (permission_exists('extensions_active_view')) {
 	//access granted
diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php
index 8a401f77e..8c45e9650 100644
--- a/app/calls_active/calls_active_inc.php
+++ b/app/calls_active/calls_active_inc.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 include "app_languages.php";
 if (permission_exists('calls_active_view')) {
 	//access granted
diff --git a/app/calls_active/calls_exec.php b/app/calls_active/calls_exec.php
index 33473710c..efc266e10 100644
--- a/app/calls_active/calls_exec.php
+++ b/app/calls_active/calls_exec.php
@@ -28,7 +28,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 dfce50453..007b5dcdd 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -32,7 +32,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 79940fd9e..a04ca6309 100644
--- a/app/conference_centers/conference_center_delete.php
+++ b/app/conference_centers/conference_center_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 441d3b450..8b149e9f2 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ea1e555a5..9e7bdc47f 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 47eea609d..16d07bc6b 100644
--- a/app/conference_centers/conference_room_delete.php
+++ b/app/conference_centers/conference_room_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ce7660cca..da81fafeb 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 6b0e91b3c..9c0bf0be2 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 7e307dd89..f2867dee0 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -24,7 +24,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2f46b7dd9..8f54dcd9e 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -24,7 +24,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 71bc27f21..54b058672 100644
--- a/app/conferences/conference_delete.php
+++ b/app/conferences/conference_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2b095322a..f874875c5 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 fa060e4f2..eeeac4cf9 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 00c493f3e..d4b291fd1 100644
--- a/app/conferences_active/conference_exec.php
+++ b/app/conferences_active/conference_exec.php
@@ -40,7 +40,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c3b23c4cc..bccaeae70 100644
--- a/app/conferences_active/conference_interactive.php
+++ b/app/conferences_active/conference_interactive.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 03196345b..3c715674d 100644
--- a/app/conferences_active/conference_interactive_inc.php
+++ b/app/conferences_active/conference_interactive_inc.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 16f6557b9..f7da86c22 100644
--- a/app/conferences_active/conferences_active.php
+++ b/app/conferences_active/conferences_active.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 99908fc16..fac5dc4c1 100644
--- a/app/conferences_active/conferences_active_inc.php
+++ b/app/conferences_active/conferences_active_inc.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f3b4bfdcb..680ffe481 100644
--- a/app/contacts/contact_addresses.php
+++ b/app/contacts/contact_addresses.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 69a24f794..4ece9e550 100644
--- a/app/contacts/contact_addresses_delete.php
+++ b/app/contacts/contact_addresses_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 248b76592..261d44f0a 100644
--- a/app/contacts/contact_addresses_edit.php
+++ b/app/contacts/contact_addresses_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0ff403005..2c0f01dd9 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 fccc9c511..e6737095d 100644
--- a/app/contacts/contact_notes.php
+++ b/app/contacts/contact_notes.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b07ceaeb5..ecfd17686 100644
--- a/app/contacts/contact_notes_delete.php
+++ b/app/contacts/contact_notes_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 cdbaa7600..461a897f4 100644
--- a/app/contacts/contact_notes_edit.php
+++ b/app/contacts/contact_notes_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e07c65f98..1f354993e 100644
--- a/app/contacts/contact_phones.php
+++ b/app/contacts/contact_phones.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 57b5474f1..70b715971 100644
--- a/app/contacts/contact_phones_delete.php
+++ b/app/contacts/contact_phones_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 aaf956f59..f8f209d82 100644
--- a/app/contacts/contact_phones_edit.php
+++ b/app/contacts/contact_phones_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 4b3318eb1..c1f6ac76f 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2807677dc..421a0752e 100644
--- a/app/contacts/contacts_delete.php
+++ b/app/contacts/contacts_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f139c89eb..fee72d2b0 100644
--- a/app/contacts/contacts_edit.php
+++ b/app/contacts/contacts_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a06a931f4..84f15d94b 100644
--- a/app/contacts/contacts_vcard.php
+++ b/app/contacts/contacts_vcard.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 5c6fdd0a2..5259778ff 100644
--- a/app/content/index.php
+++ b/app/content/index.php
@@ -27,7 +27,7 @@ return; //disable
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 53214bf3a..509cbf14a 100644
--- a/app/content/rss.php
+++ b/app/content/rss.php
@@ -27,7 +27,7 @@
 return; //disable
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rssadd.php b/app/content/rssadd.php
index 1c5a722ed..697b259a6 100644
--- a/app/content/rssadd.php
+++ b/app/content/rssadd.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_add')) {
 	//access granted
diff --git a/app/content/rsscontent.php b/app/content/rsscontent.php
index 07cd5f98a..77630f5fc 100644
--- a/app/content/rsscontent.php
+++ b/app/content/rsscontent.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rssdelete.php b/app/content/rssdelete.php
index 769fc4dec..100154f30 100644
--- a/app/content/rssdelete.php
+++ b/app/content/rssdelete.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_delete')) {
 	//access granted
diff --git a/app/content/rsslist.php b/app/content/rsslist.php
index e8f3e695e..b116d0902 100644
--- a/app/content/rsslist.php
+++ b/app/content/rsslist.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rssmovedown.php b/app/content/rssmovedown.php
index 9e83bebc2..5e0a138cb 100644
--- a/app/content/rssmovedown.php
+++ b/app/content/rssmovedown.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_edit')) {
 	//access granted
diff --git a/app/content/rssmoveup.php b/app/content/rssmoveup.php
index 96593ce7d..ec18ed8d3 100644
--- a/app/content/rssmoveup.php
+++ b/app/content/rssmoveup.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rsssearch.php b/app/content/rsssearch.php
index 2d0fef89e..7d2bcd88a 100644
--- a/app/content/rsssearch.php
+++ b/app/content/rsssearch.php
@@ -28,7 +28,7 @@ return; //disabled
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rsssubadd.php b/app/content/rsssubadd.php
index 17c0d655a..7270be825 100644
--- a/app/content/rsssubadd.php
+++ b/app/content/rsssubadd.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_add')) {
 	//access granted
diff --git a/app/content/rsssubcategoryadd.php b/app/content/rsssubcategoryadd.php
index 025e57386..a415f4ad0 100644
--- a/app/content/rsssubcategoryadd.php
+++ b/app/content/rsssubcategoryadd.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_add')) {
 	//access granted
diff --git a/app/content/rsssubcategorylist.php b/app/content/rsssubcategorylist.php
index 6b7ff941a..3ee9456e6 100644
--- a/app/content/rsssubcategorylist.php
+++ b/app/content/rsssubcategorylist.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rsssubcategoryupdate.php b/app/content/rsssubcategoryupdate.php
index a552625cf..bd375be32 100644
--- a/app/content/rsssubcategoryupdate.php
+++ b/app/content/rsssubcategoryupdate.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_edit')) {
 	//access granted
diff --git a/app/content/rsssubdelete.php b/app/content/rsssubdelete.php
index dbb36e07b..d3be48de7 100644
--- a/app/content/rsssubdelete.php
+++ b/app/content/rsssubdelete.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_delete')) {
 	//access granted
diff --git a/app/content/rsssublist.php b/app/content/rsssublist.php
index 11c78d704..443c7e0c8 100644
--- a/app/content/rsssublist.php
+++ b/app/content/rsssublist.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rsssubsearch.php b/app/content/rsssubsearch.php
index ed8366663..f42c65633 100644
--- a/app/content/rsssubsearch.php
+++ b/app/content/rsssubsearch.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_view')) {
 	//access granted
diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php
index d324a9cf7..e389718d9 100644
--- a/app/content/rsssubupdate.php
+++ b/app/content/rsssubupdate.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_edit')) {
 	//access granted
diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php
index 2e2e10e46..d8eeda2bf 100644
--- a/app/content/rssupdate.php
+++ b/app/content/rssupdate.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "config.php";
 if (permission_exists('content_edit')) {
 	//access granted
diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php
index 7d0b59fa9..f119a64bd 100644
--- a/app/destinations/destination_delete.php
+++ b/app/destinations/destination_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 aa9165683..be74ec1e4 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d7a591ed0..4e5cd674a 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9a4b5f902..a86c6a68d 100644
--- a/app/devices/device_delete.php
+++ b/app/devices/device_delete.php
@@ -24,7 +24,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ab542304d..295bbd0a7 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -26,7 +26,7 @@ require_once "root.php";
 require_once "includes/require.php";
 
 //check permissions
-	require_once "includes/checkauth.php";
+	require_once "resources/check_auth.php";
 	if (permission_exists('device_add') || permission_exists('device_edit')) {
 		//access granted
 	}
diff --git a/app/devices/device_line_delete.php b/app/devices/device_line_delete.php
index 49ae3a018..6079a3172 100644
--- a/app/devices/device_line_delete.php
+++ b/app/devices/device_line_delete.php
@@ -24,7 +24,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9eb914df0..6d7bf1bc4 100644
--- a/app/devices/device_line_edit.php
+++ b/app/devices/device_line_edit.php
@@ -24,7 +24,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e72a75d2b..e7b31c2ae 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -24,7 +24,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0bf44372c..e163851ed 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 899efb966..886c36e36 100644
--- a/app/dialplan/dialplan_advanced.php
+++ b/app/dialplan/dialplan_advanced.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 892400af0..534cde05b 100644
--- a/app/dialplan/dialplan_copy.php
+++ b/app/dialplan/dialplan_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('inbound_route_add')
diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php
index 0d7ce8458..9b75fe7a2 100644
--- a/app/dialplan/dialplan_delete.php
+++ b/app/dialplan/dialplan_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('dialplan_delete')
 	|| permission_exists('inbound_route_delete')
 	|| permission_exists('outbound_route_delete')
diff --git a/app/dialplan/dialplan_details_delete.php b/app/dialplan/dialplan_details_delete.php
index a38729e6d..90fdaafb4 100644
--- a/app/dialplan/dialplan_details_delete.php
+++ b/app/dialplan/dialplan_details_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('dialplan_delete')
 	|| permission_exists('inbound_route_delete')
 	|| permission_exists('outbound_route_delete')
diff --git a/app/dialplan/dialplan_details_edit.php b/app/dialplan/dialplan_details_edit.php
index 0bb1e89c6..3770b52b6 100644
--- a/app/dialplan/dialplan_details_edit.php
+++ b/app/dialplan/dialplan_details_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('dialplan_edit')
 	|| permission_exists('inbound_route_add')
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index 073c766d6..5b2b72e8c 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('dialplan_edit')
diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php
index fce8c4160..2205a111f 100644
--- a/app/dialplan/dialplans.php
+++ b/app/dialplan/dialplans.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a9d60f672..d939f5e69 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 01d0bb8c6..1750ed9e7 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 179d063b0..6ef5a2ae3 100644
--- a/app/edit/clipadd.php
+++ b/app/edit/clipadd.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ff2e2c9e1..ae31f5455 100644
--- a/app/edit/clipdelete.php
+++ b/app/edit/clipdelete.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 39fe24a9e..e2c4c3245 100644
--- a/app/edit/cliplist.php
+++ b/app/edit/cliplist.php
@@ -26,8 +26,8 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('script_editor_view')) {
 	//access granted
 }
diff --git a/app/edit/clipoptions.php b/app/edit/clipoptions.php
index ce742729a..6e85a4e6b 100644
--- a/app/edit/clipoptions.php
+++ b/app/edit/clipoptions.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 34a908413..3a1ce516a 100644
--- a/app/edit/clipoptionslist.php
+++ b/app/edit/clipoptionslist.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('php_editor_view')) {
 	//access granted
 }
diff --git a/app/edit/clipsearch.php b/app/edit/clipsearch.php
index 4b1dc9050..c359832a2 100644
--- a/app/edit/clipsearch.php
+++ b/app/edit/clipsearch.php
@@ -25,7 +25,7 @@
 	James Rose <james.o.rose@gmail.com>
 */
 include "root.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('script_editor_view')) {
 	//access granted
 }
diff --git a/app/edit/clipupdate.php b/app/edit/clipupdate.php
index 692eb5f78..35bb980d6 100644
--- a/app/edit/clipupdate.php
+++ b/app/edit/clipupdate.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 7ddd61899..c437e6d61 100644
--- a/app/edit/filedelete.php
+++ b/app/edit/filedelete.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 7f0ab5b39..203493882 100644
--- a/app/edit/filelist.php
+++ b/app/edit/filelist.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 012065633..c930584cf 100644
--- a/app/edit/filenew.php
+++ b/app/edit/filenew.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 456cbfc8e..1a9504579 100644
--- a/app/edit/fileoptions.php
+++ b/app/edit/fileoptions.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 6f786cd18..df345e5e1 100644
--- a/app/edit/fileoptionslist.php
+++ b/app/edit/fileoptionslist.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 907c9ec08..00aff5f25 100644
--- a/app/edit/fileread.php
+++ b/app/edit/fileread.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 95ed15bd8..dc01fca61 100644
--- a/app/edit/filerename.php
+++ b/app/edit/filerename.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f36d22628..7b9425164 100644
--- a/app/edit/filesave.php
+++ b/app/edit/filesave.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 62c669cdd..b4ce48161 100644
--- a/app/edit/folderdelete.php
+++ b/app/edit/folderdelete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 970d9ac8d..e8b3d3806 100644
--- a/app/edit/foldernew.php
+++ b/app/edit/foldernew.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 963c36f91..b1d25e91e 100644
--- a/app/edit/index.php
+++ b/app/edit/index.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('script_editor_view')) {
 	//access granted
 }
diff --git a/app/edit/list.php b/app/edit/list.php
index 021bbbe9d..a0e3f1be4 100644
--- a/app/edit/list.php
+++ b/app/edit/list.php
@@ -25,7 +25,7 @@
 	James Rose <james.o.rose@gmail.com>
 */
 include "root.php";
-require_once "includes/checkauth.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 323ffdc39..a27ff56ff 100644
--- a/app/exec/exec.php
+++ b/app/exec/exec.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 51821110a..04ddf7d19 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('extension_add')) {
 	//access granted
diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php
index 1863a1776..ab741e026 100644
--- a/app/extensions/extension_delete.php
+++ b/app/extensions/extension_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 508a2e415..8bc882a4c 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -24,7 +24,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e6fe6c793..0946037bc 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0eb9796e9..11cacea58 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a594e08d5..16aefa883 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('fax_extension_add')) {
 	//access granted
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index 8187a1e9d..8fef4b34c 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9f2f445eb..beea8e4d4 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2f38a0f39..c1a73fc2f 100644
--- a/app/fax/fax_view.php
+++ b/app/fax/fax_view.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b06d75be3..2e47190be 100644
--- a/app/fifo/fifo.php
+++ b/app/fifo/fifo.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 059cc2d2a..2079dbadc 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 33e54f33d..699ffe31f 100644
--- a/app/fifo/fifo_delete.php
+++ b/app/fifo/fifo_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 43e4627ae..d2db23922 100644
--- a/app/fifo/fifo_detail_delete.php
+++ b/app/fifo/fifo_detail_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ec4d8c8ac..386e24716 100644
--- a/app/fifo/fifo_detail_edit.php
+++ b/app/fifo/fifo_detail_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 2d073d6c4..506ddd18a 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('fifo_add') || permission_exists('fifo_edit')) {
 	//access granted
diff --git a/app/fifo_list/fifo_exec.php b/app/fifo_list/fifo_exec.php
index cebb25d85..0a61c16d2 100644
--- a/app/fifo_list/fifo_exec.php
+++ b/app/fifo_list/fifo_exec.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d23df3f59..e5361339c 100644
--- a/app/fifo_list/fifo_interactive.php
+++ b/app/fifo_list/fifo_interactive.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 1d7060d10..cbd48bcf0 100644
--- a/app/fifo_list/fifo_interactive_inc.php
+++ b/app/fifo_list/fifo_interactive_inc.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a0d01fee8..1562a473b 100644
--- a/app/fifo_list/fifo_list.php
+++ b/app/fifo_list/fifo_list.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 113678736..f23b2d47f 100644
--- a/app/fifo_list/fifo_list_inc.php
+++ b/app/fifo_list/fifo_list_inc.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a82a87e2d..105484f08 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('gateway_add')) {
 	//access granted
diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index f252e740a..bd42ffb16 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 8493477b1..3bce5ef60 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 8e16d9acb..49a764679 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 939133016..e65bdbf9b 100644
--- a/app/hot_desking/extension_delete.php
+++ b/app/hot_desking/extension_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9efd5675a..c41b1c04c 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -24,7 +24,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e0c188af1..b7b4dc115 100644
--- a/app/hot_desking/index.php
+++ b/app/hot_desking/index.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 427310761..125d68ce3 100644
--- a/app/hunt_groups/hunt_group_call_forward.php
+++ b/app/hunt_groups/hunt_group_call_forward.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 if (permission_exists('hunt_group_call_forward')) {
diff --git a/app/hunt_groups/hunt_group_call_forward_edit.php b/app/hunt_groups/hunt_group_call_forward_edit.php
index 750392a06..b4c5a249e 100644
--- a/app/hunt_groups/hunt_group_call_forward_edit.php
+++ b/app/hunt_groups/hunt_group_call_forward_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 	if (permission_exists('hunt_group_add') || permission_exists('hunt_group_edit') || permission_exists('hunt_group_call_forward')) {
diff --git a/app/hunt_groups/hunt_group_copy.php b/app/hunt_groups/hunt_group_copy.php
index 8183c0f9f..10dfd0dae 100644
--- a/app/hunt_groups/hunt_group_copy.php
+++ b/app/hunt_groups/hunt_group_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 
 //check permissions
diff --git a/app/hunt_groups/hunt_group_delete.php b/app/hunt_groups/hunt_group_delete.php
index 82549de22..73f0ad3b2 100644
--- a/app/hunt_groups/hunt_group_delete.php
+++ b/app/hunt_groups/hunt_group_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 if (permission_exists('hunt_group_delete')) {
diff --git a/app/hunt_groups/hunt_group_destination_delete.php b/app/hunt_groups/hunt_group_destination_delete.php
index 3f01a8775..82062f7a1 100644
--- a/app/hunt_groups/hunt_group_destination_delete.php
+++ b/app/hunt_groups/hunt_group_destination_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 	if (permission_exists('hunt_group_delete')) {
diff --git a/app/hunt_groups/hunt_group_destination_edit.php b/app/hunt_groups/hunt_group_destination_edit.php
index dd06e060b..7837e65ae 100644
--- a/app/hunt_groups/hunt_group_destination_edit.php
+++ b/app/hunt_groups/hunt_group_destination_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 	if (permission_exists('hunt_group_add') || permission_exists('hunt_group_edit')) {
diff --git a/app/hunt_groups/hunt_group_edit.php b/app/hunt_groups/hunt_group_edit.php
index 82dbd0291..4f3100e0d 100644
--- a/app/hunt_groups/hunt_group_edit.php
+++ b/app/hunt_groups/hunt_group_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 
 //check permissions
diff --git a/app/hunt_groups/hunt_groups.php b/app/hunt_groups/hunt_groups.php
index 5fd675576..1790ae0ac 100644
--- a/app/hunt_groups/hunt_groups.php
+++ b/app/hunt_groups/hunt_groups.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 	if (permission_exists('hunt_group_view')) {
diff --git a/app/ivr_menu/ivr_menu_copy.php b/app/ivr_menu/ivr_menu_copy.php
index 14c5202a3..498f6d0f6 100644
--- a/app/ivr_menu/ivr_menu_copy.php
+++ b/app/ivr_menu/ivr_menu_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('ivr_menu_edit')) {
 	//access granted
diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php
index ddc8a9d1a..944efacfa 100644
--- a/app/ivr_menu/ivr_menu_delete.php
+++ b/app/ivr_menu/ivr_menu_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f9ddd20c8..e8b2f5a28 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 63924509e..0d325ff51 100644
--- a/app/ivr_menu/ivr_menu_option_delete.php
+++ b/app/ivr_menu/ivr_menu_option_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0d00adaa3..78a2fbce0 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e3aaf4285..6b7c6cf8c 100644
--- a/app/ivr_menu/ivr_menu_options.php
+++ b/app/ivr_menu/ivr_menu_options.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e2faba950..7ec3cbcfb 100644
--- a/app/ivr_menu/ivr_menus.php
+++ b/app/ivr_menu/ivr_menus.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 16ff1f5bb..01fb1add6 100644
--- a/app/log_viewer/log_viewer.php
+++ b/app/log_viewer/log_viewer.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 6906b6803..4aa0cd820 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 7e99af046..e4c54358e 100644
--- a/app/modules/modules_delete.php
+++ b/app/modules/modules_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 8e59dbb2b..8310ed681 100644
--- a/app/modules/modules_edit.php
+++ b/app/modules/modules_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 662f3fc78..9a1187297 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -27,7 +27,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 62fd4b8dd..7fd6c042b 100644
--- a/app/music_on_hold/music_on_hold_play.php
+++ b/app/music_on_hold/music_on_hold_play.php
@@ -26,7 +26,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('music_on_hold_view')) {
 	//access granted
 }
diff --git a/app/provision/provision_write.php b/app/provision/provision_write.php
index b3062c90c..75cd94773 100644
--- a/app/provision/provision_write.php
+++ b/app/provision/provision_write.php
@@ -24,7 +24,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c04a149bf..58c569990 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d4edee038..369eb96e1 100644
--- a/app/recordings/recordings_delete.php
+++ b/app/recordings/recordings_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 7df630276..e10a55fe2 100644
--- a/app/recordings/recordings_edit.php
+++ b/app/recordings/recordings_edit.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 10c449eb9..240e21159 100644
--- a/app/recordings/recordings_play.php
+++ b/app/recordings/recordings_play.php
@@ -26,7 +26,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ea9c1383b..5258e985b 100644
--- a/app/registrations/status_registrations.php
+++ b/app/registrations/status_registrations.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //check permissions
 	if (permission_exists("registrations_domain") || permission_exists("registrations_all") || if_group("superadmin")) {
diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php
index 13866f527..abf2e244c 100644
--- a/app/ring_groups/ring_groups.php
+++ b/app/ring_groups/ring_groups.php
@@ -26,7 +26,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 030c35bb0..70902153c 100644
--- a/app/ring_groups/ring_groups_delete.php
+++ b/app/ring_groups/ring_groups_delete.php
@@ -26,7 +26,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 455880532..43959f9c7 100644
--- a/app/ring_groups/ring_groups_edit.php
+++ b/app/ring_groups/ring_groups_edit.php
@@ -26,7 +26,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 4dd856c6e..ed62b4c57 100644
--- a/app/schemas/schema_data_delete.php
+++ b/app/schemas/schema_data_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ba8d25bee..b33a19406 100644
--- a/app/schemas/schema_data_edit.php
+++ b/app/schemas/schema_data_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c83498ac3..7264ceb2f 100644
--- a/app/schemas/schema_data_view.php
+++ b/app/schemas/schema_data_view.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 1e14b852b..81ed83d83 100644
--- a/app/schemas/schema_delete.php
+++ b/app/schemas/schema_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 dcfd51f9a..c80bdca62 100644
--- a/app/schemas/schema_edit.php
+++ b/app/schemas/schema_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a1b8dcd8f..9739952a9 100644
--- a/app/schemas/schema_field_delete.php
+++ b/app/schemas/schema_field_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 4eb2c9531..7d4d7e2f1 100644
--- a/app/schemas/schema_field_edit.php
+++ b/app/schemas/schema_field_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 48c3c22d2..1a5743401 100644
--- a/app/schemas/schema_fields.php
+++ b/app/schemas/schema_fields.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 7797cee8e..079dd797b 100644
--- a/app/schemas/schema_import.php
+++ b/app/schemas/schema_import.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 20027631c..5101d30cd 100644
--- a/app/schemas/schema_name_value_delete.php
+++ b/app/schemas/schema_name_value_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 84277637f..a35460f56 100644
--- a/app/schemas/schema_name_value_edit.php
+++ b/app/schemas/schema_name_value_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 80fb6b784..cbfb053cc 100644
--- a/app/schemas/schema_name_values.php
+++ b/app/schemas/schema_name_values.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d19fc4739..ed753b20e 100644
--- a/app/schemas/schemas.php
+++ b/app/schemas/schemas.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e172ef165..196a8b257 100644
--- a/app/services/service_delete.php
+++ b/app/services/service_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 8e7443454..8af85ed2a 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -26,7 +26,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a548b6996..ca4ac2143 100644
--- a/app/services/services.php
+++ b/app/services/services.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 61c8414c4..9479c4417 100644
--- a/app/settings/settings_edit.php
+++ b/app/settings/settings_edit.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 61e1ff2b2..22fcd555c 100644
--- a/app/sip_profiles/sip_profile_copy.php
+++ b/app/sip_profiles/sip_profile_copy.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/paging.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('inbound_route_add')
diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php
index 378e7938c..023676598 100644
--- a/app/sip_profiles/sip_profile_settings.php
+++ b/app/sip_profiles/sip_profile_settings.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 49d3eca05..c7e9f350f 100644
--- a/app/sip_profiles/sip_profile_settings_delete.php
+++ b/app/sip_profiles/sip_profile_settings_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 957168fec..13ee32d68 100644
--- a/app/sip_profiles/sip_profile_settings_edit.php
+++ b/app/sip_profiles/sip_profile_settings_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 396016961..c76e8eeda 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0d6762798..dadb3e878 100644
--- a/app/sip_profiles/sip_profiles_delete.php
+++ b/app/sip_profiles/sip_profiles_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f40621584..a0c04a932 100644
--- a/app/sip_profiles/sip_profiles_edit.php
+++ b/app/sip_profiles/sip_profiles_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9abe45a5f..66250037a 100644
--- a/app/sip_status/cmd.php
+++ b/app/sip_status/cmd.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 84f3811f1..a70c2422f 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 if (permission_exists('system_status_sofia_status')
 	|| permission_exists('system_status_sofia_status_profile')
diff --git a/app/sql_query/sql_backup.php b/app/sql_query/sql_backup.php
index 1a1bd6069..f8d7ccb21 100644
--- a/app/sql_query/sql_backup.php
+++ b/app/sql_query/sql_backup.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 064d3fd93..63b53f568 100644
--- a/app/sql_query/sql_db_conversion.php
+++ b/app/sql_query/sql_db_conversion.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/lib_schema.php";
 
 if (if_group("superadmin")) {
diff --git a/app/sql_query/sql_query.php b/app/sql_query/sql_query.php
index 9e8d6f3bf..2083fcdc1 100644
--- a/app/sql_query/sql_query.php
+++ b/app/sql_query/sql_query.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('sql_query_execute')) {
 	//access granted
 }
diff --git a/app/sql_query/sql_query_db.php b/app/sql_query/sql_query_db.php
index 59e6bc4ab..c6193e34e 100644
--- a/app/sql_query/sql_query_db.php
+++ b/app/sql_query/sql_query_db.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 6e78d7524..17f6e8e1c 100644
--- a/app/sql_query/sql_query_pdo.php
+++ b/app/sql_query/sql_query_pdo.php
@@ -25,7 +25,7 @@
  */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 09f7a66f5..a0f3958e2 100644
--- a/app/sql_query/sql_query_result.php
+++ b/app/sql_query/sql_query_result.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 44afabb54..72ac23f60 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -26,7 +26,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('system_view_info') 
 	|| permission_exists('system_view_cpu') 
 	|| permission_exists('system_view_hdd') 
diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php
index fe56faf62..77412331e 100644
--- a/app/time_conditions/time_condition_add.php
+++ b/app/time_conditions/time_condition_add.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c1b880acd..49566ae2f 100644
--- a/app/traffic_graph/status_graph.php
+++ b/app/traffic_graph/status_graph.php
@@ -34,7 +34,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a6c9ea51d..83ef21a13 100644
--- a/app/traffic_graph/status_interface.php
+++ b/app/traffic_graph/status_interface.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 42e4a2610..956e41c32 100644
--- a/app/traffic_graph/svg_graph.php
+++ b/app/traffic_graph/svg_graph.php
@@ -30,7 +30,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 1ffc25584..327ceb15a 100644
--- a/app/vars/var_delete.php
+++ b/app/vars/var_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 165cc389e..755e9ad33 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 478b71d95..ae6e65b7e 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 164cc65a1..43f36bcd8 100644
--- a/app/vars/vars_textarea.php
+++ b/app/vars/vars_textarea.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 255023ef3..94627b77b 100644
--- a/app/voicemail_greetings/voicemail_greeting_delete.php
+++ b/app/voicemail_greetings/voicemail_greeting_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 262cecb33..510b54e3a 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d6125921a..0838d4f04 100644
--- a/app/voicemail_greetings/voicemail_greeting_play.php
+++ b/app/voicemail_greetings/voicemail_greeting_play.php
@@ -26,7 +26,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 d61edeb18..f4c303498 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 12dbef30c..c6f4bfa63 100644
--- a/app/voicemails/voicemail_delete.php
+++ b/app/voicemails/voicemail_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0c3e82f51..d6ac46080 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 65e07be41..1bbccacfe 100644
--- a/app/voicemails/voicemail_message_delete.php
+++ b/app/voicemails/voicemail_message_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 1063eb312..fab233a10 100644
--- a/app/voicemails/voicemail_message_edit.php
+++ b/app/voicemails/voicemail_message_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0f0237451..1fdadec8e 100644
--- a/app/voicemails/voicemail_message_play.php
+++ b/app/voicemails/voicemail_message_play.php
@@ -26,7 +26,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 6d0719e1d..100fa24a8 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e9bedcd7c..ad65ca062 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists('voicemail_view')) {
 	//access granted
 }
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 498176030..a450ccab6 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "app_languages.php";
 if (permission_exists('xml_cdr_view')) {
 	//access granted
diff --git a/app/xml_cdr/xml_cdr_csv.php b/app/xml_cdr/xml_cdr_csv.php
index e26b20d98..ecdd3ad67 100644
--- a/app/xml_cdr/xml_cdr_csv.php
+++ b/app/xml_cdr/xml_cdr_csv.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 33d83cf03..476d0d2c0 100644
--- a/app/xml_cdr/xml_cdr_details.php
+++ b/app/xml_cdr/xml_cdr_details.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 if (permission_exists('xml_cdr_view')) {
 	//access granted
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index a8547e784..1f3e0351b 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 6de1b68a3..3548cf98f 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 84128a977..ba7ad336d 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 5275f431a..8cddcad54 100644
--- a/app/xml_cdr/xml_cdr_statistics_csv.php
+++ b/app/xml_cdr/xml_cdr_statistics_csv.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 977d43dfd..090f808ab 100644
--- a/app/xml_cdr/xml_cdr_statistics_inc.php
+++ b/app/xml_cdr/xml_cdr_statistics_inc.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 eab283a7a..c871c84ab 100644
--- a/app/xmpp/profile_delete.php
+++ b/app/xmpp/profile_delete.php
@@ -27,7 +27,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 0bb9ec465..4c507b66d 100644
--- a/app/xmpp/xmpp.php
+++ b/app/xmpp/xmpp.php
@@ -27,7 +27,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 4964c8ccb..8430116af 100644
--- a/app/xmpp/xmpp_profile_edit.php
+++ b/app/xmpp/xmpp_profile_edit.php
@@ -28,7 +28,7 @@
 
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 if (permission_exists('xmpp_add') || permission_exists('xmpp_edit')) {
 	//access granted
diff --git a/core/apps/apps.php b/core/apps/apps.php
index 4cf6d5d22..03a3dee9f 100644
--- a/core/apps/apps.php
+++ b/core/apps/apps.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 08ae94bbf..dd3b275ce 100644
--- a/core/apps/apps_delete.php
+++ b/core/apps/apps_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c6244fe91..deeed2329 100644
--- a/core/apps/apps_edit.php
+++ b/core/apps/apps_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 541e9b35b..3e23832a5 100644
--- a/core/backup/backup.php
+++ b/core/backup/backup.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 if (if_group("superadmin")) {
 
diff --git a/core/backup/backupandrestore.php b/core/backup/backupandrestore.php
index d9e8f4e32..b39a8718e 100644
--- a/core/backup/backupandrestore.php
+++ b/core/backup/backupandrestore.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 bce50e869..ef3fd2687 100644
--- a/core/databases/database_delete.php
+++ b/core/databases/database_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 32866025e..3d007ba1d 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 3878137c7..c87e6748b 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a917cd924..24d8a6b5c 100644
--- a/core/default_settings/default_setting_delete.php
+++ b/core/default_settings/default_setting_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c5775ef6c..afde5753d 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 5c3e31dc3..d8f40108c 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c6f94701a..cf66ab139 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b050381ed..cced0cd4c 100644
--- a/core/domain_settings/domain_settings_delete.php
+++ b/core/domain_settings/domain_settings_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 35d9737c6..0043ea0f8 100644
--- a/core/domain_settings/domain_settings_edit.php
+++ b/core/domain_settings/domain_settings_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 39094976b..9b8f61920 100644
--- a/core/domain_settings/domains.php
+++ b/core/domain_settings/domains.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f77c1777e..e879dd6f5 100644
--- a/core/domain_settings/domains_delete.php
+++ b/core/domain_settings/domains_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 750ed452c..ce1875d9d 100644
--- a/core/domain_settings/domains_edit.php
+++ b/core/domain_settings/domains_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 20f20a0da..8e1d8c32f 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 99a355aa2..10018e32b 100644
--- a/core/menu/menu_delete.php
+++ b/core/menu/menu_delete.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 35418a804..55022e9ed 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 708d9e45f..9db156733 100644
--- a/core/menu/menu_item_delete.php
+++ b/core/menu/menu_item_delete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e7d6ea040..d8fd88853 100644
--- a/core/menu/menu_item_edit.php
+++ b/core/menu/menu_item_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 8d36a052e..9f98f5455 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 5e3a9b49f..1b12a81a9 100644
--- a/core/menu/menu_item_move_down.php
+++ b/core/menu/menu_item_move_down.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9237287cb..3fc9d23e4 100644
--- a/core/menu/menu_item_move_up.php
+++ b/core/menu/menu_item_move_up.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 ba32635f1..dffcc0585 100644
--- a/core/menu/menu_restore_default.php
+++ b/core/menu/menu_restore_default.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 549ee40ea..48c45a2c2 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.php
@@ -43,7 +43,7 @@
 	else {
 		include "root.php";
 		require_once "includes/require.php";
-		require_once "includes/checkauth.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 3ca643aa7..24fca5e1c 100644
--- a/core/upgrade/upgrade_domains.php
+++ b/core/upgrade/upgrade_domains.php
@@ -37,7 +37,7 @@
 	else {
 		include "root.php";
 		require_once "includes/require.php";
-		require_once "includes/checkauth.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 bf4e1bc7f..2830d13da 100644
--- a/core/upgrade/upgrade_schema.php
+++ b/core/upgrade/upgrade_schema.php
@@ -43,7 +43,7 @@
 	else {
 		include "root.php";
 		require_once "includes/require.php";
-		require_once "includes/checkauth.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 223ab3481..fc5529996 100644
--- a/core/user_settings/user_dashboard.php
+++ b/core/user_settings/user_dashboard.php
@@ -29,7 +29,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php"))
 	exit;
 }
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 require_once "includes/header.php";
 
 //add multi-lingual support
diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php
index 54ece9fc2..bedcae9c7 100644
--- a/core/user_settings/user_edit.php
+++ b/core/user_settings/user_edit.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 include "app_languages.php";
 
 if (permission_exists("user_account_settings_view")) {
diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php
index 9a305637c..5fca21d20 100644
--- a/core/users/group_permissions.php
+++ b/core/users/group_permissions.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 f3de39d2b..e4682d413 100644
--- a/core/users/groupadd.php
+++ b/core/users/groupadd.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 9adcfdbdb..56f0da816 100644
--- a/core/users/groupdelete.php
+++ b/core/users/groupdelete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c93bb456a..bdffd8da1 100644
--- a/core/users/groupmemberadd.php
+++ b/core/users/groupmemberadd.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 e9019f698..4378800b7 100644
--- a/core/users/groupmemberdelete.php
+++ b/core/users/groupmemberdelete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c33d6e1e8..e7a457894 100644
--- a/core/users/groupmembers.php
+++ b/core/users/groupmembers.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 3286aaa00..6efc73666 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -27,7 +27,7 @@ include "root.php";
 require_once "includes/require.php";
 
 //check the permissions
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (if_group("admin") || if_group("superadmin")) {
 	//access allowed
 }
diff --git a/core/users/index.php b/core/users/index.php
index 23da4fa09..836cec041 100644
--- a/core/users/index.php
+++ b/core/users/index.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 327984109..52f4d4647 100644
--- a/core/users/permissions_default.php
+++ b/core/users/permissions_default.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 c1f2cbb06..eb1a5508a 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 if (if_group("admin") || if_group("superadmin")) {
 	//access allowed
diff --git a/core/users/userdelete.php b/core/users/userdelete.php
index 884dbb38f..b5ae8d420 100644
--- a/core/users/userdelete.php
+++ b/core/users/userdelete.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 a8b15bd91..16dd468ac 100644
--- a/core/users/userlist.php
+++ b/core/users/userlist.php
@@ -25,7 +25,7 @@
 */
 require_once "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 b8cc637ca..a2f92519f 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 if (permission_exists("user_add") ||
 	permission_exists("user_edit") ||
 	permission_exists("user_delete") ||
diff --git a/resources/cmd.php b/resources/cmd.php
index b02e3fba9..07e93d1cd 100644
--- a/resources/cmd.php
+++ b/resources/cmd.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.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 4e7f8b036..a9f0dea16 100644
--- a/resources/download.php
+++ b/resources/download.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-//require_once "includes/checkauth.php";
+//require_once "resources/check_auth.php";
 
 $file = $_GET["f"];
 require_once "resources/secure_download.php";
diff --git a/resources/install/source.xml b/resources/install/source.xml
index 2d504b0bc..f264e3560 100644
--- a/resources/install/source.xml
+++ b/resources/install/source.xml
@@ -526,7 +526,7 @@
 	</src> 
 	<src> 
 		<type>file</type> 
-		<path>/includes/checkauth.php</path> 
+		<path>/resources/check_auth.php</path> 
 		<last_mod>Sun, 05 Sep 2010 06:44:52 GMT</last_mod> 
 		<md5>8f5f75bae7abe72ddfe0283d9f05935f</md5> 
 		<size>4660</size> 
diff --git a/resources/secure_download.php b/resources/secure_download.php
index eec57dbc2..47808ebbc 100644
--- a/resources/secure_download.php
+++ b/resources/secure_download.php
@@ -25,7 +25,7 @@
 */
 include "root.php";
 require_once "includes/require.php";
-require_once "includes/checkauth.php";
+require_once "resources/check_auth.php";
 
 //clears if file exists cache
 clearstatcache();