From 837c6f02f161079b76f2a98a22eee31b60e1c1bb Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 12 Dec 2019 16:51:12 -0700 Subject: [PATCH] Voicemail Greetings: Show greeting Size for base64 storage. --- .../voicemail_greetings.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 39481b14c1..9d74304b59 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -381,7 +381,13 @@ } //get the greetings list - $sql = "select * from v_voicemail_greetings "; + if ($_SESSION['voicemail']['storage_type']['text'] == 'base64') { + switch ($db_type) { + case 'pgsql': $sql_file_size = ", length(decode(greeting_base64,'base64')) as greeting_size "; break; + case 'mysql': $sql_file_size = ", length(from_base64(greeting_base64)) as greeting_size "; break; + } + } + $sql = "select * ".$sql_file_size." from v_voicemail_greetings "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and voicemail_id = :voicemail_id "; $sql .= order_by($order_by, $order); @@ -468,10 +474,11 @@ echo "".$text['label-tools']."\n"; $col_count++; } + echo "".$text['label-size']."\n"; + $col_count++; if ($_SESSION['voicemail']['storage_type']['text'] != 'base64') { - echo "".$text['label-size']."\n"; echo "".$text['label-uploaded']."\n"; - $col_count += 2; + $col_count++; } echo th_order_by('greeting_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn pct-25'", "id=".urlencode($voicemail_id)); if (permission_exists('voicemail_greeting_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { @@ -532,7 +539,11 @@ } echo " \n"; } - if ($_SESSION['voicemail']['storage_type']['text'] != 'base64') { + if ($_SESSION['voicemail']['storage_type']['text'] == 'base64') { + $file_size = byte_convert($row['greeting_size']); + echo " ".$file_size."\n"; + } + else { $file_size = byte_convert(filesize($v_greeting_dir.'/'.$row['greeting_filename'])); $file_date = date("M d, Y H:i:s", filemtime($v_greeting_dir.'/'.$row['greeting_filename'])); echo " ".$file_size."\n";