diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 891c979370..e2b91963c5 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -352,13 +352,17 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { if ($handle = opendir($music_on_hold_dir."/".$sampling_rate_dir)) { while (false !== ($file = readdir($handle))) { if ($file != "." && $file != ".." && is_file($music_on_hold_dir."/".$sampling_rate_dir."/".$file)) { + $row_uuid = uuid(); + $file_size = filesize($music_on_hold_dir."/".$sampling_rate_dir."/".$file); $file_size = byte_convert($file_size); + //playback progress bar + echo "\n"; + echo "\n"; echo " ".$file."\n"; if (strlen($file) > 0) { - $row_uuid = uuid(); echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); @@ -368,7 +372,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { case "mp3" : $recording_type = "audio/mpeg"; break; case "ogg" : $recording_type = "audio/ogg"; break; } - echo ""; + echo ""; echo "".$v_link_label_play.""; echo "".$v_link_label_download.""; } @@ -422,14 +426,17 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { if ($handle = opendir($music_on_hold_category_parent_dir."/".$category_dir."/".$sampling_rate_dir)) { while (false !== ($file = readdir($handle))) { if ($file != "." && $file != ".." && is_file($music_on_hold_category_parent_dir."/".$category_dir."/".$sampling_rate_dir."/".$file)) { + $row_uuid = uuid(); $file_size = filesize($music_on_hold_category_parent_dir."/".$category_dir."/".$sampling_rate_dir."/".$file); $file_size = byte_convert($file_size); + //playback progress bar + echo "\n"; + echo "\n"; echo " ".$file."\n"; if (strlen($file) > 0) { - $row_uuid = uuid(); echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($row['recording_filename'], PATHINFO_BASENAME)); @@ -439,7 +446,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { case "mp3" : $recording_type = "audio/mpeg"; break; case "ogg" : $recording_type = "audio/ogg"; break; } - echo ""; + echo ""; echo "".$v_link_label_play.""; echo "".$v_link_label_download.""; } diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index a1c1430d3b..615e9cac11 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -57,7 +57,7 @@ require_once "resources/check_auth.php"; header("Content-Type: audio/x-wav"); } if ($file_ext == "mp3") { - header("Content-Type: audio/mp3"); + header("Content-Type: audio/mpeg"); } } header('Content-Disposition: attachment; filename="'.base64_decode($_GET['filename']).'"'); @@ -217,6 +217,9 @@ require_once "resources/check_auth.php"; $tmp_filesize = filesize($_SESSION['switch']['recordings']['dir'].'/'.$row['recording_filename']); $tmp_filesize = byte_convert($tmp_filesize); + //playback progress bar + echo "\n"; + $tr_link = (permission_exists('recording_edit')) ? "href='recording_edit.php?id=".$row['recording_uuid']."'" : null; echo "\n"; echo " "; @@ -237,7 +240,7 @@ require_once "resources/check_auth.php"; case "mp3" : $recording_type = "audio/mpeg"; break; case "ogg" : $recording_type = "audio/ogg"; break; } - echo ""; + echo ""; echo "".$v_link_label_play.""; echo "".$v_link_label_download.""; } diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 0fdf621095..53f5ce150d 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -312,6 +312,10 @@ else { foreach($result as $row) { $tmp_filesize = filesize($v_greeting_dir.'/'.$row['greeting_name']); $tmp_filesize = byte_convert($tmp_filesize); + + //playback progress bar + 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"; echo " \n"; @@ -334,7 +338,7 @@ else { case "mp3" : $recording_type = "audio/mpeg"; break; case "ogg" : $recording_type = "audio/ogg"; break; } - echo ""; + echo ""; echo "".$v_link_label_play.""; echo "".$v_link_label_download.""; } diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index ee4aea012d..a5bf8cae47 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -138,7 +138,11 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] if (count($field['messages']) > 0) { foreach($field['messages'] as &$row) { - if ($row['message_status'] == '') { $style = "font-weight: bold;"; } else { $style = ''; } + $style = ($row['message_status'] == '') ? "font-weight: bold;" : null; + + //playback progress bar + echo "\n"; + echo "\n"; echo " ".$row['created_date']."\n"; echo " ".$row['caller_id_name']." \n"; @@ -152,7 +156,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] case "mp3" : $recording_type = "audio/mpeg"; break; case "ogg" : $recording_type = "audio/ogg"; break; } - echo ""; + echo ""; echo "".$v_link_label_play.""; echo "".$v_link_label_download.""; echo " \n"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index f88001ce68..cd769777ba 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -316,21 +316,25 @@ else { $param = substr($param, 0, strrpos($param, '&order_by=')); //remove trailing order by //show the results + $col_count = 8; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; if (permission_exists('xml_cdr_delete') && $result_count > 0) { echo ""; + $col_count++; } echo "\n"; if ($_GET['showall'] && permission_exists('xml_cdr_all')) { echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param); + $col_count++; } echo th_order_by('caller_id_name', $text['label-cid-name'], $order_by, $order, null, null, $param); echo th_order_by('caller_id_number', $text['label-source'], $order_by, $order, null, null, $param); echo th_order_by('destination_number', $text['label-destination'], $order_by, $order, null, null, $param); if (permission_exists('recording_play') || permission_exists('recording_download')) { echo "\n"; + $col_count++; } echo th_order_by('start_stamp', $text['label-start'], $order_by, $order, null, "style='text-align: center;'", $param); echo th_order_by('tta', $text['label-tta'], $order_by, $order, null, "style='text-align: right;'", $param); @@ -338,12 +342,15 @@ else { if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/billing/app_config.php")){ // billing collumns echo "\n"; + $col_count++; } if (permission_exists('xml_cdr_pdd')) { echo th_order_by('pdd_ms', 'PDD', $order_by, $order, null, "style='text-align: right;'", $param); + $col_count++; } if (permission_exists('xml_cdr_mos')) { echo th_order_by('rtp_audio_in_mos', 'MOS', $order_by, $order, null, "style='text-align: center;'", $param); + $col_count++; } echo th_order_by('hangup_cause', $text['label-status'], $order_by, $order, $param); if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { @@ -352,6 +359,7 @@ else { echo "".$v_link_label_delete.""; } echo "\n"; + $col_count++; } echo "\n"; if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/billing/app_config.php")){ @@ -432,6 +440,11 @@ else { } } + //recording playback progress bar + if (permission_exists('recording_play') && $recording_file_path != '') { + echo "\n"; + } + if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { $tr_link = "href='xml_cdr_details.php?uuid=".$row['uuid'].(($_GET['showall']) ? "&showall=true" : null)."'"; } @@ -517,7 +530,7 @@ else { if ($recording_file_path != '') { echo " \n"; } echo "\n"; - if ($c==0) { $c=1; } else { $c=0; } + $c = ($c) ? 0 : 1; } //end foreach unset($sql, $result, $row_count); } //end if results diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index c96fef88c2..6ea61d2ff8 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -1171,6 +1171,12 @@ legend { /* operator panel styles end */ +SPAN.playback_progress_bar { + background-color: #c43e42; + height: 1px; + display: inline-block; + } + diff --git a/themes/minimized/template.php b/themes/minimized/template.php index 1f00773901..7b9d16e018 100644 --- a/themes/minimized/template.php +++ b/themes/minimized/template.php @@ -1165,6 +1165,12 @@ legend { /* operator panel styles end */ +SPAN.playback_progress_bar { + background-color: #c43e42; + height: 1px; + display: inline-block; + } +
 ".$text['label-recording']."".$text['label-price']."
"; if (permission_exists('recording_play')) { - echo ""; + echo ""; echo "".$v_link_label_play.""; } if (permission_exists('recording_download')) { @@ -614,7 +627,7 @@ else { echo "