diff --git a/app/call_broadcast/app_languages.php b/app/call_broadcast/app_languages.php index 4513beb315..b2f4351728 100644 --- a/app/call_broadcast/app_languages.php +++ b/app/call_broadcast/app_languages.php @@ -26,6 +26,16 @@ $text['confirm-delete-info']['pt-pt'] = "Deseja realmente remover isto?"; $text['confirm-delete-info']['fr-fr'] = "Voulez-vous vraiment supprimer cela?"; + $text['button-edit']['en-us'] = "Edit"; + $text['button-edit']['es-cl'] = "Editar"; + $text['button-edit']['pt-pt'] = "Editar"; + $text['button-edit']['fr-fr'] = "Editer"; + + $text['button-delete']['en-us'] = "Delete"; + $text['button-delete']['es-cl'] = "Eliminar"; + $text['button-delete']['pt-pt'] = "Remover"; + $text['button-delete']['fr-fr'] = "Supprimer"; + //v_call_broadcast_delete $text['confirm-delete']['en-us'] = "Delete Complete"; $text['confirm-delete']['es-cl'] = "Eliminación Completa"; diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index 1af9597b03..eb46bb4f66 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -38,7 +38,7 @@ else { //add multi-lingual support require_once "app_languages.php"; foreach($text as $key => $value) { - $text[$key] = $value[$_SESSION['domain']['language']['code']]; + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } //add the includes @@ -74,9 +74,9 @@ else { $rows_per_page = 10; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; $sql = "select * from v_call_broadcasts "; $sql .= "where domain_uuid = '$domain_uuid' "; @@ -99,9 +99,9 @@ else { echo th_order_by('broadcast_concurrent_limit', $text['label-concurrent-limit'], $order_by, $order); echo th_order_by('broadcast_description', $text['label-description'], $order_by, $order); //echo th_order_by('recordingid', 'Recording', $order_by, $order); - echo "\n"; + echo ""; if (permission_exists('call_broadcast_add')) { - echo " $v_link_label_add\n"; + echo "$v_link_label_add"; } echo "\n"; echo "\n"; @@ -109,16 +109,23 @@ else { if ($result_count > 0) { foreach($result as $row) { echo "\n"; - echo " ".$row['broadcast_name']." \n"; + echo " "; + if (permission_exists('call_broadcast_edit')) { + echo "".$row['broadcast_name'].""; + } + else { + echo $row['broadcast_name']; + } + echo " \n"; echo " ".$row['broadcast_concurrent_limit']." \n"; //echo " ".$row['recordingid']."\n"; echo " ".$row['broadcast_description']." \n"; - echo " \n"; + echo " "; if (permission_exists('call_broadcast_edit')) { - echo " $v_link_label_edit\n"; + echo "$v_link_label_edit"; } if (permission_exists('call_broadcast_delete')) { - echo " $v_link_label_delete\n"; + echo "$v_link_label_delete"; } echo " \n"; echo "\n"; @@ -134,9 +141,9 @@ else { echo " \n"; echo "  \n"; echo " $paging_controls\n"; - echo " \n"; + echo " "; if (permission_exists('call_broadcast_add')) { - echo " $v_link_label_add\n"; + echo "$v_link_label_add"; } echo " \n"; echo " \n"; diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php index 938393e23a..1fc0b58888 100644 --- a/app/call_center/call_center_agents.php +++ b/app/call_center/call_center_agents.php @@ -140,7 +140,14 @@ require_once "resources/paging.php"; foreach($result as $row) { echo "\n"; //echo " ".$row[domain_uuid]."\n"; - echo " ".$row[agent_name]." \n"; + echo " "; + if (permission_exists('call_center_agent_edit')) { + echo "".$row[agent_name].""; + } + else { + echo $row[agent_name]; + } + echo " \n"; echo " ".$row[agent_type]." \n"; echo " ".$row[agent_call_timeout]." \n"; echo " ".$row[agent_contact]." \n"; diff --git a/app/call_center/call_center_queues.php b/app/call_center/call_center_queues.php index 4dce13ee62..c2125d8e99 100644 --- a/app/call_center/call_center_queues.php +++ b/app/call_center/call_center_queues.php @@ -139,7 +139,14 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { echo "\n"; - echo " ".$row[queue_name]." \n"; + echo " "; + if (permission_exists('call_center_queue_edit')) { + echo "".$row[queue_name].""; + } + else { + echo $row[queue_name]; + } + echo " \n"; echo " ".$row[queue_extension]." \n"; echo " ".$row[queue_strategy]." \n"; //echo " ".$row[queue_moh_sound]." \n"; @@ -147,13 +154,13 @@ require_once "resources/paging.php"; //echo " ".$row[queue_time_base_score]." \n"; //echo " ".$row[queue_max_wait_time]." \n"; //echo " ".$row[queue_max_wait_time_with_no_agent]." \n"; - echo " ".$row[queue_tier_rules_apply]." \n"; + echo " ".ucwords($row[queue_tier_rules_apply])." \n"; //echo " ".$row[queue_tier_rule_wait_second]." \n"; //echo " ".$row[queue_tier_rule_no_agent_no_wait]." \n"; //echo " ".$row[queue_discard_abandoned_after]." \n"; //echo " ".$row[queue_abandoned_resume_allowed]." \n"; //echo " ".$row[queue_tier_rule_wait_multiply_level]." \n"; - echo " ".$row[queue_description]." \n"; + echo " ".$row[queue_description]." \n"; echo " "; if (permission_exists('call_center_queue_edit')) { echo "$v_link_label_edit"; diff --git a/app/call_center_active/app_languages.php b/app/call_center_active/app_languages.php index eb0a92d6cb..e5f56bcab0 100644 --- a/app/call_center_active/app_languages.php +++ b/app/call_center_active/app_languages.php @@ -4,6 +4,11 @@ $text['button-edit']['fr-fr'] = "Editer"; $text['button-edit']['pt-pt'] = "Editar"; + $text['button-view']['en-us'] = "View"; + $text['button-view']['es-cl'] = "Ver"; + $text['button-view']['pt-pt'] = "Vista"; + $text['button-view']['fr-fr'] = "Voir"; + $text['description-active_call_center']['en-us'] = "Select a Call Center Queue from the list below to view its activity."; $text['description-active_call_center']['es-cl'] = "Seleccione la Cola del Centro de Llamados desde el siguiente listado para ver su actividad."; $text['description-active_call_center']['fr-fr'] = "Choisir une file d'attente dans la liste pour voir son activité."; diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index e9cbcf96a3..e12a7aee08 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -116,7 +116,7 @@ $order = $_GET["order"]; //echo th_order_by('queue_abandoned_resume_allowed', $text['label-abandoned_resume_allowed'], $order_by, $order); //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"; + echo "\n"; //echo " $v_link_label_add\n"; echo "\n"; echo "\n"; @@ -126,7 +126,7 @@ $order = $_GET["order"]; else { //received results foreach($result as $row) { echo "\n"; - echo " ".$row[queue_name]."\n"; + echo " ".$row[queue_name]."\n"; echo " ".$row[queue_extension]."\n"; echo " ".$row[queue_strategy]."\n"; //echo " ".$row[queue_moh_sound]."\n"; @@ -140,9 +140,9 @@ $order = $_GET["order"]; //echo " ".$row[queue_discard_abandoned_after]."\n"; //echo " ".$row[queue_abandoned_resume_allowed]."\n"; //echo " ".$row[queue_tier_rule_wait_multiply_level]."\n"; - echo " ".$row[queue_description]." \n"; - echo " \n"; - echo " $v_link_label_edit\n"; + echo " ".$row[queue_description]." \n"; + echo " \n"; + echo " $v_link_label_view\n"; //echo " $v_link_label_delete\n"; //echo " \n"; //echo " \n"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 8b88cae999..5d3efa9b2c 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -127,10 +127,10 @@ else { $sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' "; } if (strlen($order_by) == 0) { - $sql .= "order by conference_center_name asc "; + $sql .= "order by conference_center_name asc "; } else { - $sql .= "order by $order_by $order "; + $sql .= "order by $order_by $order "; } $sql .= "limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); @@ -166,10 +166,17 @@ else { $conference_center_name = $row['conference_center_name']; $conference_center_name = str_replace("-", " ", $conference_center_name); echo "\n"; - echo " ".$conference_center_name." \n"; + echo " "; + if (permission_exists('conference_center_edit')) { + echo "".$conference_center_name.""; + } + else { + echo $conference_center_name; + } + echo " \n"; echo " ".$row['conference_center_extension']." \n"; //echo " ".$row['conference_center_order']." \n"; - echo " ".$row['conference_center_enabled']." \n"; + echo " ".ucwords($row['conference_center_enabled'])." \n"; echo " ".$row['conference_center_description']." \n"; echo " "; if (permission_exists('conference_center_edit')) { diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index ce3e758740..d3663ef90c 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -293,12 +293,11 @@ else { echo " "; if ($row['mute'] == "true") { - echo " ".$text['label-true'].""; + echo " ".$text['label-true']." "; } else { - echo " ".$text['label-false'].""; + echo " ".$text['label-false']." "; } - echo "  \n"; echo " \n"; echo " "; diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index f53663ff42..dfa0f54521 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -205,9 +205,9 @@ require_once "resources/paging.php"; foreach($result as $row) { echo "\n"; echo " ".ucwords($row['contact_type'])." \n"; - echo " ".$row['contact_organization']." \n"; - echo " ".$row['contact_name_given']." \n"; - echo " ".$row['contact_name_family']." \n"; + echo " ".$row['contact_organization']." \n"; + echo " ".$row['contact_name_given']." \n"; + echo " ".$row['contact_name_family']." \n"; echo " ".$row['contact_nickname']." \n"; echo " ".$row['contact_title']." \n"; //echo " ".$row['contact_category']." \n"; diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php index bec2efe193..718f8e3752 100644 --- a/app/dialplan/dialplans.php +++ b/app/dialplan/dialplans.php @@ -262,7 +262,7 @@ else { echo " ".((strlen($row['dialplan_number']) > 0) ? $row['dialplan_number'] : " ")."\n"; echo " ".$row['dialplan_context']."\n"; echo " ".$row['dialplan_order']."\n"; - echo " ".$row['dialplan_enabled']."\n"; + echo " ".ucwords($row['dialplan_enabled'])."\n"; echo " ".((strlen($row['dialplan_description']) > 0) ? $row['dialplan_description'] : " ")."\n"; echo " \n"; if ( diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php index ea7e6238f6..00e4869ed2 100644 --- a/app/fax/app_languages.php +++ b/app/fax/app_languages.php @@ -60,6 +60,16 @@ $text['description-upload']['pt-pt'] = "Selecione o ficheiro a carregar para enviar por fax."; $text['description-upload']['fr-fr'] = "Choisir un fichier à télécharger pour être émis en tant que Fax."; + $text['button-edit']['en-us'] = "Edit"; + $text['button-edit']['es-cl'] = "Editar"; + $text['button-edit']['pt-pt'] = "Editar"; + $text['button-edit']['fr-fr'] = "Editer"; + + $text['button-delete']['en-us'] = "Delete"; + $text['button-delete']['es-cl'] = "Eliminar"; + $text['button-delete']['pt-pt'] = "Remover"; + $text['button-delete']['fr-fr'] = "Supprimer"; + $text['button-back']['en-us'] = "Back"; $text['button-back']['es-cl'] = "Volver"; $text['button-back']['pt-pt'] = "Voltar"; diff --git a/app/fax/fax.php b/app/fax/fax.php index 4938625380..ea1214a8c1 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -145,16 +145,23 @@ require_once "resources/paging.php"; $row['fax_email'] = str_replace("\\", "", $row['fax_email']); //show the fax extensions echo "\n"; - echo " ".$row['fax_name']."\n"; + echo " "; + if (permission_exists('fax_extension_edit')) { + echo "".$row['fax_name'].""; + } + else { + echo $row['fax_name']; + } + echo " \n"; echo " ".$row['fax_extension']."\n"; echo " ".$row['fax_email']." \n"; echo " ".$row['fax_description']." \n"; echo " "; if (permission_exists('fax_extension_edit')) { - echo "$v_link_label_edit"; + echo "$v_link_label_edit"; } if (permission_exists('fax_extension_delete')) { - echo "$v_link_label_delete"; + echo "$v_link_label_delete"; } echo " \n"; echo "\n"; diff --git a/app/fifo_list/app_languages.php b/app/fifo_list/app_languages.php index ef8d911e25..67825365b8 100644 --- a/app/fifo_list/app_languages.php +++ b/app/fifo_list/app_languages.php @@ -60,6 +60,11 @@ $text['label-view']['pt-pt'] = "Vista"; $text['label-view']['fr-fr'] = "Voir"; + $text['button-view']['en-us'] = "View"; + $text['button-view']['es-cl'] = "Ver"; + $text['button-view']['pt-pt'] = "Vista"; + $text['button-view']['fr-fr'] = "Voir"; + $text['label-username']['en-us'] = "Username"; $text['label-username']['es-cl'] = "Nombre de Usuario"; $text['label-username']['pt-pt'] = "Nome de Utilizador"; diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php index b6d3c8751e..307b1f86b6 100644 --- a/app/fifo_list/fifo_list_inc.php +++ b/app/fifo_list/fifo_list_inc.php @@ -40,6 +40,10 @@ else { $text[$key] = $value[$_SESSION['domain']['language']['code']]; } +//echo PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/config.php"; +//exit; +include_once("themes/".$_SESSION['domain']['template']['name']."/config.php"); + $switch_cmd = 'fifo list'; $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if ($fp) { @@ -79,7 +83,7 @@ if ($fp) { echo "".$text['label-caller_count']."\n"; echo "".$text['label-waiting_count']."\n"; echo "".$text['label-importance']."\n"; - echo " \n"; + echo "\n"; echo "\n"; foreach ($xml->fifo as $row) { @@ -97,24 +101,24 @@ if ($fp) { if (if_group("superadmin")) { //show all fifo queues echo "\n"; - echo "".$tmp_name."\n"; + echo "".$tmp_name."\n"; echo "".$consumer_count."\n"; echo "".$caller_count."\n"; echo "".$waiting_count."\n"; echo "".$importance."\n"; - echo "".$text['label-view']."\n"; + echo "$v_link_label_view\n"; echo "\n"; } else { //show only the fifo queues that match the domain_name if (stripos($name, $_SESSION['domain_name']) !== false) { echo "\n"; - echo "".$tmp_name."\n"; + echo "".$tmp_name."\n"; echo "".$consumer_count."\n"; echo "".$caller_count."\n"; echo "".$waiting_count."\n"; echo "".$importance."\n"; - echo "".$text['label-view']."\n"; + echo "$v_link_label_view\n"; echo "\n"; } } diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php index 2b2b1b2a39..4928f4fbc2 100644 --- a/app/hot_desking/extension_edit.php +++ b/app/hot_desking/extension_edit.php @@ -287,7 +287,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo " ".$text['label-unique_id'].":\n"; echo "\n"; echo "\n"; diff --git a/app/hot_desking/index.php b/app/hot_desking/index.php index 4efd1e18f1..0face51369 100644 --- a/app/hot_desking/index.php +++ b/app/hot_desking/index.php @@ -131,7 +131,14 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { echo "\n"; - echo " ".$row['extension']." \n"; + echo " "; + if (permission_exists('extension_edit')) { + echo "".$row['extension'].""; + } + else { + echo $row['extension']; + } + echo " \n"; echo " ".$row['unique_id']." \n"; if (strlen($row['dial_user']) > 0) { echo " ".$row['dial_user']."@".$row['dial_domain']." \n"; diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php index 67fd8c94f2..49b4478970 100644 --- a/app/ivr_menu/ivr_menus.php +++ b/app/ivr_menu/ivr_menus.php @@ -127,10 +127,17 @@ else { foreach($result as $row) { $ivr_menu_name = str_replace("-", " ", $row['ivr_menu_name']); echo "\n"; - echo " ".$ivr_menu_name."\n"; + echo " "; + if (permission_exists('ivr_menu_edit')) { + echo "".$ivr_menu_name.""; + } + else { + echo $ivr_menu_name; + } + echo " \n"; echo " ".$row['ivr_menu_extension']." \n"; - echo " ".$row['ivr_menu_direct_dial']."\n"; - echo " ".$row['ivr_menu_enabled']."\n"; + echo " ".ucwords($row['ivr_menu_direct_dial'])."\n"; + echo " ".ucwords($row['ivr_menu_enabled'])."\n"; echo " ".$row['ivr_menu_description']." \n"; echo " "; if (permission_exists('ivr_menu_edit')) { diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 7c7e12f95e..c19769b5c3 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -247,7 +247,7 @@ require_once "resources/paging.php"; echo " \n"; echo " ".$tmp_filesize; echo " \n"; - echo " ".$row['recording_description']." \n"; + echo " ".$row['recording_description']." \n"; echo " "; if (permission_exists('recording_edit')) { echo "$v_link_label_edit"; diff --git a/app/registrations/app_languages.php b/app/registrations/app_languages.php index 51aaa67b90..c681ee5686 100644 --- a/app/registrations/app_languages.php +++ b/app/registrations/app_languages.php @@ -46,19 +46,20 @@ $text['label-response']['pt-pt'] = "Resposta:"; $text['label-response']['fr-fr'] = "Réponse:"; - $text['button-reboot']['en-us'] = "Reboot"; - $text['button-reboot']['pt-pt'] = "Reinicialização"; - $text['button-reboot']['fr-fr'] = "Redémarrage"; + $text['button-unregister']['en-us'] = "Unregister"; + $text['button-unregister']['es-cl'] = ""; + $text['button-unregister']['pt-pt'] = ""; + $text['button-unregister']['fr-fr'] = ""; $text['button-reboot']['en-us'] = "Reboot"; $text['button-reboot']['es-cl'] = "Reiniciar"; $text['button-reboot']['pt-pt'] = "Reinicialização"; $text['button-reboot']['fr-fr'] = "Redémarrage"; - $text['button-check_sync']['en-us'] = "Check Sync"; - $text['button-check_sync']['es-cl'] = "Compruebe Sync"; - $text['button-check_sync']['pt-pt'] = "Sincronização"; - $text['button-check_sync']['fr-fr'] = "Contrôle Sync"; + $text['button-provision']['en-us'] = "Provision"; + $text['button-provision']['es-cl'] = ""; + $text['button-provision']['pt-pt'] = ""; + $text['button-provision']['fr-fr'] = ""; $text['label-message']['en-us'] = "Message"; $text['label-message']['es-cl'] = "Mensaje"; diff --git a/app/registrations/status_registrations_inc.php b/app/registrations/status_registrations_inc.php index eb2fc57d32..12548edb7b 100644 --- a/app/registrations/status_registrations_inc.php +++ b/app/registrations/status_registrations_inc.php @@ -160,9 +160,10 @@ require_once "resources/check_auth.php"; echo " ".$row['network-ip']." \n"; echo " ".$row['network-port']." \n"; echo " ".$row['status']." \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php index 3b44969c37..52880d4a64 100644 --- a/app/ring_groups/app_languages.php +++ b/app/ring_groups/app_languages.php @@ -379,4 +379,14 @@ $text['title']['fr-fr'] = "Groupes de Sonnerie"; $text['title']['pt-pt'] = "Grupos"; + $text['button-edit']['en-us'] = "Edit"; + $text['button-edit']['es-cl'] = "Editar"; + $text['button-edit']['pt-pt'] = "Editar"; + $text['button-edit']['fr-fr'] = "Editer"; + + $text['button-delete']['en-us'] = "Delete"; + $text['button-delete']['es-cl'] = "Eliminar"; + $text['button-delete']['pt-pt'] = "Remover"; + $text['button-delete']['fr-fr'] = "Supprimer"; + ?> diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index e9a07dd847..8e6850a09d 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -127,7 +127,7 @@ require_once "resources/paging.php"; //echo th_order_by('ring_group_timeout_app', 'Timeout App', $order_by, $order); //echo th_order_by('ring_group_timeout_data', 'Timeout Data', $order_by, $order); echo th_order_by('ring_group_enabled', $text['label-enabled'], $order_by, $order); - echo th_order_by('ring_group_description', $text['label-description'], $order_by, $order); + echo th_order_by('ring_group_description', $text['header-description'], $order_by, $order); echo ""; if (permission_exists('ring_group_add')) { echo "$v_link_label_add"; @@ -138,21 +138,28 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { echo "\n"; - echo " ".$row['ring_group_name']." \n"; + echo " "; + if (permission_exists('ring_group_edit')) { + echo "".$row['ring_group_name'].""; + } + else { + echo $row['ring_group_name']; + } + echo " \n"; echo " ".$row['ring_group_extension']." \n"; //echo " ".$row['ring_group_context']." \n"; //echo " ".$row['ring_group_strategy']." \n"; //echo " ".$row['ring_group_timeout_sec']." \n"; //echo " ".$row['ring_group_timeout_app']." \n"; //echo " ".$row['ring_group_timeout_data']." \n"; - echo " ".$row['ring_group_enabled']." \n"; + echo " ".ucwords($row['ring_group_enabled'])." \n"; echo " ".$row['ring_group_description']." \n"; echo " "; if (permission_exists('ring_group_edit')) { - echo "$v_link_label_edit"; + echo "$v_link_label_edit"; } if (permission_exists('ring_group_delete')) { - echo "$v_link_label_delete"; + echo "$v_link_label_delete"; } echo " \n"; echo "\n"; diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php index 2a3956811e..8d4ecf94ef 100644 --- a/app/schemas/schema_edit.php +++ b/app/schemas/schema_edit.php @@ -190,12 +190,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "".$text['header-schema']."\n"; echo "\n"; + echo " \n"; if (strlen($schema_uuid) > 0) { - echo "   \n"; - echo "   \n"; + echo " \n"; + echo " \n"; } include "export/index.php"; - echo " \n"; echo " \n"; echo "\n"; echo "\n"; diff --git a/app/schemas/schema_fields.php b/app/schemas/schema_fields.php index 404e9f66b6..5addb07a63 100644 --- a/app/schemas/schema_fields.php +++ b/app/schemas/schema_fields.php @@ -102,7 +102,14 @@ $order = $_GET["order"]; foreach($result as $row) { echo "\n"; echo " ".$row['field_label']." \n"; - echo " ".$row['field_name']." \n"; + echo " "; + if (permission_exists('schema_edit')) { + echo "".$row['field_name'].""; + } + else { + echo $row['field_name']; + } + echo " \n"; echo " "; switch ($row['field_type']) { case "text" : echo $text['option-text']; break; diff --git a/app/schemas/schemas.php b/app/schemas/schemas.php index 196de1e6a0..ddf2c92ac6 100644 --- a/app/schemas/schemas.php +++ b/app/schemas/schemas.php @@ -120,7 +120,14 @@ require_once "resources/paging.php"; foreach($result as $row) { echo "\n"; echo " ".$row['schema_label']." \n"; - echo " ".$row['schema_name']."\n"; + echo " "; + if (permission_exists('schema_edit')) { + echo "".$row['schema_name'].""; + } + else { + echo $row['schema_name']; + } + echo " \n"; echo " "; if ($row['schema_auth'] == 'yes') { echo $text['option-true']; diff --git a/app/services/services.php b/app/services/services.php index b4e01968e7..c94ae31d12 100644 --- a/app/services/services.php +++ b/app/services/services.php @@ -138,9 +138,9 @@ if (strlen($_GET["a"]) > 0) { echo "\n"; echo "\n"; echo th_order_by('service_name', 'Name', $order_by, $order); - echo th_order_by('service_description', 'Description', $order_by, $order); echo "\n"; echo "\n"; + echo th_order_by('service_description', 'Description', $order_by, $order); 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"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
StatusAction"; if (permission_exists('service_add')) { echo "$v_link_label_add"; @@ -154,8 +154,14 @@ if (strlen($_GET["a"]) > 0) { else { //received results foreach($result as $row) { echo "
".$row[service_name]."".$row[service_description]." "; + if (permission_exists('service_edit')) { + echo "".$row[service_name].""; + } + else { + echo $row[service_name]; + } + echo " \n"; $pid = file_get_contents($row[service_data]); if (is_process_running($pid)) { @@ -173,6 +179,7 @@ if (strlen($_GET["a"]) > 0) { echo " Start"; } echo "".$row[service_description]." "; if (permission_exists('service_edit')) { echo "$v_link_label_edit"; diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 2e3e88ce19..3e1a1d965a 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -198,18 +198,25 @@ else { if ($result_count > 0) { foreach($result as $row) { echo "
".$row['voicemail_id']." "; + if (permission_exists('voicemail_edit')) { + echo "".$row['voicemail_id'].""; + } + else { + echo $row['voicemail_id']; + } + echo " ".$row['voicemail_password']." ".$row['greeting_id']." ".$row['voicemail_mail_to']." ".$row['voicemail_attach_file']." ".$row['voicemail_local_after_email']." ".ucwords($row['voicemail_attach_file'])." ".ucwords($row['voicemail_local_after_email'])."  \n"; echo " ".$text['label-view']."  \n"; echo " ".$text['label-greetings']."\n"; echo " ".$row['voicemail_enabled']." ".ucwords($row['voicemail_enabled'])." ".$row['voicemail_description']." "; if (permission_exists('voicemail_edit')) { diff --git a/themes/enhanced/config.php b/themes/enhanced/config.php index 17ce366196..7accb1ec0c 100644 --- a/themes/enhanced/config.php +++ b/themes/enhanced/config.php @@ -4,6 +4,6 @@ $v_link_label_edit = ""; $v_link_label_add = ""; $v_link_label_delete = ""; - $v_link_label_view = ""; + $v_link_label_view = ""; ?>