diff --git a/app/call_center/app_config.php b/app/call_center/app_config.php index 7ac3185311..45df64f418 100644 --- a/app/call_center/app_config.php +++ b/app/call_center/app_config.php @@ -56,57 +56,57 @@ $apps[$x]['menu'][1]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'call_center_queues_view'; + $apps[$x]['permissions'][0]['name'] = 'call_center_queue_view'; $apps[$x]['permissions'][0]['menu']['uuid'] = '6c072b29-5b6c-49fc-008e-95e24c77de99'; $apps[$x]['permissions'][0]['groups'][] = 'agent'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'call_center_queues_add'; + $apps[$x]['permissions'][1]['name'] = 'call_center_queue_add'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'call_center_queues_edit'; + $apps[$x]['permissions'][2]['name'] = 'call_center_queue_edit'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'call_center_queues_delete'; + $apps[$x]['permissions'][3]['name'] = 'call_center_queue_delete'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][4]['name'] = 'call_center_agents_view'; + $apps[$x]['permissions'][4]['name'] = 'call_center_agent_view'; $apps[$x]['permissions'][4]['menu']['uuid'] = '597c483a-51a9-f95a-8d54-ea7d87ada2b8'; $apps[$x]['permissions'][4]['groups'][] = 'agent'; $apps[$x]['permissions'][4]['groups'][] = 'admin'; $apps[$x]['permissions'][4]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][5]['name'] = 'call_center_agents_add'; + $apps[$x]['permissions'][5]['name'] = 'call_center_agent_add'; $apps[$x]['permissions'][5]['groups'][] = 'admin'; $apps[$x]['permissions'][5]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][6]['name'] = 'call_center_agents_edit'; + $apps[$x]['permissions'][6]['name'] = 'call_center_agent_edit'; $apps[$x]['permissions'][6]['groups'][] = 'admin'; $apps[$x]['permissions'][6]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][7]['name'] = 'call_center_agents_delete'; + $apps[$x]['permissions'][7]['name'] = 'call_center_agent_delete'; $apps[$x]['permissions'][7]['groups'][] = 'admin'; $apps[$x]['permissions'][7]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][8]['name'] = 'call_center_tiers_view'; + $apps[$x]['permissions'][8]['name'] = 'call_center_tier_view'; $apps[$x]['permissions'][8]['menu']['uuid'] = ''; $apps[$x]['permissions'][8]['groups'][] = 'agent'; $apps[$x]['permissions'][8]['groups'][] = 'admin'; $apps[$x]['permissions'][8]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][9]['name'] = 'call_center_tiers_add'; + $apps[$x]['permissions'][9]['name'] = 'call_center_tier_add'; $apps[$x]['permissions'][9]['groups'][] = 'admin'; $apps[$x]['permissions'][9]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][10]['name'] = 'call_center_tiers_edit'; + $apps[$x]['permissions'][10]['name'] = 'call_center_tier_edit'; $apps[$x]['permissions'][10]['groups'][] = 'admin'; $apps[$x]['permissions'][10]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][11]['name'] = 'call_center_tiers_delete'; + $apps[$x]['permissions'][11]['name'] = 'call_center_tier_delete'; $apps[$x]['permissions'][11]['groups'][] = 'admin'; $apps[$x]['permissions'][11]['groups'][] = 'superadmin'; diff --git a/app/call_center/call_center_agent_delete.php b/app/call_center/call_center_agent_delete.php index 066b2e717b..c1cbcab5b6 100644 --- a/app/call_center/call_center_agent_delete.php +++ b/app/call_center/call_center_agent_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_agents_delete')) { +if (permission_exists('call_center_agent_delete')) { //access granted } else { diff --git a/app/call_center/call_center_agent_edit.php b/app/call_center/call_center_agent_edit.php index 1d6253c2de..9f913e4366 100644 --- a/app/call_center/call_center_agent_edit.php +++ b/app/call_center/call_center_agent_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_agents_add') || permission_exists('call_center_agents_edit')) { +if (permission_exists('call_center_agent_add') || permission_exists('call_center_agent_edit')) { //access granted } else { diff --git a/app/call_center/call_center_agent_status.php b/app/call_center/call_center_agent_status.php index 0ec1f87658..b0402b54a6 100644 --- a/app/call_center/call_center_agent_status.php +++ b/app/call_center/call_center_agent_status.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_agents_view')) { +if (permission_exists('call_center_agent_view')) { //access granted } else { diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php index 7f495427bc..26efb321f8 100644 --- a/app/call_center/call_center_agents.php +++ b/app/call_center/call_center_agents.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_agents_view')) { +if (permission_exists('call_center_agent_view')) { //access granted } else { @@ -128,7 +128,7 @@ require_once "resources/paging.php"; //echo th_order_by('agent_reject_delay_time', $text['label-reject_delay_time'], $order_by, $order); //echo th_order_by('agent_busy_delay_time', $text['label-busy_delay_time'], $order_by, $order); echo "\n"; - if (permission_exists('call_center_agents_add')) { + if (permission_exists('call_center_agent_add')) { echo " $v_link_label_add\n"; } echo "\n"; @@ -150,10 +150,10 @@ require_once "resources/paging.php"; //echo " ".$row[agent_reject_delay_time]." \n"; //echo " ".$row[agent_busy_delay_time]." \n"; echo " \n"; - if (permission_exists('call_center_agents_edit')) { + if (permission_exists('call_center_agent_edit')) { echo " $v_link_label_edit\n"; } - if (permission_exists('call_center_agents_delete')) { + if (permission_exists('call_center_agent_delete')) { echo " $v_link_label_delete\n"; } //echo " \n"; @@ -172,7 +172,7 @@ require_once "resources/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('call_center_agents_add')) { + if (permission_exists('call_center_agent_add')) { echo " $v_link_label_add\n"; } echo " \n"; diff --git a/app/call_center/call_center_queue_delete.php b/app/call_center/call_center_queue_delete.php index efa1da489f..b4c882a6ea 100644 --- a/app/call_center/call_center_queue_delete.php +++ b/app/call_center/call_center_queue_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_queues_delete')) { +if (permission_exists('call_center_queue_delete')) { //access granted } else { diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php index 600067815b..d373c0027b 100644 --- a/app/call_center/call_center_queue_edit.php +++ b/app/call_center/call_center_queue_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_queues_add') || permission_exists('call_center_queues_edit')) { +if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_edit')) { //access granted } else { diff --git a/app/call_center/call_center_queues.php b/app/call_center/call_center_queues.php index 2c2b60c401..80c2294bde 100644 --- a/app/call_center/call_center_queues.php +++ b/app/call_center/call_center_queues.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_queues_view')) { +if (permission_exists('call_center_queue_view')) { //access granted } else { @@ -131,7 +131,7 @@ require_once "resources/paging.php"; //echo th_order_by('queue_tier_rule_wait_multiply_level', $text['label-tier_rule_wait_multiply_level'], $order_by, $order); echo th_order_by('queue_description', $text['label-description'], $order_by, $order); echo "\n"; - if (permission_exists('call_center_queues_add')) { + if (permission_exists('call_center_queue_add')) { echo " $v_link_label_add\n"; } echo "\n"; @@ -156,10 +156,10 @@ require_once "resources/paging.php"; //echo " ".$row[queue_tier_rule_wait_multiply_level]." \n"; echo " ".$row[queue_description]." \n"; echo " \n"; - if (permission_exists('call_center_queues_edit')) { + if (permission_exists('call_center_queue_edit')) { echo " $v_link_label_edit\n"; } - if (permission_exists('call_center_queues_delete')) { + if (permission_exists('call_center_queue_delete')) { echo " $v_link_label_delete\n"; } echo " \n"; @@ -176,7 +176,7 @@ require_once "resources/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('call_center_queues_add')) { + if (permission_exists('call_center_queue_add')) { echo " $v_link_label_add\n"; } echo " \n"; diff --git a/app/call_center/call_center_tier_delete.php b/app/call_center/call_center_tier_delete.php index 2bb15362b6..35081939a5 100644 --- a/app/call_center/call_center_tier_delete.php +++ b/app/call_center/call_center_tier_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_tiers_delete')) { +if (permission_exists('call_center_tier_delete')) { //access granted } else { diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php index 90145921b9..4a2578a028 100644 --- a/app/call_center/call_center_tier_edit.php +++ b/app/call_center/call_center_tier_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_tiers_add') || permission_exists('call_center_tiers_edit')) { +if (permission_exists('call_center_tier_add') || permission_exists('call_center_tier_edit')) { //access granted } else { diff --git a/app/call_center/call_center_tiers.php b/app/call_center/call_center_tiers.php index c419e750f7..d88cccee70 100644 --- a/app/call_center/call_center_tiers.php +++ b/app/call_center/call_center_tiers.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_tiers_view')) { +if (permission_exists('call_center_tier_view')) { //access granted } else { @@ -120,7 +120,7 @@ require_once "resources/paging.php"; echo th_order_by('tier_level', $text['label-tier_level'], $order_by, $order); echo th_order_by('tier_position', $text['label-tier_position'], $order_by, $order); echo "\n"; - if (permission_exists('call_center_tiers_add')) { + if (permission_exists('call_center_tier_add')) { echo " $v_link_label_add\n"; } echo "\n"; @@ -136,10 +136,10 @@ require_once "resources/paging.php"; echo " ".$row[tier_level]." \n"; echo " ".$row[tier_position]." \n"; echo " \n"; - if (permission_exists('call_center_tiers_edit')) { + if (permission_exists('call_center_tier_edit')) { echo " $v_link_label_edit\n"; } - if (permission_exists('call_center_tiers_delete')) { + if (permission_exists('call_center_tier_delete')) { echo " $v_link_label_delete\n"; } echo " \n"; @@ -157,7 +157,7 @@ require_once "resources/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('call_center_tiers_add')) { + if (permission_exists('call_center_tier_add')) { echo " $v_link_label_add\n"; } echo " \n"; diff --git a/app/call_center/cmd.php b/app/call_center/cmd.php index 4b92aeed1f..094aae48d2 100644 --- a/app/call_center/cmd.php +++ b/app/call_center/cmd.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('call_center_queues_add') || permission_exists('call_center_queues_edit')) { +if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_edit')) { //access granted } else { diff --git a/app/calls_active/app_config.php b/app/calls_active/app_config.php index c637256b06..afa22a449b 100644 --- a/app/calls_active/app_config.php +++ b/app/calls_active/app_config.php @@ -54,51 +54,51 @@ $apps[$x]['menu'][1]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'calls_active_view'; + $apps[$x]['permissions'][0]['name'] = 'call_active_view'; $apps[$x]['permissions'][0]['menu']['uuid'] = 'eba3d07f-dd5c-6b7b-6880-493b44113ade'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'calls_active_transfer'; + $apps[$x]['permissions'][1]['name'] = 'call_active_transfer'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'calls_active_hangup'; + $apps[$x]['permissions'][2]['name'] = 'call_active_hangup'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'calls_active_park'; + $apps[$x]['permissions'][3]['name'] = 'call_active_park'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][4]['name'] = 'calls_active_rec'; + $apps[$x]['permissions'][4]['name'] = 'call_active_rec'; $apps[$x]['permissions'][4]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][5]['name'] = 'extensions_active_view'; + $apps[$x]['permissions'][5]['name'] = 'extension_active_view'; $apps[$x]['permissions'][0]['menu']['uuid'] = '6dd85c19-cb6b-5cca-bf32-499bbe936f79'; //$apps[$x]['permissions'][5]['groups'][] = 'user'; $apps[$x]['permissions'][5]['groups'][] = 'admin'; $apps[$x]['permissions'][5]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][6]['name'] = 'extensions_active_transfer'; + $apps[$x]['permissions'][6]['name'] = 'extension_active_transfer'; $apps[$x]['permissions'][6]['groups'][] = 'admin'; $apps[$x]['permissions'][6]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][7]['name'] = 'extensions_active_hangup'; + $apps[$x]['permissions'][7]['name'] = 'extension_active_hangup'; $apps[$x]['permissions'][7]['groups'][] = 'admin'; $apps[$x]['permissions'][7]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][8]['name'] = 'extensions_active_park'; + $apps[$x]['permissions'][8]['name'] = 'extension_active_park'; $apps[$x]['permissions'][8]['groups'][] = 'admin'; $apps[$x]['permissions'][8]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][9]['name'] = 'extensions_active_rec'; + $apps[$x]['permissions'][9]['name'] = 'extension_active_rec'; $apps[$x]['permissions'][9]['groups'][] = 'admin'; $apps[$x]['permissions'][9]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][10]['name'] = 'extensions_active_list_view'; + $apps[$x]['permissions'][10]['name'] = 'extension_active_list_view'; $apps[$x]['permissions'][10]['menu']['uuid'] = ''; //$apps[$x]['permissions'][10]['groups'][] = 'user'; $apps[$x]['permissions'][10]['groups'][] = 'admin'; $apps[$x]['permissions'][10]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][11]['name'] = 'extensions_active_assigned_view'; + $apps[$x]['permissions'][11]['name'] = 'extension_active_assigned_view'; $apps[$x]['permissions'][11]['menu']['uuid'] = ''; //$apps[$x]['permissions'][11]['groups'][] = 'user'; $apps[$x]['permissions'][11]['groups'][] = 'admin'; diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php index d51ca04d98..b0411b0caf 100644 --- a/app/calls_active/calls_active.php +++ b/app/calls_active/calls_active.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; -if (permission_exists('calls_active_view')) { +if (permission_exists('call_active_view')) { //access granted } else { diff --git a/app/calls_active/calls_active_assigned_extensions_inc.php b/app/calls_active/calls_active_assigned_extensions_inc.php index c5cc32198c..c3f76e4696 100644 --- a/app/calls_active/calls_active_assigned_extensions_inc.php +++ b/app/calls_active/calls_active_assigned_extensions_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; -if (permission_exists('extensions_active_assigned_view')) { +if (permission_exists('extension_active_assigned_view')) { //add multi-lingual support foreach($text as $key => $value) { diff --git a/app/calls_active/calls_active_extensions.php b/app/calls_active/calls_active_extensions.php index addb4a797d..845ba98990 100644 --- a/app/calls_active/calls_active_extensions.php +++ b/app/calls_active/calls_active_extensions.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; -if (permission_exists('extensions_active_view')) { +if (permission_exists('extension_active_view')) { //access granted } else { diff --git a/app/calls_active/calls_active_extensions_inc.php b/app/calls_active/calls_active_extensions_inc.php index 8be049451b..863d10d72f 100644 --- a/app/calls_active/calls_active_extensions_inc.php +++ b/app/calls_active/calls_active_extensions_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; -if (permission_exists('extensions_active_view')) { +if (permission_exists('extension_active_view')) { //access granted } else { @@ -320,7 +320,7 @@ else { include "calls_active_assigned_extensions_inc.php"; //list all extensions - if (permission_exists('extensions_active_list_view')) { + if (permission_exists('extension_active_list_view')) { echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo " \n"; diff --git a/app/conferences_active/app_config.php b/app/conferences_active/app_config.php index bd2cf44ace..efe658fb33 100644 --- a/app/conferences_active/app_config.php +++ b/app/conferences_active/app_config.php @@ -38,38 +38,38 @@ $apps[$x]['menu'][0]['groups'][] = 'user'; //permission details - $apps[$x]['permissions'][0]['name'] = 'conferences_active_view'; + $apps[$x]['permissions'][0]['name'] = 'conference_active_view'; $apps[$x]['permissions'][0]['menu']['uuid'] = '2d857bbb-43b9-b8f7-a138-642868e0453a'; $apps[$x]['permissions'][0]['groups'][] = 'user'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'conferences_active_lock'; + $apps[$x]['permissions'][2]['name'] = 'conference_active_lock'; $apps[$x]['permissions'][2]['groups'][] = 'user'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'conferences_active_kick'; + $apps[$x]['permissions'][3]['name'] = 'conference_active_kick'; $apps[$x]['permissions'][3]['groups'][] = 'user'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][4]['name'] = 'conferences_active_energy'; + $apps[$x]['permissions'][4]['name'] = 'conference_active_energy'; //$apps[$x]['permissions'][4]['groups'][] = 'user'; //$apps[$x]['permissions'][4]['groups'][] = 'admin'; //$apps[$x]['permissions'][4]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][5]['name'] = 'conferences_active_volume'; + $apps[$x]['permissions'][5]['name'] = 'conference_active_volume'; //$apps[$x]['permissions'][5]['groups'][] = 'user'; //$apps[$x]['permissions'][5]['groups'][] = 'admin'; //$apps[$x]['permissions'][5]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][6]['name'] = 'conferences_active_gain'; + $apps[$x]['permissions'][6]['name'] = 'conference_active_gain'; //$apps[$x]['permissions'][6]['groups'][] = 'user'; //$apps[$x]['permissions'][6]['groups'][] = 'admin'; //$apps[$x]['permissions'][6]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][7]['name'] = 'conferences_active_mute'; + $apps[$x]['permissions'][7]['name'] = 'conference_active_mute'; $apps[$x]['permissions'][7]['groups'][] = 'user'; $apps[$x]['permissions'][7]['groups'][] = 'admin'; $apps[$x]['permissions'][7]['groups'][] = 'superadmin'; @@ -79,12 +79,12 @@ $apps[$x]['permissions'][8]['groups'][] = 'admin'; $apps[$x]['permissions'][8]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][8]['name'] = 'conferences_active_video'; + $apps[$x]['permissions'][8]['name'] = 'conference_active_video'; $apps[$x]['permissions'][8]['groups'][] = 'user'; $apps[$x]['permissions'][8]['groups'][] = 'admin'; $apps[$x]['permissions'][8]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][9]['name'] = 'conferences_active_advanced_view'; + $apps[$x]['permissions'][9]['name'] = 'conference_active_advanced_view'; $apps[$x]['permissions'][9]['groups'][] = 'admin'; $apps[$x]['permissions'][9]['groups'][] = 'superadmin'; ?> \ No newline at end of file diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php index 937a992a13..f21af3adbb 100644 --- a/app/conferences_active/conference_exec.php +++ b/app/conferences_active/conference_exec.php @@ -41,7 +41,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conferences_active_view')) { +if (permission_exists('conference_active_view')) { //access granted } else { diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php index 17896f314d..67d5fa2a75 100644 --- a/app/conferences_active/conference_interactive.php +++ b/app/conferences_active/conference_interactive.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conferences_active_view')) { +if (permission_exists('conference_active_view')) { //access granted } else { diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index dfe709a818..e897a843b1 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conferences_active_view')) { +if (permission_exists('conference_active_view')) { //access granted } else { @@ -127,7 +127,7 @@ else { else { echo " ".$text['label-not-recording']."  "; } - if (permission_exists('conferences_active_lock')) { + if (permission_exists('conference_active_lock')) { if ($locked == "true") { echo " \n"; } @@ -159,7 +159,7 @@ else { echo "\n"; echo "\n"; echo "\n"; - if (permission_exists('conferences_active_video')) { + if (permission_exists('conference_active_video')) { echo "\n"; } echo "\n"; @@ -219,7 +219,7 @@ else { echo "\n"; } echo "\n"; - if (permission_exists('conferences_active_video')) { + if (permission_exists('conference_active_video')) { if ($flag_has_video == "true") { echo "\n"; } @@ -235,27 +235,27 @@ else { } echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo " \n"; - if (permission_exists('contacts_add')) { + if (permission_exists('contact_add')) { echo " \n"; @@ -199,7 +199,7 @@ require_once "resources/paging.php"; //echo th_order_by('contact_time_zone', $text['label-contact_time_zone'], $order_by, $order); //echo th_order_by('contact_note', $text['label-contact_note'], $order_by, $order); echo "\n"; echo "\n"; @@ -219,8 +219,8 @@ require_once "resources/paging.php"; //echo " \n"; //echo " \n"; echo " \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } @@ -235,7 +235,7 @@ require_once "resources/paging.php"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php index bd78231dfb..55c3ede752 100644 --- a/app/calls_active/calls_active_inc.php +++ b/app/calls_active/calls_active_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; -if (permission_exists('calls_active_view')) { +if (permission_exists('call_active_view')) { //access granted } else { diff --git a/app/calls_active/calls_exec.php b/app/calls_active/calls_exec.php index 7f2b050b7f..ff1c5e3129 100644 --- a/app/calls_active/calls_exec.php +++ b/app/calls_active/calls_exec.php @@ -29,7 +29,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('calls_active_view') || permission_exists('extensions_active_view')) { +if (permission_exists('call_active_view') || permission_exists('extension_active_view')) { //access granted } else { diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index b7a93a72b8..2b76b3df9e 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -325,7 +325,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
".$text['title-conference-center']."\n"; - if (permission_exists('conferences_active_advanced_view')) { + if (permission_exists('conference_active_advanced_view')) { echo " \n"; } echo " \n"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index d132f76776..c94dccc8a3 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -65,7 +65,7 @@ else { echo "
".$text['title-conference-centers']."\n"; - if (permission_exists('conferences_active_advanced_view')) { + if (permission_exists('conference_active_advanced_view')) { echo " \n"; } echo " \n"; diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php index b81df4c4ee..b854b92065 100644 --- a/app/conference_centers/conference_session_details.php +++ b/app/conference_centers/conference_session_details.php @@ -95,7 +95,7 @@ else { } if (strlen($tmp_name) > 0 && file_exists($tmp_dir.'/'.$tmp_name)) { if (permission_exists('conference_session_play')) { - echo " \n"; + echo " \n"; //echo " ".$text['label-play']."\n"; echo " \n"; //echo " \n"; @@ -105,7 +105,7 @@ else { //echo " ".$text['label-download']."\n"; echo " \n"; //echo " \n"; - //echo " \n"; + //echo " \n"; echo "  \n"; } echo " \n"; diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php index f0ffa1b141..37930a3620 100644 --- a/app/conference_centers/conference_sessions.php +++ b/app/conference_centers/conference_sessions.php @@ -165,7 +165,7 @@ else { echo " ".$text['label-details']." \n"; if (strlen($tmp_name) > 0 && file_exists($tmp_dir.'/'.$tmp_name)) { if (permission_exists('conference_session_play')) { - echo " \n"; + echo " \n"; echo " ".$text['label-play']."\n"; echo " \n"; echo "  \n"; diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index 7b912f1539..399540218b 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -62,7 +62,7 @@ require_once "resources/paging.php"; echo "
\n"; echo " ".$text['description']." \n"; - if (permission_exists('conferences_active_advanced_view')) { + if (permission_exists('conference_active_advanced_view')) { echo " Show ".$text['title-2']." ".$text['description-2']."

\n"; } echo " 		".$text['label-speak']."".$text['label-talking']."".$text['label-last-talk']."".$text['label-video']."".$text['label-floor']."".$text['label-no']."$last_talking_formatted".$text['label-yes']."\n"; //energy - if (permission_exists('conferences_active_energy')) { + if (permission_exists('conference_active_energy')) { echo " \n"; echo " \n"; //echo " +".$text['label-energy']." \n"; //echo " -".$text['label-energy']." \n"; } //volume - if (permission_exists('conferences_active_volume')) { + if (permission_exists('conference_active_volume')) { echo " \n"; echo " \n"; //echo " +".$text['label-volume']." \n"; //echo " -".$text['label-volume']." \n"; } - if (permission_exists('conferences_active_gain')) { + if (permission_exists('conference_active_gain')) { echo " \n"; echo " \n"; //echo " +".$text['label-gain']." \n"; //echo " -".$text['label-gain']." \n"; } //mute and unmute - if (permission_exists('conferences_active_mute')) { + if (permission_exists('conference_active_mute')) { if ($flag_can_speak == "true") { echo " \n"; //echo " ".$text['label-mute']." \n"; @@ -277,7 +277,7 @@ else { } } //kick someone from the conference - if (permission_exists('conferences_active_kick')) { + if (permission_exists('conference_active_kick')) { echo " \n"; //echo " ".$text['label-kick']." \n"; } diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php index c7b4efe4df..efe9e86557 100644 --- a/app/conferences_active/conferences_active.php +++ b/app/conferences_active/conferences_active.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conferences_active_advanced_view')) { +if (permission_exists('conference_active_advanced_view')) { //access granted } else { diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index 3425454fb1..ed8151f346 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conferences_active_advanced_view')) { +if (permission_exists('conference_active_advanced_view')) { //access granted } else { diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php index 8ff28354d0..5221d2a9d0 100644 --- a/app/contacts/app_config.php +++ b/app/contacts/app_config.php @@ -38,22 +38,22 @@ $apps[$x]['menu'][$y]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'contacts_view'; + $apps[$x]['permissions'][0]['name'] = 'contact_view'; $apps[$x]['permissions'][0]['menu']['uuid'] = 'f14e6ab6-6565-d4e6-cbad-a51d2e3e8ec6'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; //$apps[$x]['permissions'][0]['groups'][] = 'user'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; - $apps[$x]['permissions'][1]['name'] = 'contacts_add'; + $apps[$x]['permissions'][1]['name'] = 'contact_add'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; - $apps[$x]['permissions'][2]['name'] = 'contacts_edit'; + $apps[$x]['permissions'][2]['name'] = 'contact_edit'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; //$apps[$x]['permissions'][2]['groups'][] = 'user'; - $apps[$x]['permissions'][3]['name'] = 'contacts_delete'; + $apps[$x]['permissions'][3]['name'] = 'contact_delete'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; diff --git a/app/contacts/contact_addresses.php b/app/contacts/contact_addresses.php index 46ef1b8c41..b78953d7ac 100644 --- a/app/contacts/contact_addresses.php +++ b/app/contacts/contact_addresses.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_view')) { +if (permission_exists('contact_view')) { //access granted } else { diff --git a/app/contacts/contact_addresses_delete.php b/app/contacts/contact_addresses_delete.php index c748a02430..346d2ed104 100644 --- a/app/contacts/contact_addresses_delete.php +++ b/app/contacts/contact_addresses_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_delete')) { +if (permission_exists('contact_delete')) { //access granted } else { @@ -57,7 +57,7 @@ if (strlen($id)>0) { } require_once "resources/header.php"; -echo "\n"; +echo "\n"; echo "
\n"; echo $text['message-delete']."\n"; echo "
\n"; diff --git a/app/contacts/contact_addresses_edit.php b/app/contacts/contact_addresses_edit.php index a8e598b30b..f9cc615521 100644 --- a/app/contacts/contact_addresses_edit.php +++ b/app/contacts/contact_addresses_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_edit')) { +if (permission_exists('contact_edit')) { //access granted } else { @@ -140,7 +140,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo $text['message-add']."\n"; echo "
\n"; @@ -168,7 +168,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo $text['message-update']."\n"; echo "
\n"; @@ -232,7 +232,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['header-contact_addresses-add']; } echo "
\n"; diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index f2b3b14dd5..3d1a6657ea 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_add')) { +if (permission_exists('contact_add')) { //access granted } else { @@ -62,7 +62,7 @@ else { $enclosure = check_str($_GET["data_enclosure"]); //upload the contact csv - if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('recordings_upload')) { + if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('recording_upload')) { //copy the csv file if (check_str($_POST['type']) == 'csv') { move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']); diff --git a/app/contacts/contact_notes.php b/app/contacts/contact_notes.php index eb99733f5f..f00a101459 100644 --- a/app/contacts/contact_notes.php +++ b/app/contacts/contact_notes.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_view')) { +if (permission_exists('contact_view')) { //access granted } else { diff --git a/app/contacts/contact_notes_delete.php b/app/contacts/contact_notes_delete.php index 2a6b5416bb..2d3aba426e 100644 --- a/app/contacts/contact_notes_delete.php +++ b/app/contacts/contact_notes_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_delete')) { +if (permission_exists('contact_delete')) { //access granted } else { @@ -56,7 +56,7 @@ if (strlen($id)>0) { } require_once "resources/header.php"; -echo "\n"; +echo "\n"; echo "
\n"; echo $text['message-delete']."\n"; echo "
\n"; diff --git a/app/contacts/contact_notes_edit.php b/app/contacts/contact_notes_edit.php index d5a3aaf792..bb166ea14f 100644 --- a/app/contacts/contact_notes_edit.php +++ b/app/contacts/contact_notes_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_edit')) { +if (permission_exists('contact_edit')) { //access granted } else { @@ -111,7 +111,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo $text['message-add']."\n"; echo "
\n"; @@ -131,7 +131,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo $text['message-update']."\n"; echo "
\n"; @@ -187,7 +187,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "		".$text['header-contact_notes-edit']."
\n"; diff --git a/app/contacts/contact_phones.php b/app/contacts/contact_phones.php index cd75a80b6c..a783487d84 100644 --- a/app/contacts/contact_phones.php +++ b/app/contacts/contact_phones.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_view')) { +if (permission_exists('contact_view')) { //access granted } else { diff --git a/app/contacts/contact_phones_delete.php b/app/contacts/contact_phones_delete.php index 36f440fc9a..51774cb586 100644 --- a/app/contacts/contact_phones_delete.php +++ b/app/contacts/contact_phones_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_delete')) { +if (permission_exists('contact_delete')) { //access granted } else { @@ -56,7 +56,7 @@ if (strlen($id)>0) { } require_once "resources/header.php"; -echo "\n"; +echo "\n"; echo "
\n"; echo $text['message-delete']."\n"; echo "
\n"; diff --git a/app/contacts/contact_phones_edit.php b/app/contacts/contact_phones_edit.php index eaa86f4bd7..defe6129ce 100644 --- a/app/contacts/contact_phones_edit.php +++ b/app/contacts/contact_phones_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_edit')) { +if (permission_exists('contact_edit')) { //access granted } else { @@ -115,7 +115,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo $text['message-add']."\n"; echo "
\n"; @@ -136,7 +136,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo $text['message-update']."\n"; echo "
\n"; @@ -192,7 +192,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['header-contact_phones-add']; } echo "
\n"; diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index 18d3b3c6ab..1e308f33e9 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_view')) { +if (permission_exists('contact_view')) { //access granted } else { @@ -72,7 +72,7 @@ require_once "resources/paging.php"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo "
".$row['contact_time_zone']." ".$row['contact_note']." \n"; - echo " $v_link_label_edit\n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_edit\n"; + echo " $v_link_label_delete\n"; echo "
 $paging_controls\n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo "
\n"; diff --git a/app/contacts/contacts_delete.php b/app/contacts/contacts_delete.php index 9e2286f11e..2fc5bac374 100644 --- a/app/contacts/contacts_delete.php +++ b/app/contacts/contacts_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_delete')) { +if (permission_exists('contact_delete')) { //access granted } else { diff --git a/app/contacts/contacts_edit.php b/app/contacts/contacts_edit.php index c4585c9407..c8e64ccf82 100644 --- a/app/contacts/contacts_edit.php +++ b/app/contacts/contacts_edit.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_edit')) { +if (permission_exists('contact_edit')) { //access granted } else { diff --git a/app/contacts/contacts_vcard.php b/app/contacts/contacts_vcard.php index 779e5bac4b..c8bd3ef289 100644 --- a/app/contacts/contacts_vcard.php +++ b/app/contacts/contacts_vcard.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('contacts_view')) { +if (permission_exists('contact_view')) { //access granted } else { diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php index e54a20b972..4e71ea35ee 100644 --- a/app/dialplan/dialplan_copy.php +++ b/app/dialplan/dialplan_copy.php @@ -31,7 +31,7 @@ if (permission_exists('dialplan_add') || permission_exists('inbound_route_add') || permission_exists('outbound_route_add') || permission_exists('fifo_add') - || permission_exists('time_conditions_add')) { + || permission_exists('time_condition_add')) { //access granted } else { diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php index a9e085e8b8..48f4dc9f96 100644 --- a/app/dialplan/dialplan_delete.php +++ b/app/dialplan/dialplan_delete.php @@ -30,7 +30,7 @@ if (permission_exists('dialplan_delete') || permission_exists('inbound_route_delete') || permission_exists('outbound_route_delete') || permission_exists('fifo_delete') - || permission_exists('time_conditions_delete')) { + || permission_exists('time_condition_delete')) { //access granted } else { diff --git a/app/dialplan/dialplan_details_delete.php b/app/dialplan/dialplan_details_delete.php index 46d6082eca..2de3b918e0 100644 --- a/app/dialplan/dialplan_details_delete.php +++ b/app/dialplan/dialplan_details_delete.php @@ -30,7 +30,7 @@ if (permission_exists('dialplan_delete') || permission_exists('inbound_route_delete') || permission_exists('outbound_route_delete') || permission_exists('fifo_delete') - || permission_exists('time_conditions_delete')) { + || permission_exists('time_condition_delete')) { //access granted } else { diff --git a/app/dialplan/dialplan_details_edit.php b/app/dialplan/dialplan_details_edit.php index 2a28e399ff..1e2cf23afa 100644 --- a/app/dialplan/dialplan_details_edit.php +++ b/app/dialplan/dialplan_details_edit.php @@ -34,8 +34,8 @@ if (permission_exists('dialplan_add') || permission_exists('outbound_route_edit') || permission_exists('fifo_edit') || permission_exists('fifo_add') - || permission_exists('time_conditions_add') - || permission_exists('time_conditions_edit')) { + || permission_exists('time_condition_add') + || permission_exists('time_condition_edit')) { //access granted } else { diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php index 171e45791d..3849cbc7d4 100644 --- a/app/dialplan/dialplan_edit.php +++ b/app/dialplan/dialplan_edit.php @@ -35,8 +35,8 @@ if (permission_exists('dialplan_add') || permission_exists('outbound_route_edit') || permission_exists('fifo_edit') || permission_exists('fifo_add') - || permission_exists('time_conditions_add') - || permission_exists('time_conditions_edit')) { + || permission_exists('time_condition_add') + || permission_exists('time_condition_edit')) { //access granted } else { diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php index 99f60cd74d..4a92d2f4f2 100644 --- a/app/dialplan/dialplans.php +++ b/app/dialplan/dialplans.php @@ -213,7 +213,7 @@ else { } } elseif ($app_uuid == "4b821450-926b-175a-af93-a03c441818b1") { - if (permission_exists('time_conditions_add')) { + if (permission_exists('time_condition_add')) { echo " $v_link_label_add\n"; } } @@ -285,10 +285,10 @@ else { } } elseif ($app_uuid == "4b821450-926b-175a-af93-a03c441818b1") { - if (permission_exists('time_conditions_edit')) { + if (permission_exists('time_condition_edit')) { echo " $v_link_label_edit\n"; } - if (permission_exists('time_conditions_delete')) { + if (permission_exists('time_condition_delete')) { echo " $v_link_label_delete\n"; } } @@ -331,7 +331,7 @@ else { } } elseif ($app_uuid == "4b821450-926b-175a-af93-a03c441818b1") { - if (permission_exists('time_conditions_add')) { + if (permission_exists('time_condition_add')) { echo " $v_link_label_add\n"; } } diff --git a/app/fifo_list/app_config.php b/app/fifo_list/app_config.php index e59f18c694..8ce6ca3e13 100644 --- a/app/fifo_list/app_config.php +++ b/app/fifo_list/app_config.php @@ -37,19 +37,19 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'active_queues_view'; + $apps[$x]['permissions'][0]['name'] = 'active_queue_view'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'active_queues_add'; + $apps[$x]['permissions'][1]['name'] = 'active_queue_add'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'active_queues_edit'; + $apps[$x]['permissions'][2]['name'] = 'active_queue_edit'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'active_queues_delete'; + $apps[$x]['permissions'][3]['name'] = 'active_queue_delete'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; ?> \ No newline at end of file diff --git a/app/fifo_list/fifo_exec.php b/app/fifo_list/fifo_exec.php index 4e0df454a4..9e17f2d46f 100644 --- a/app/fifo_list/fifo_exec.php +++ b/app/fifo_list/fifo_exec.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('active_queues_edit')) { +if (permission_exists('active_queue_edit')) { //access granted } else { diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php index a3b41d50e2..9888296dc3 100644 --- a/app/fifo_list/fifo_interactive.php +++ b/app/fifo_list/fifo_interactive.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('active_queues_view')) { +if (permission_exists('active_queue_view')) { //access granted } else { diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php index ec89cde752..27f8ddbb63 100644 --- a/app/fifo_list/fifo_interactive_inc.php +++ b/app/fifo_list/fifo_interactive_inc.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('active_queues_view')) { +if (permission_exists('active_queue_view')) { //access granted } else { diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php index 0e5441b3be..1f25c13aa6 100644 --- a/app/fifo_list/fifo_list.php +++ b/app/fifo_list/fifo_list.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('active_queues_view')) { +if (permission_exists('active_queue_view')) { //access granted } else { diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php index 07d951ffe3..b6d3c8751e 100644 --- a/app/fifo_list/fifo_list_inc.php +++ b/app/fifo_list/fifo_list_inc.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('active_queues_view')) { +if (permission_exists('active_queue_view')) { //access granted } else { diff --git a/app/modules/app_config.php b/app/modules/app_config.php index a31d40b0a8..5822adb5a1 100644 --- a/app/modules/app_config.php +++ b/app/modules/app_config.php @@ -36,16 +36,16 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'modules_view'; + $apps[$x]['permissions'][0]['name'] = 'module_view'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'modules_add'; + $apps[$x]['permissions'][1]['name'] = 'module_add'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'modules_edit'; + $apps[$x]['permissions'][2]['name'] = 'module_edit'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'modules_delete'; + $apps[$x]['permissions'][3]['name'] = 'module_delete'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; //schema details diff --git a/app/modules/modules.php b/app/modules/modules.php index 2eab6a8039..9586e686be 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('modules_view')) { +if (permission_exists('module_view')) { //access granted } else { @@ -123,7 +123,7 @@ if (strlen($_GET["a"]) > 0) { $tmp_module_header .= "".$text['label-action']."\n"; $tmp_module_header .= "".$text['label-enabled']."\n"; $tmp_module_header .= "\n"; - $tmp_module_header .= " $v_link_label_add\n"; + $tmp_module_header .= " $v_link_label_add\n"; $tmp_module_header .= "\n"; $tmp_module_header .= "\n"; @@ -140,8 +140,8 @@ if (strlen($_GET["a"]) > 0) { echo "  \n"; echo "  \n"; echo " \n"; - if (permission_exists('modules_add')) { - echo " $v_link_label_add\n"; + if (permission_exists('module_add')) { + echo " $v_link_label_add\n"; } echo " \n"; echo " \n"; @@ -181,11 +181,11 @@ if (strlen($_GET["a"]) > 0) { } echo "\n"; echo " \n"; - if (permission_exists('modules_edit')) { - echo " $v_link_label_edit\n"; + if (permission_exists('module_edit')) { + echo " $v_link_label_edit\n"; } - if (permission_exists('modules_delete')) { - echo " $v_link_label_delete\n"; + if (permission_exists('module_delete')) { + echo " $v_link_label_delete\n"; } echo " \n"; echo "\n"; @@ -203,8 +203,8 @@ if (strlen($_GET["a"]) > 0) { echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('modules_add')) { - echo " $v_link_label_add\n"; + if (permission_exists('module_add')) { + echo " $v_link_label_add\n"; } echo " \n"; echo " \n"; diff --git a/app/modules/modules_delete.php b/app/modules/modules_delete.php index 21e664a2ee..a31a3ed385 100644 --- a/app/modules/modules_delete.php +++ b/app/modules/modules_delete.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('modules_delete')) { +if (permission_exists('module_delete')) { //access granted } else { diff --git a/app/modules/modules_edit.php b/app/modules/modules_edit.php index 3994e8af68..6f1ba7e983 100644 --- a/app/modules/modules_edit.php +++ b/app/modules/modules_edit.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('modules_add') || permission_exists('modules_edit')) { +if (permission_exists('module_add') || permission_exists('module_edit')) { //access granted } else { @@ -88,7 +88,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('modules_add')) { + if ($action == "add" && permission_exists('module_add')) { $module_uuid = uuid(); $sql = "insert into v_modules "; $sql .= "("; @@ -124,7 +124,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "add") - if ($action == "update" && permission_exists('modules_edit')) { + if ($action == "update" && permission_exists('module_edit')) { $sql = "update v_modules set "; $sql .= "module_label = '$module_label', "; $sql .= "module_name = '$module_name', "; diff --git a/app/recordings/app_config.php b/app/recordings/app_config.php index 6dd72e47f0..72b24c45a8 100644 --- a/app/recordings/app_config.php +++ b/app/recordings/app_config.php @@ -37,32 +37,32 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'recordings_view'; + $apps[$x]['permissions'][0]['name'] = 'recording_view'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'recordings_add'; + $apps[$x]['permissions'][1]['name'] = 'recording_add'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'recordings_edit'; + $apps[$x]['permissions'][2]['name'] = 'recording_edit'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'recordings_delete'; + $apps[$x]['permissions'][3]['name'] = 'recording_delete'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][4]['name'] = 'recordings_upload'; + $apps[$x]['permissions'][4]['name'] = 'recording_upload'; $apps[$x]['permissions'][4]['groups'][] = 'admin'; $apps[$x]['permissions'][4]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][5]['name'] = 'recordings_play'; + $apps[$x]['permissions'][5]['name'] = 'recording_play'; $apps[$x]['permissions'][5]['groups'][] = 'user'; $apps[$x]['permissions'][5]['groups'][] = 'admin'; $apps[$x]['permissions'][5]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][6]['name'] = 'recordings_download'; + $apps[$x]['permissions'][6]['name'] = 'recording_download'; $apps[$x]['permissions'][6]['groups'][] = 'user'; $apps[$x]['permissions'][6]['groups'][] = 'admin'; $apps[$x]['permissions'][6]['groups'][] = 'superadmin'; diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 5ad679794d..a594f01469 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('recordings_view')) { +if (permission_exists('recording_view')) { //access granted } else { @@ -50,7 +50,7 @@ require_once "resources/paging.php"; $order = $_GET["order"]; //download the recordings - if ($_GET['a'] == "download" && permission_exists('recordings_download')) { + if ($_GET['a'] == "download" && permission_exists('recording_download')) { session_cache_limiter('public'); if ($_GET['type'] = "rec") { if (file_exists($_SESSION['switch']['recordings']['dir'].'/'.base64_decode($_GET['filename']))) { @@ -82,8 +82,8 @@ require_once "resources/paging.php"; } //upload the recording - if (permission_exists('recordings_upload')) { - if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('recordings_upload')) { + if (permission_exists('recording_upload')) { + if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('recording_upload')) { if ($_POST['type'] == 'rec') { move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['switch']['recordings']['dir'].'/'.$_FILES['ulfile']['name']); $savemsg = $text['message-uploaded']." ".$_SESSION['switch']['recordings']['dir']."/". htmlentities($_FILES['ulfile']['name']); @@ -177,7 +177,7 @@ require_once "resources/paging.php"; echo $_SESSION['switch']['recordings']['dir']; } echo " \n"; - if (permission_exists('recordings_upload')) { + if (permission_exists('recording_upload')) { echo "
\n"; echo " \n"; echo " \n"; @@ -229,8 +229,8 @@ require_once "resources/paging.php"; echo "Size\n"; echo th_order_by('recording_description', $text['label-description'], $order_by, $order); echo "\n"; - if (permission_exists('recordings_add')) { - echo " $v_link_label_add\n"; + if (permission_exists('recording_add')) { + echo " $v_link_label_add\n"; } echo "\n"; echo "\n"; @@ -247,7 +247,7 @@ require_once "resources/paging.php"; echo " "; echo " \n"; echo " "; - echo " \n"; + echo " \n"; echo $row['recording_name']; echo " "; echo "\n"; @@ -256,11 +256,11 @@ require_once "resources/paging.php"; echo " \n"; echo " ".$row['recording_description']."\n"; echo " \n"; - if (permission_exists('recordings_edit')) { - echo " $v_link_label_edit\n"; + if (permission_exists('recording_edit')) { + echo " $v_link_label_edit\n"; } - if (permission_exists('recordings_delete')) { - echo " $v_link_label_delete\n"; + if (permission_exists('recording_delete')) { + echo " $v_link_label_delete\n"; } echo " \n"; echo "\n"; @@ -276,8 +276,8 @@ require_once "resources/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('recordings_add')) { - echo " $v_link_label_add\n"; + if (permission_exists('recording_add')) { + echo " $v_link_label_add\n"; } echo " \n"; echo " \n"; diff --git a/app/recordings/recordings_delete.php b/app/recordings/recordings_delete.php index 77f676c72d..2731193563 100644 --- a/app/recordings/recordings_delete.php +++ b/app/recordings/recordings_delete.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('recordings_delete')) { +if (permission_exists('recording_delete')) { //access granted } else { diff --git a/app/recordings/recordings_edit.php b/app/recordings/recordings_edit.php index 4840f5d28d..d57a3ae87e 100644 --- a/app/recordings/recordings_edit.php +++ b/app/recordings/recordings_edit.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('recordings_add') || permission_exists('recordings_edit')) { +if (permission_exists('recording_add') || permission_exists('recording_edit')) { //access granted } else { @@ -92,7 +92,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('recordings_add')) { + if ($action == "add" && permission_exists('recording_add')) { $recording_uuid = uuid(); $sql = "insert into v_recordings "; $sql .= "("; @@ -122,7 +122,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "add") - if ($action == "update" && permission_exists('recordings_edit')) { + if ($action == "update" && permission_exists('recording_edit')) { //get the original filename $sql = "select * from v_recordings "; $sql .= "where recording_uuid = '$recording_uuid' "; diff --git a/app/recordings/recordings_play.php b/app/recordings/recordings_play.php index e916dfd3f3..c57bc9bfca 100644 --- a/app/recordings/recordings_play.php +++ b/app/recordings/recordings_play.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('recordings_play')) { +if (permission_exists('recording_play')) { //access granted } else { diff --git a/app/services/app_config.php b/app/services/app_config.php index a47d493d39..d42630ab14 100644 --- a/app/services/app_config.php +++ b/app/services/app_config.php @@ -36,16 +36,16 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'services_view'; + $apps[$x]['permissions'][0]['name'] = 'service_view'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'services_add'; + $apps[$x]['permissions'][1]['name'] = 'service_add'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'services_edit'; + $apps[$x]['permissions'][2]['name'] = 'service_edit'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'services_delete'; + $apps[$x]['permissions'][3]['name'] = 'service_delete'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; //schema details diff --git a/app/services/service_delete.php b/app/services/service_delete.php index 7a52ad9a7c..6ca3731a1e 100644 --- a/app/services/service_delete.php +++ b/app/services/service_delete.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('services_delete')) { +if (permission_exists('service_delete')) { //access granted } else { diff --git a/app/services/service_edit.php b/app/services/service_edit.php index 44c14310e3..c279756da1 100644 --- a/app/services/service_edit.php +++ b/app/services/service_edit.php @@ -27,7 +27,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('services_add') || permission_exists('services_edit')) { +if (permission_exists('service_add') || permission_exists('service_edit')) { //access granted } else { @@ -90,7 +90,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('services_add')) { + if ($action == "add" && permission_exists('service_add')) { $service_uuid = uuid(); $sql = "insert into v_services "; $sql .= "("; @@ -126,7 +126,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "add") - if ($action == "update" && permission_exists('services_edit')) { + if ($action == "update" && permission_exists('service_edit')) { $sql = "update v_services set "; $sql .= "service_name = '$service_name', "; $sql .= "service_type = '$service_type', "; diff --git a/app/services/services.php b/app/services/services.php index f80f3e0f85..cfae5d2dc8 100644 --- a/app/services/services.php +++ b/app/services/services.php @@ -26,7 +26,7 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('services_view')) { +if (permission_exists('service_view')) { //access granted } else { @@ -141,7 +141,7 @@ if (strlen($_GET["a"]) > 0) { echo "Status\n"; echo "Action\n"; echo "\n"; - if (permission_exists('services_add')) { + if (permission_exists('service_add')) { echo " $v_link_label_add\n"; } echo "\n"; @@ -173,10 +173,10 @@ if (strlen($_GET["a"]) > 0) { } echo "\n"; echo " \n"; - if (permission_exists('services_edit')) { + if (permission_exists('service_edit')) { echo " $v_link_label_edit\n"; } - if (permission_exists('services_delete')) { + if (permission_exists('service_delete')) { echo " $v_link_label_delete\n"; } echo " \n"; @@ -193,7 +193,7 @@ if (strlen($_GET["a"]) > 0) { echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('services_add')) { + if (permission_exists('service_add')) { echo " $v_link_label_add\n"; } echo " \n"; diff --git a/app/settings/app_config.php b/app/settings/app_config.php index e4b4403bd3..6972f0c872 100644 --- a/app/settings/app_config.php +++ b/app/settings/app_config.php @@ -32,14 +32,14 @@ $apps[$x]['menu'][0]['uuid'] = '148ea42a-3711-3d64-181b-07a6a3c3ed60'; $apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788'; $apps[$x]['menu'][0]['category'] = 'internal'; - $apps[$x]['menu'][0]['path'] = '/app/settings/settings_edit.php'; + $apps[$x]['menu'][0]['path'] = '/app/settings/setting_edit.php'; $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'settings_view'; + $apps[$x]['permissions'][0]['name'] = 'setting_view'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'settings_edit'; + $apps[$x]['permissions'][1]['name'] = 'setting_edit'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; //schema details diff --git a/app/settings/settings_edit.php b/app/settings/settings_edit.php index a027c7d005..9a59ab11ec 100644 --- a/app/settings/settings_edit.php +++ b/app/settings/settings_edit.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('settings_view') || if_group("superadmin")) { +if (permission_exists('setting_view') || if_group("superadmin")) { //access granted } else { @@ -126,7 +126,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('settings_edit')) { + if ($action == "add" && permission_exists('setting_edit')) { $sql = "insert into v_settings "; $sql .= "("; $sql .= "event_socket_ip_address, "; @@ -158,7 +158,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { save_setting_xml(); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Add Complete\n"; echo "
\n"; @@ -166,7 +166,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "add") - if ($action == "update" && permission_exists('settings_edit')) { + if ($action == "update" && permission_exists('setting_edit')) { $sql = "update v_settings set "; $sql .= "event_socket_ip_address = '$event_socket_ip_address', "; $sql .= "event_socket_port = '$event_socket_port', "; @@ -184,7 +184,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { save_setting_xml(); require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Update Complete\n"; echo "
\n"; @@ -453,7 +453,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['description-shout-volume']."\n"; echo "\n"; echo "\n"; - if (permission_exists('settings_edit')) { + if (permission_exists('setting_edit')) { echo " \n"; echo " \n"; echo " \n"; diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php index 802490fc8d..61715e7275 100644 --- a/app/sip_profiles/sip_profile_copy.php +++ b/app/sip_profiles/sip_profile_copy.php @@ -30,7 +30,7 @@ require_once "resources/paging.php"; if (permission_exists('dialplan_add') || permission_exists('inbound_route_add') || permission_exists('outbound_route_add') - || permission_exists('time_conditions_add')) { + || permission_exists('time_condition_add')) { //access granted } else { diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php index 45c27c0d40..c8baa67f09 100644 --- a/app/sip_profiles/sip_profile_settings.php +++ b/app/sip_profiles/sip_profile_settings.php @@ -101,7 +101,7 @@ require_once "resources/paging.php"; echo th_order_by('sip_profile_setting_description', $text['label-setting_description'], $order_by, $order); echo "\n"; if (permission_exists('sip_profile_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } echo "\n"; echo "\n"; @@ -114,7 +114,7 @@ require_once "resources/paging.php"; echo " ".$row['sip_profile_setting_description']." \n"; echo " \n"; if (permission_exists('sip_profile_edit')) { - echo " $v_link_label_edit\n"; + echo " $v_link_label_edit\n"; } if (permission_exists('sip_profile_delete')) { echo " $v_link_label_delete\n"; @@ -134,7 +134,7 @@ require_once "resources/paging.php"; echo " $paging_controls\n"; echo " \n"; if (permission_exists('sip_profile_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } echo " \n"; echo " \n"; diff --git a/app/time_conditions/app_config.php b/app/time_conditions/app_config.php index ed62445f16..20d41dcb3f 100644 --- a/app/time_conditions/app_config.php +++ b/app/time_conditions/app_config.php @@ -37,19 +37,19 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'time_conditions_view'; + $apps[$x]['permissions'][0]['name'] = 'time_condition_view'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'time_conditions_add'; + $apps[$x]['permissions'][1]['name'] = 'time_condition_add'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'time_conditions_edit'; + $apps[$x]['permissions'][2]['name'] = 'time_condition_edit'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'time_conditions_delete'; + $apps[$x]['permissions'][3]['name'] = 'time_condition_delete'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; ?> \ No newline at end of file diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php index da29001b60..7eca0c7eb6 100644 --- a/app/time_conditions/time_condition_add.php +++ b/app/time_conditions/time_condition_add.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('time_conditions_add')) { +if (permission_exists('time_condition_add')) { //access granted } else { diff --git a/app/vars/app_config.php b/app/vars/app_config.php index 9b009b3933..50d6c490b5 100644 --- a/app/vars/app_config.php +++ b/app/vars/app_config.php @@ -36,16 +36,16 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'variables_view'; + $apps[$x]['permissions'][0]['name'] = 'variable_view'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'variables_add'; + $apps[$x]['permissions'][1]['name'] = 'variable_add'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'variables_edit'; + $apps[$x]['permissions'][2]['name'] = 'variable_edit'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'variables_delete'; + $apps[$x]['permissions'][3]['name'] = 'variable_delete'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; //schema details diff --git a/app/vars/var_delete.php b/app/vars/var_delete.php index 109950c14b..d49db3335c 100644 --- a/app/vars/var_delete.php +++ b/app/vars/var_delete.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('variables_delete')) { +if (permission_exists('variable_delete')) { //access granted } else { diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php index 5d7f3159bb..9c1877d72b 100644 --- a/app/vars/var_edit.php +++ b/app/vars/var_edit.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('variables_add') || permission_exists('variables_edit')) { +if (permission_exists('variable_add') || permission_exists('variable_edit')) { //access granted } else { @@ -91,7 +91,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('variables_add')) { + if ($action == "add" && permission_exists('variable_add')) { $var_uuid = uuid(); $sql = "insert into v_vars "; $sql .= "("; @@ -132,7 +132,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "add") - if ($action == "update" && permission_exists('variables_edit')) { + if ($action == "update" && permission_exists('variable_edit')) { $sql = "update v_vars set "; $sql .= "var_name = '$var_name', "; $sql .= "var_value = '$var_value', "; diff --git a/app/vars/vars.php b/app/vars/vars.php index 61768d1671..670c6b3d1c 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('variables_view')) { +if (permission_exists('variable_view')) { //access granted } else { @@ -90,7 +90,7 @@ else { $tmp_var_header .= th_order_by('var_enabled', $text['label-enabled'], $order_by, $order); $tmp_var_header .= "".$text['label-description']."\n"; $tmp_var_header .= "\n"; - if (permission_exists('variables_add')) { + if (permission_exists('variable_add')) { $tmp_var_header .= " $v_link_label_add\n"; } $tmp_var_header .= "\n"; @@ -111,7 +111,7 @@ else { echo "  \n"; echo "  \n"; echo " \n"; - if (permission_exists('variables_add')) { + if (permission_exists('variable_add')) { echo " $v_link_label_add\n"; } echo " \n"; @@ -142,10 +142,10 @@ else { $var_description = str_replace(" ", "       ", $var_description); echo " ".$var_description." \n"; echo " \n"; - if (permission_exists('variables_edit')) { + if (permission_exists('variable_edit')) { echo " $v_link_label_edit\n"; } - if (permission_exists('variables_delete')) { + if (permission_exists('variable_delete')) { echo " $v_link_label_delete\n"; } echo " \n"; @@ -164,7 +164,7 @@ else { echo "  \n"; echo " $paging_controls\n"; echo " \n"; - if (permission_exists('variables_add')) { + if (permission_exists('variable_add')) { echo " $v_link_label_add\n"; } echo " \n"; diff --git a/app/vars/vars_textarea.php b/app/vars/vars_textarea.php index be6d8f23f7..0ade043136 100644 --- a/app/vars/vars_textarea.php +++ b/app/vars/vars_textarea.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('variables_view')) { +if (permission_exists('variable_view')) { //access granted } else { @@ -45,7 +45,7 @@ else { $page["title"] = $text['title-variables_advanced']; //restore the default vars.xml -if ($_GET['a'] == "default" && permission_exists('variables_edit')) { +if ($_GET['a'] == "default" && permission_exists('variable_edit')) { //read default config file $fd = fopen($_SESSION['switch']['conf']['dir'].".orig/vars.xml", "r"); $v_content = fread($fd, filesize($_SESSION['switch']['conf']['dir'].".orig/vars.xml")); @@ -59,7 +59,7 @@ if ($_GET['a'] == "default" && permission_exists('variables_edit')) { } //save the vars.xml - if ($_POST['a'] == "save" && permission_exists('variables_edit')) { + if ($_POST['a'] == "save" && permission_exists('variable_edit')) { $v_content = str_replace("\r","",$_POST['code']); $fd = fopen($_SESSION['switch']['conf']['dir']."/vars.xml", "w"); fwrite($fd, $v_content); @@ -107,7 +107,7 @@ if ($_GET['a'] == "default" && permission_exists('variables_edit')) {

- + @@ -133,7 +133,7 @@ if ($_GET['a'] == "default" && permission_exists('variables_edit')) { "; } ?> diff --git a/app/voicemail_greetings/app_config.php b/app/voicemail_greetings/app_config.php index f42435cc8d..0483833179 100644 --- a/app/voicemail_greetings/app_config.php +++ b/app/voicemail_greetings/app_config.php @@ -28,37 +28,37 @@ //$apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'voicemail_greetings_view'; + $apps[$x]['permissions'][0]['name'] = 'voicemail_greeting_view'; $apps[$x]['permissions'][0]['groups'][] = 'user'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'voicemail_greetings_add'; + $apps[$x]['permissions'][1]['name'] = 'voicemail_greeting_add'; $apps[$x]['permissions'][1]['groups'][] = 'user'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][2]['name'] = 'voicemail_greetings_edit'; + $apps[$x]['permissions'][2]['name'] = 'voicemail_greeting_edit'; $apps[$x]['permissions'][2]['groups'][] = 'user'; $apps[$x]['permissions'][2]['groups'][] = 'admin'; $apps[$x]['permissions'][2]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][3]['name'] = 'voicemail_greetings_delete'; + $apps[$x]['permissions'][3]['name'] = 'voicemail_greeting_delete'; $apps[$x]['permissions'][3]['groups'][] = 'user'; $apps[$x]['permissions'][3]['groups'][] = 'admin'; $apps[$x]['permissions'][3]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][4]['name'] = 'voicemail_greetings_upload'; + $apps[$x]['permissions'][4]['name'] = 'voicemail_greeting_upload'; $apps[$x]['permissions'][4]['groups'][] = 'user'; $apps[$x]['permissions'][4]['groups'][] = 'admin'; $apps[$x]['permissions'][4]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][5]['name'] = 'voicemail_greetings_play'; + $apps[$x]['permissions'][5]['name'] = 'voicemail_greeting_play'; $apps[$x]['permissions'][5]['groups'][] = 'user'; $apps[$x]['permissions'][5]['groups'][] = 'admin'; $apps[$x]['permissions'][5]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][6]['name'] = 'voicemail_greetings_download'; + $apps[$x]['permissions'][6]['name'] = 'voicemail_greeting_download'; $apps[$x]['permissions'][6]['groups'][] = 'user'; $apps[$x]['permissions'][6]['groups'][] = 'admin'; $apps[$x]['permissions'][6]['groups'][] = 'superadmin'; diff --git a/app/voicemail_greetings/voicemail_greeting_delete.php b/app/voicemail_greetings/voicemail_greeting_delete.php index 6900f82343..bf5e1dcecf 100644 --- a/app/voicemail_greetings/voicemail_greeting_delete.php +++ b/app/voicemail_greetings/voicemail_greeting_delete.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('voicemail_greetings_delete')) { +if (permission_exists('voicemail_greeting_delete')) { //access granted } else { diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php index c13290a6a5..b5b6ce4fcc 100644 --- a/app/voicemail_greetings/voicemail_greeting_edit.php +++ b/app/voicemail_greetings/voicemail_greeting_edit.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('voicemail_greetings_add') || permission_exists('voicemail_greetings_edit')) { +if (permission_exists('voicemail_greeting_add') || permission_exists('voicemail_greeting_edit')) { //access granted } else { @@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('voicemail_greetings_add')) { + if ($action == "add" && permission_exists('voicemail_greeting_add')) { $voicemail_greeting_uuid = uuid(); $sql = "insert into v_voicemail_greetings "; $sql .= "("; @@ -114,7 +114,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "add") - if ($action == "update" && permission_exists('voicemail_greetings_edit')) { + if ($action == "update" && permission_exists('voicemail_greeting_edit')) { //get the original filename $sql = "select * from v_voicemail_greetings "; $sql .= "where voicemail_greeting_uuid = '$voicemail_greeting_uuid' "; diff --git a/app/voicemail_greetings/voicemail_greeting_play.php b/app/voicemail_greetings/voicemail_greeting_play.php index 4e71c92c3f..343a6e5002 100644 --- a/app/voicemail_greetings/voicemail_greeting_play.php +++ b/app/voicemail_greetings/voicemail_greeting_play.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('voicemail_greetings_play')) { +if (permission_exists('voicemail_greeting_play')) { //access granted } else { diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 2b634ccd0f..df2b336de7 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -26,7 +26,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('voicemail_greetings_view')) { +if (permission_exists('voicemail_greeting_view')) { //access granted } else { @@ -78,7 +78,7 @@ else { $v_greeting_dir = $_SESSION['switch']['storage']['dir'].'/voicemail/default/'.$_SESSION['domains'][$domain_uuid]['domain_name'].'/'.$voicemail_id; //upload the recording - if (($_POST['submit'] == "Save") && is_uploaded_file($_FILES['file']['tmp_name']) && permission_exists('recordings_upload')) { + if (($_POST['submit'] == "Save") && is_uploaded_file($_FILES['file']['tmp_name']) && permission_exists('recording_upload')) { if ($_POST['type'] == 'rec') { for($i = 1; $i < 10; $i++){ $tmp_greeting = 'greeting_'.$i.'.wav'; @@ -111,7 +111,7 @@ else { } //download the voicemail greeting - if ($_GET['a'] == "download") { // && permission_exists('voicemail_greetings_download')) { + if ($_GET['a'] == "download") { // && permission_exists('voicemail_greeting_download')) { session_cache_limiter('public'); if ($_GET['type'] = "rec") { if (file_exists($v_greeting_dir.'/'.base64_decode($_GET['filename']))) { @@ -302,8 +302,8 @@ else { echo "".$text['table-size']."\n"; echo th_order_by('greeting_description', $text['table-description'], $order_by, $order); echo "\n"; - //if (permission_exists('voicemail_greetings_add')) { - // echo " $v_link_label_add\n"; + //if (permission_exists('voicemail_greeting_add')) { + // echo " $v_link_label_add\n"; //} echo "\n"; echo "\n"; @@ -331,7 +331,7 @@ else { echo " download"; echo " "; //echo "  \n"; - //echo " \n"; + //echo " \n"; //echo " play"; //echo " "; echo "\n"; @@ -343,10 +343,10 @@ else { echo " ".$row['greeting_description']." \n"; echo " \n"; - //if (permission_exists('voicemail_greetings_edit')) { + //if (permission_exists('voicemail_greeting_edit')) { // echo " $v_link_label_edit\n"; //} - if (permission_exists('voicemail_greetings_delete')) { + if (permission_exists('voicemail_greeting_delete')) { echo " $v_link_label_delete\n"; } echo " \n"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 1a71d357d9..8e3d4b11f4 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -402,7 +402,7 @@ else { echo " "; if (strlen($tmp_name) > 0 && file_exists($_SESSION['switch']['recordings']['dir'].'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name)) { - echo " \n"; + echo " \n"; echo " ".$text['label-play']."\n"; echo " \n"; echo "  \n"; diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php index b36e73efba..b214a38957 100644 --- a/app/xml_cdr/xml_cdr_details.php +++ b/app/xml_cdr/xml_cdr_details.php @@ -174,7 +174,7 @@ else { //echo " \n"; //echo " "; - echo " \n"; + echo " \n"; //$tmp_file_array = explode("\.",$file); echo $caller_id_name.' '; echo " "; @@ -277,7 +277,7 @@ else { $tmp_name = $value."_1.mp3"; } if (strlen($tmp_name) > 0 && file_exists($_SESSION['switch']['recordings']['dir'].'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name)) { - echo " \n"; + echo " \n"; echo " play"; echo "  "; } diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index ae5a1d06bb..187ec9d53a 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -119,7 +119,7 @@ require_once "resources/paging.php"; echo th_order_by('domain_setting_description', $text['label-description'], $order_by, $order); echo "\n"; if (permission_exists('domain_setting_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } else { echo "  \n"; @@ -161,7 +161,7 @@ require_once "resources/paging.php"; echo " ".$row['domain_setting_description']." \n"; echo " \n"; if (permission_exists('domain_setting_edit')) { - echo " $v_link_label_edit\n"; + echo " $v_link_label_edit\n"; } if (permission_exists('domain_setting_delete')) { echo " $v_link_label_delete\n"; @@ -182,7 +182,7 @@ require_once "resources/paging.php"; echo " $paging_controls\n"; echo " \n"; if (permission_exists('domain_setting_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } else { echo "  \n"; diff --git a/core/user_settings/app_config.php b/core/user_settings/app_config.php index 8bc336823c..aa888453f3 100644 --- a/core/user_settings/app_config.php +++ b/core/user_settings/app_config.php @@ -38,12 +38,12 @@ $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details - $apps[$x]['permissions'][0]['name'] = 'user_account_settings_view'; + $apps[$x]['permissions'][0]['name'] = 'user_account_setting_view'; $apps[$x]['permissions'][0]['groups'][] = 'user'; $apps[$x]['permissions'][0]['groups'][] = 'admin'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; - $apps[$x]['permissions'][1]['name'] = 'user_account_settings_edit'; + $apps[$x]['permissions'][1]['name'] = 'user_account_setting_edit'; $apps[$x]['permissions'][1]['groups'][] = 'user'; $apps[$x]['permissions'][1]['groups'][] = 'admin'; $apps[$x]['permissions'][1]['groups'][] = 'superadmin'; diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php index 29c29a6cba..173da4e9b6 100644 --- a/core/user_settings/user_edit.php +++ b/core/user_settings/user_edit.php @@ -28,7 +28,7 @@ require_once "resources/require.php"; require_once "resources/check_auth.php"; include "app_languages.php"; -if (permission_exists("user_account_settings_view")) { +if (permission_exists("user_account_setting_view")) { //access granted } else { @@ -179,7 +179,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") { $sql .= "user_status = '$user_status' "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and user_uuid = '$user_uuid' "; - if (permission_exists("user_account_settings_edit")) { + if (permission_exists("user_account_setting_edit")) { $count = $db->exec(check_sql($sql)); } diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php index 21845b7cd2..1e0dffdd3c 100644 --- a/core/users/usersupdate.php +++ b/core/users/usersupdate.php @@ -480,7 +480,7 @@ else { echo "
\n"; echo $text['description-contact']."\n"; if (strlen($contact_uuid) > 0) { - echo " ".$text['description-contact_view']."\n"; + echo " ".$text['description-contact_view']."\n"; } echo " "; echo " "; diff --git a/resources/switch.php b/resources/switch.php index 6eb078e77a..1846f97a78 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -202,8 +202,8 @@ function build_menu() { $tab_array = array(); $menu_selected = false; - if ($_SERVER["SCRIPT_NAME"] == $relative_url."/settings_edit.php") { $menu_selected = true; } - $tab_array[] = array(gettext("Settings"), $menu_selected, $relative_url."/settings_edit.php"); + if ($_SERVER["SCRIPT_NAME"] == $relative_url."/setting_edit.php") { $menu_selected = true; } + $tab_array[] = array(gettext("Settings"), $menu_selected, $relative_url."/setting_edit.php"); unset($menu_selected); $menu_selected = false; @@ -232,7 +232,7 @@ function build_menu() { if ($_SERVER["SCRIPT_NAME"] == $relative_url."/auto_attendant_options_edit.php") { $menu_selected = true; } if ($_SERVER["SCRIPT_NAME"] == $relative_url."/modules.php") { $menu_selected = true; } if ($_SERVER["SCRIPT_NAME"] == $relative_url."/recordings.php") { $menu_selected = true; } - if ($_SERVER["SCRIPT_NAME"] == $relative_url."/recordings_edit.php") { $menu_selected = true; } + if ($_SERVER["SCRIPT_NAME"] == $relative_url."/recording_edit.php") { $menu_selected = true; } unset($menu_selected); $menu_selected = false;