diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 21e33d7879..891c979370 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -359,7 +359,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo " ".$file."\n"; if (strlen($file) > 0) { $row_uuid = uuid(); - echo " "; + echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); @@ -430,7 +430,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo " ".$file."\n"; if (strlen($file) > 0) { $row_uuid = uuid(); - echo " "; + echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($row['recording_filename'], PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index ec418d0fda..a1c1430d3b 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -40,7 +40,7 @@ require_once "resources/check_auth.php"; $order = $_GET["order"]; //download the recordings - if ($_GET['a'] == "download" && permission_exists('recording_download')) { + if ($_GET['a'] == "download" && (permission_exists('recording_play') || permission_exists('recording_download'))) { session_cache_limiter('public'); if ($_GET['type'] = "rec") { if (file_exists($_SESSION['switch']['recordings']['dir'].'/'.base64_decode($_GET['filename']))) { @@ -157,7 +157,7 @@ require_once "resources/check_auth.php"; echo " \n"; echo " \n"; echo ""; - echo "
\n"; + echo "

\n"; if (permission_exists('recording_upload')) { echo "".$text['header'].""; @@ -228,7 +228,7 @@ require_once "resources/check_auth.php"; echo " "; echo " \n"; if (strlen($row['recording_filename']) > 0) { - echo " "; + echo " "; $recording_file_path = $row['recording_filename']; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index cff6b8c03f..0a1475c19d 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -328,7 +328,7 @@ else { echo " ".$row['greeting_name']."\n"; if (permission_exists('voicemail_greeting_download')) { if (strlen($row['greeting_name']) > 0) { - echo " "; + echo " "; $recording_file_path = $row['greeting_name']; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index 7b9f1b2ae0..522785e473 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -149,7 +149,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] echo "\n"; echo " ".$row['caller_id_name']." \n"; echo " ".$row['caller_id_number']." \n"; - echo " "; + echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index a283b7e0f3..c2aadf5aee 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -110,10 +110,10 @@ $text['label-duration']['pt-pt'] = "Duração"; $text['label-duration']['fr-fr'] = "Durée"; - $text['label-tools']['en-us'] = "Tools"; - $text['label-tools']['es-cl'] = "Herramientas"; - $text['label-tools']['pt-pt'] = "Ferramentas"; - $text['label-tools']['fr-fr'] = "Outils"; + $text['label-recording']['en-us'] = "Recording"; + $text['label-recording']['es-cl'] = "Grabación"; + $text['label-recording']['pt-pt'] = "Gravação"; + $text['label-recording']['fr-fr'] = "Enregistrement"; $text['label-play']['en-us'] = "Play"; $text['label-play']['es-cl'] = "Reproducir"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 52f309f1c7..9a409e10ec 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -75,7 +75,7 @@ else { //page title and description echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "
".$text['title']."


".$text['title']."


\n"; echo "
\n"; echo " \n"; @@ -319,7 +319,7 @@ else { echo "\n"; echo "\n"; echo "\n"; - if (permission_exists('xml_cdr_delete')) { + if (permission_exists('xml_cdr_delete') && $result_count > 0) { echo ""; } echo "\n"; @@ -329,7 +329,9 @@ else { 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); - echo "\n"; + if (permission_exists('recording_play') || permission_exists('recording_download')) { + echo "\n"; + } 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); echo th_order_by('duration', $text['label-duration'], $order_by, $order, null, "style='text-align: center;'", $param); @@ -346,7 +348,7 @@ else { echo th_order_by('hangup_cause', $text['label-status'], $order_by, $order, $param); if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { echo "\n"; @@ -385,47 +387,49 @@ else { $seconds = ($row['hangup_cause']=="ORIGINATOR_CANCEL") ? $row['duration'] : round(($row['billmsec'] / 1000), 0, PHP_ROUND_HALF_UP); //handle recordings - $tmp_dir = $_SESSION['switch']['recordings']['dir'].'/'.$path_mod.'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day; - $tmp_name = ''; - if(!empty($row['recording_file']) && file_exists($row['recording_file'])){ - $tmp_name=$row['recording_file']; - } - elseif (file_exists($tmp_dir.'/'.$row['uuid'].'.wav')) { - $tmp_name = $row['uuid'].".wav"; - } - elseif (file_exists($tmp_dir.'/'.$row['uuid'].'_1.wav')) { - $tmp_name = $row['uuid']."_1.wav"; - } - elseif (file_exists($tmp_dir.'/'.$row['uuid'].'.mp3')) { - $tmp_name = $row['uuid'].".mp3"; - } - elseif (file_exists($tmp_dir.'/'.$row['uuid'].'_1.mp3')) { - $tmp_name = $row['uuid']."_1.mp3"; - } - elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'.wav')) { - $tmp_name = $row['bridge_uuid'].".wav"; - } - elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'_1.wav')) { - $tmp_name = $row['bridge_uuid']."_1.wav"; - } - elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'.mp3')) { - $tmp_name = $row['bridge_uuid'].".mp3"; - } - elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'_1.mp3')) { - $tmp_name = $row['bridge_uuid']."_1.mp3"; - } - if (strlen($tmp_name) > 0 && file_exists($tmp_dir.'/'.$tmp_name) && $seconds > 0) { - $recording_file_path = '/'.$path_mod.'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name; - $recording_file_name = strtolower(pathinfo($tmp_name, PATHINFO_BASENAME)); - $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); - switch ($recording_file_ext) { - case "wav" : $recording_type = "audio/wav"; break; - case "mp3" : $recording_type = "audio/mpeg"; break; - case "ogg" : $recording_type = "audio/ogg"; break; + if (permission_exists('recording_play') || permission_exists('recording_download')) { + $tmp_dir = $_SESSION['switch']['recordings']['dir'].'/'.$path_mod.'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day; + $tmp_name = ''; + if(!empty($row['recording_file']) && file_exists($row['recording_file'])){ + $tmp_name=$row['recording_file']; + } + elseif (file_exists($tmp_dir.'/'.$row['uuid'].'.wav')) { + $tmp_name = $row['uuid'].".wav"; + } + elseif (file_exists($tmp_dir.'/'.$row['uuid'].'_1.wav')) { + $tmp_name = $row['uuid']."_1.wav"; + } + elseif (file_exists($tmp_dir.'/'.$row['uuid'].'.mp3')) { + $tmp_name = $row['uuid'].".mp3"; + } + elseif (file_exists($tmp_dir.'/'.$row['uuid'].'_1.mp3')) { + $tmp_name = $row['uuid']."_1.mp3"; + } + elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'.wav')) { + $tmp_name = $row['bridge_uuid'].".wav"; + } + elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'_1.wav')) { + $tmp_name = $row['bridge_uuid']."_1.wav"; + } + elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'.mp3')) { + $tmp_name = $row['bridge_uuid'].".mp3"; + } + elseif (file_exists($tmp_dir.'/'.$row['bridge_uuid'].'_1.mp3')) { + $tmp_name = $row['bridge_uuid']."_1.mp3"; + } + if (strlen($tmp_name) > 0 && file_exists($tmp_dir.'/'.$tmp_name) && $seconds > 0) { + $recording_file_path = '/'.$path_mod.'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name; + $recording_file_name = strtolower(pathinfo($tmp_name, PATHINFO_BASENAME)); + $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); + switch ($recording_file_ext) { + case "wav" : $recording_type = "audio/wav"; break; + case "mp3" : $recording_type = "audio/mpeg"; break; + case "ogg" : $recording_type = "audio/ogg"; break; + } + } + else { + unset($recording_file_path); } - } - else { - unset($recording_file_path); } if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { @@ -509,18 +513,22 @@ else { echo " \n"; echo " \n"; - if ($recording_file_path != '') { - echo " \n"; + } + else { + echo " \n"; + } } - else { - echo " \n"; - echo " \n"; echo " \n"; diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index d88c711ae4..4aea7b0c71 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -450,6 +450,16 @@ table.tr_hover tr:hover td a { white-space: nowrap; } +.row_style_hor_mir_grad { + background: -moz-linear-gradient(left, #e5e9f0 0%, #ffffff 25%, #ffffff 75%, #e5e9f0 100%); + background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e5e9f0), color-stop(25%,#ffffff), color-stop(75%,#ffffff), color-stop(100%,#e5e9f0)); + background: -webkit-linear-gradient(left, #e5e9f0 0%,#ffffff 25%,#ffffff 75%,#e5e9f0 100%); + background: -o-linear-gradient(left, #e5e9f0 0%,#ffffff 25%,#ffffff 75%,#e5e9f0 100%); + background: -ms-linear-gradient(left, #e5e9f0 0%,#ffffff 25%,#ffffff 75%,#e5e9f0 100%); + background: linear-gradient(to right, #e5e9f0 0%,#ffffff 25%,#ffffff 75%,#e5e9f0 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e9f0', endColorstr='#e5e9f0',GradientType=1 ); + } + .row_stylebg { border-bottom: 1px solid #b9c5d8; background-color: #f0f2f6; diff --git a/themes/minimized/template.php b/themes/minimized/template.php index 8f10dd2ba1..a57cbf5af3 100644 --- a/themes/minimized/template.php +++ b/themes/minimized/template.php @@ -450,6 +450,16 @@ table.tr_hover tr:hover td a { white-space: nowrap; } +.row_style_hor_mir_grad { + background: -moz-linear-gradient(left, #e5e9f0 0%, #fff 25%, #fff 75%, #e5e9f0 100%); + background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e5e9f0), color-stop(25%,#fff), color-stop(75%,#fff), color-stop(100%,#e5e9f0)); + background: -webkit-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%); + background: -o-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%); + background: -ms-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%); + background: linear-gradient(to right, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e9f0', endColorstr='#e5e9f0',GradientType=1 ); + } + .row_stylebg { border-bottom: 1px solid #b9c5d8; background-color: #f0f2f6;
 ".$text['label-tools']."".$text['label-recording'].""; - if (permission_exists('xml_cdr_delete')) { + if (permission_exists('xml_cdr_delete') && $result_count > 0) { echo "".$v_link_label_delete.""; } echo " "; - echo " "; - } - echo " ".$tmp_start_epoch."".(($row['tta'] > 0) ? $row['tta']."s" : " ")."