diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php index 53f7827195..e3b5771578 100644 --- a/app/dialplan/dialplan_edit.php +++ b/app/dialplan/dialplan_edit.php @@ -746,7 +746,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { */ echo "\n"; //tools - echo " \n"; + echo " \n"; if ($element['hidden']) { //echo " $v_link_label_edit\n"; echo " $v_link_label_delete\n"; diff --git a/app/fax/fax.php b/app/fax/fax.php index ea1214a8c1..4581cdd759 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -126,7 +126,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('fax_name', $text['label-name'], $order_by, $order); echo th_order_by('fax_extension', $text['label-extension'], $order_by, $order); @@ -137,14 +137,15 @@ require_once "resources/paging.php"; echo " $v_link_label_add\n"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { //remove the backslash $row['fax_email'] = str_replace("\\", "", $row['fax_email']); //show the fax extensions - echo "\n"; + $tr_link = (permission_exists('fax_extension_edit')) ? "href='fax_view.php?id=".$row['fax_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('fax_extension_edit')) { echo "".$row['fax_name'].""; diff --git a/app/hot_desking/index.php b/app/hot_desking/index.php index 0face51369..fc189c6ddb 100644 --- a/app/hot_desking/index.php +++ b/app/hot_desking/index.php @@ -115,7 +115,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('extension', $text['label-extension'], $order_by, $order); echo th_order_by('unique_id', $text['label-unique_id'], $order_by, $order); @@ -126,11 +126,12 @@ require_once "resources/paging.php"; echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('extension_edit')) ? "href='extension_edit.php?id=".$row['extension_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('extension_edit')) { echo "".$row['extension'].""; diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php index 49b4478970..497c617154 100644 --- a/app/ivr_menu/ivr_menus.php +++ b/app/ivr_menu/ivr_menus.php @@ -109,7 +109,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('ivr_menu_name', $text['label-name'], $order_by[0]['name'], $order_by[0]['order']); echo th_order_by('ivr_menu_extension', $text['label-extension'], $order_by[0]['name'], $order_by[0]['order']); @@ -121,12 +121,13 @@ else { echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { $ivr_menu_name = str_replace("-", " ", $row['ivr_menu_name']); - echo "\n"; + $tr_link = (permission_exists('ivr_menu_edit')) ? "href='ivr_menu_edit.php?id=".$row['ivr_menu_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('ivr_menu_edit')) { echo "".$ivr_menu_name.""; diff --git a/app/music_on_hold/app_languages.php b/app/music_on_hold/app_languages.php index b3923e3586..5d2d9c8f4c 100644 --- a/app/music_on_hold/app_languages.php +++ b/app/music_on_hold/app_languages.php @@ -87,6 +87,16 @@ $text['message-available-to-all']['pt-pt'] = "Disponível para todos os domínios"; $text['message-available-to-all']['fr-fr'] = "Disponible pour tous Domaines"; + $text['label-file_name']['en-us'] = "File Name"; + $text['label-file_name']['es-cl'] = "Nombre del Archivo"; + $text['label-file_name']['pt-pt'] = "Nome do Arquivo"; + $text['label-file_name']['fr-fr'] = "Nom du Fichier"; + + $text['label-tools']['en-us'] = "Tools"; + $text['label-tools']['es-cl'] = "Instrumentos"; + $text['label-tools']['pt-pt'] = "Ferramentas"; + $text['label-tools']['fr-fr'] = "Outils"; + $text['label-download']['en-us'] = "Download"; $text['label-download']['es-cl'] = "Descargar"; $text['label-download']['pt-pt'] = "Descarregar"; @@ -94,7 +104,7 @@ $text['label-play']['en-us'] = "Play"; $text['label-play']['es-cl'] = "Reproducir"; - $text['label-play']['pt-pt'] = "Ouvir"; + $text['label-play']['pt-pt'] = "Tocar"; $text['label-play']['fr-fr'] = "Jouer"; $text['label-uploaded']['en-us'] = "Uploaded"; @@ -113,7 +123,7 @@ $text['label-sampling']['fr-fr'] = "Echantillonage"; $text['message-delete']['en-us'] = "Do you really want to delete this file?"; - $text['message-delete']['es-cl'] = "¿Realmente desea eliminar este archivo?"; + $text['message-delete']['es-cl'] = "¿Realmente desea eliminar este archivo?"; $text['message-delete']['pt-pt'] = "Deseja realmente remover este ficheiro?"; $text['message-delete']['fr-fr'] = "Voulez-vous vraiment supprimer ce fichier?"; diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 784d996337..3b5e8faa29 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -329,8 +329,8 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo "

\n"; echo "\n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; @@ -345,17 +345,15 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { $file_size = byte_convert($file_size); echo "\n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo "
".$text['label-download']."".$text['label-play']."".$text['label-file_name']."".$text['label-tools']."".$text['label-uploaded']."".$text['label-file-size']."".$text['label-sampling']."
".$file."".$file."\n"; - echo " \n"; - $tmp_file_array = explode("\.",$file); - echo " ".$tmp_file_array[0]; - echo " "; + echo " ".$text['label-play']."   "; + echo " ".$text['label-download'].""; echo " ".date ("F d Y H:i:s", filemtime($music_on_hold_dir."/".$sampling_rate_dir."/".$file))."".$file_size."".($sampling_rate_dir / 1000)." kHz\n"; + echo " \n"; if (permission_exists('music_on_hold_default_delete')) { echo "$v_link_label_delete"; } @@ -383,8 +381,8 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo "

\n"; echo "\n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; @@ -402,17 +400,15 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { $file_size = byte_convert($file_size); 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 "
".$text['label-download']."".$text['label-play']."".$text['label-file_name']."".$text['label-tools']."".$text['label-uploaded']."".$text['label-file-size']."".$text['label-sampling']."
".$file."".$file."\n"; - echo " \n"; - $tmp_file_array = explode("\.",$file); - echo " ".$tmp_file_array[0]; - echo " "; + echo " ".$text['label-play']."   "; + echo " ".$text['label-download'].""; echo " ".date ("F d Y H:i:s", filemtime($music_on_hold_category_parent_dir."/".$category_dir."/".$sampling_rate_dir."/".$file))."".$file_size."".($sampling_rate_dir / 1000)." kHz"; + echo " "; if (permission_exists('music_on_hold_delete')) { echo "$v_link_label_delete"; } diff --git a/app/recordings/app_languages.php b/app/recordings/app_languages.php index 14a697b0b1..0fadc6f3df 100644 --- a/app/recordings/app_languages.php +++ b/app/recordings/app_languages.php @@ -61,10 +61,40 @@ $text['description-file']['pt-pt'] = "Nome do ficheiro. exemplo.wav"; $text['description-file']['fr-fr'] = "Nom du fichier. exemple.wav"; - $text['label-recording']['en-us'] = "Recording Name (Play)"; - $text['label-recording']['es-cl'] = "Nombre de la grabación (Reproducir)"; - $text['label-recording']['pt-pt'] = "Nome da gravação (Tocar)"; - $text['label-recording']['fr-fr'] = "Nom de l'enregistrement (Jouer)"; + $text['label-recording_name']['en-us'] = "Recording Name"; + $text['label-recording_name']['es-cl'] = "Nombre de la grabación"; + $text['label-recording_name']['pt-pt'] = "Nome da gravação"; + $text['label-recording_name']['fr-fr'] = "Nom de l'enregistrement"; + + $text['label-file_name']['en-us'] = "File Name"; + $text['label-file_name']['es-cl'] = "Nombre del Archivo"; + $text['label-file_name']['pt-pt'] = "Nome do Arquivo"; + $text['label-file_name']['fr-fr'] = "Nom du Fichier"; + + $text['label-file-size']['en-us'] = "File Size"; + $text['label-file-size']['es-cl'] = "Tamaño del archivo"; + $text['label-file-size']['pt-pt'] = "Tamanho do Ficheiro"; + $text['label-file-size']['fr-fr'] = "Taille de Fichier"; + + $text['label-tools']['en-us'] = "Tools"; + $text['label-tools']['es-cl'] = "Instrumentos"; + $text['label-tools']['pt-pt'] = "Ferramentas"; + $text['label-tools']['fr-fr'] = "Outils"; + + $text['label-download']['en-us'] = "Download"; + $text['label-download']['es-cl'] = "Descargar"; + $text['label-download']['pt-pt'] = "Descarregar"; + $text['label-download']['fr-fr'] = "Télécharger"; + + $text['label-play']['en-us'] = "Play"; + $text['label-play']['es-cl'] = "Reproducir"; + $text['label-play']['pt-pt'] = "Tocar"; + $text['label-play']['fr-fr'] = "Jouer"; + + $text['label-description']['en-us'] = "Size"; + $text['label-description']['es-cl'] = "Descripción"; + $text['label-description']['pt-pt'] = "Descrição"; + $text['label-description']['fr-fr'] = "Description"; $text['description-recording']['en-us'] = "Recording Name. example: recording_x"; $text['description-recording']['es-cl'] = "Nombre de la grabación. ejemplo: grabacion_x"; diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php index c1a3d1a185..4c4d2f1664 100644 --- a/app/recordings/recording_edit.php +++ b/app/recordings/recording_edit.php @@ -209,18 +209,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; - echo " ".$text['label-file']."\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo $text['message-file']."\n"; - echo "
\n"; - echo " ".$text['label-recording']."\n"; + echo " ".$text['label-recording_name']."\n"; echo "\n"; echo " \n"; @@ -229,6 +218,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; + echo " ".$text['label-file_name']."\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['message-file']."\n"; + echo "
\n"; //echo " recording_uuid:\n"; diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index c19769b5c3..18ed052b58 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -217,15 +217,14 @@ require_once "resources/paging.php"; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "\n"; + echo "
\n"; echo "\n"; - echo th_order_by('recording_filename', $text['label-file'], $order_by, $order); - echo th_order_by('recording_name', $text['label-recording'], $order_by, $order); - echo "\n"; + echo th_order_by('recording_name', $text['label-recording_name'], $order_by, $order); + echo th_order_by('recording_filename', $text['label-file_name'], $order_by, $order); + echo "\n"; + echo "\n"; echo th_order_by('recording_description', $text['label-description'], $order_by, $order); - echo "\n"; + echo "\n"; echo "\n"; if ($result_count > 0) { @@ -233,17 +232,20 @@ require_once "resources/paging.php"; $tmp_filesize = filesize($_SESSION['switch']['recordings']['dir'].'/'.$row['recording_filename']); $tmp_filesize = byte_convert($tmp_filesize); - echo "\n"; + $tr_link = (permission_exists('recording_edit')) ? "href='recording_edit.php?id=".$row['recording_uuid']."'" : null; + echo "\n"; echo " \n"; + echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index 4c31cabe79..04cc2203ab 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -117,7 +117,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "
Size".$text['label-tools']."".$text['label-file-size']."\n"; - echo "  "; - echo " 
"; - echo " \n"; + echo $row['recording_name']; + echo ""; + echo " \n"; echo $row['recording_filename']; echo " "; echo " "; - echo " \n"; - echo $row['recording_name']; - echo " "; - echo ""; + echo " ".$text['label-play']."   "; + echo " ".$text['label-download'].""; + echo " \n"; echo " ".$tmp_filesize; echo "
\n"; + echo "
\n"; echo "\n"; echo th_order_by('ring_group_name', $text['label-name'], $order_by, $order); echo th_order_by('ring_group_extension', $text['label-extension'], $order_by, $order); @@ -133,11 +133,12 @@ require_once "resources/paging.php"; echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('ring_group_edit')) ? "href='ring_group_edit.php?id=".$row['ring_group_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('ring_group_edit')) { echo "".$row['ring_group_name'].""; diff --git a/app/schemas/schema_fields.php b/app/schemas/schema_fields.php index 5addb07a63..4144506c7c 100644 --- a/app/schemas/schema_fields.php +++ b/app/schemas/schema_fields.php @@ -79,7 +79,7 @@ $order = $_GET["order"]; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('field_label', $text['label-field_label'], $order_by, $order); echo th_order_by('field_name', $text['label-field_name'], $order_by, $order); @@ -96,11 +96,12 @@ $order = $_GET["order"]; echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('schema_edit')) ? "href='schema_field_edit.php?schema_uuid=".$row['schema_uuid']."&id=".$row['schema_field_uuid']."'" : null; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "
".$row['field_label']." "; if (permission_exists('schema_edit')) { @@ -160,7 +161,7 @@ $order = $_GET["order"]; echo " ".$row['field_order']."".$row['field_order_tab']."".$row['field_description']." ".$row['field_description']." "; if (permission_exists('schema_edit')) { echo "$v_link_label_edit"; diff --git a/app/schemas/schemas.php b/app/schemas/schemas.php index ddf2c92ac6..a62076a33b 100644 --- a/app/schemas/schemas.php +++ b/app/schemas/schemas.php @@ -99,7 +99,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('schema_label', $text['label-label'], $order_by, $order); echo th_order_by('schema_name', $text['label-schema_name'], $order_by, $order); @@ -111,14 +111,15 @@ require_once "resources/paging.php"; echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count == 0) { //no results } else { //received results foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('schema_edit')) ? "href='schema_edit.php?id=".$row['schema_uuid']."'" : null; + echo "\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "
".$row['schema_label']." "; if (permission_exists('schema_edit')) { @@ -139,7 +140,7 @@ require_once "resources/paging.php"; echo " "; } echo " ".$row['schema_description']." ".$row['schema_description']." "; if (permission_exists('schema_edit')) { echo "$v_link_label_edit"; diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php index 17ccdc96d1..4df11a35f6 100644 --- a/app/voicemail_greetings/app_languages.php +++ b/app/voicemail_greetings/app_languages.php @@ -51,6 +51,10 @@ $text['button-save']['pt-pt'] = "Guardar"; $text['button-save']['fr-fr'] = "Sauvegarder"; + $text['label-tools']['en-us'] = "Tools"; + $text['label-tools']['es-cl'] = "Instrumentos"; + $text['label-tools']['pt-pt'] = "Ferramentas"; + $text['label-tools']['fr-fr'] = "Outils"; //voicemail_greeting_edit $text['confirm-name']['en-us'] = "Please provide: Greeting Name (play)"; diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 6fe383a837..3bdf03fb29 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -292,11 +292,11 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo th_order_by('greeting_name', $text['table-name'], $order_by, $order); - echo "\n"; + echo "\n"; echo "\n"; echo th_order_by('greeting_description', $text['table-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"; - $table_header .= "\n"; + $table_header .= "\n"; //loop through the voicemail messages if (count($voicemails) > 0) { @@ -126,8 +126,8 @@ else { if ($previous_voicemail_id != $field['voicemail_id']) { echo "\n"; echo " \n"; echo " \n"; + echo "

\n"; echo " \n"; echo "\n"; echo $table_header; @@ -163,7 +163,7 @@ else { echo " \n"; echo " \n"; //echo " \n"; - echo "
".$text['table-choose']."".$text['table-download']."".$text['label-tools']."".$text['table-size']."\n"; @@ -310,8 +310,9 @@ else { foreach($result as $row) { $tmp_filesize = filesize($v_greeting_dir.'/'.$row['greeting_name']); $tmp_filesize = byte_convert($tmp_filesize); - echo "
\n"; + $tr_link = (permission_exists('voicemail_greeting_edit')) ? "href='voicemail_greeting_edit.php?id=".$row['voicemail_greeting_uuid']."&voicemail_id=".$voicemail_id."'" : null; + echo "
\n"; if (preg_replace('{\D}', '', $row['greeting_name']) == $greeting_id) { echo " \n"; } @@ -333,7 +334,7 @@ else { echo " ".$tmp_filesize."".$row['greeting_description']." \n"; + echo " \n"; if (permission_exists('voicemail_greeting_edit')) { echo "$v_link_label_edit"; } diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php index 1d21c2ad83..3a945ac533 100644 --- a/app/voicemails/voicemail_edit.php +++ b/app/voicemails/voicemail_edit.php @@ -267,7 +267,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; + echo "\n"; echo " ".$text['label-voicemail_id'].":\n"; echo "\n"; @@ -278,7 +278,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; + echo "\n"; echo " ".$text['label-voicemail_password'].":\n"; echo "\n"; diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index e658de2ec3..8d47bc52fe 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -117,7 +117,7 @@ else { $table_header .= "\n"; $table_header .= "  \n"; $table_header .= "
\n"; - echo "

\n"; - echo " ".$text['label-mailbox'].": ".$field['voicemail_id']."  \n"; + echo "



\n"; + echo " ".$text['label-mailbox'].": ".$field['voicemail_id']."
 \n"; echo " 		\n"; if (permission_exists('voicemail_greeting_view')) { @@ -136,7 +136,7 @@ else { if (permission_exists('voicemail_view')) { echo " \n"; } - echo "  
".$row['message_priority']." \n"; + echo " \n"; if (permission_exists('voicemail_message_delete')) { echo " $v_link_label_delete\n"; } diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 3e1a1d965a..d91e9ebca4 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -176,7 +176,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('voicemail_id', $text['label-voicemail_id'], $order_by, $order); //echo th_order_by('voicemail_password', $text['label-voicemail_password'], $order_by, $order); @@ -193,11 +193,12 @@ else { echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('voicemail_edit')) ? "href='voicemail_edit.php?id=".$row['voicemail_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('voicemail_edit')) { echo "".$row['voicemail_id']."";