diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php index 724c1a369a..43f23c3b08 100644 --- a/app/phrases/app_defaults.php +++ b/app/phrases/app_defaults.php @@ -109,6 +109,9 @@ if ($domains_processed == 1) { foreach ($result as &$row) { $phrase_detail_uuid = $row['phrase_detail_uuid']; $phrase_detail_data = $row['phrase_detail_data']; + if (substr_count($phrase_detail_data, $_SESSION['switch']['recordings']['dir']) > 0) { + $phrase_detail_data = str_replace($_SESSION['switch']['recordings']['dir'].'/', '', $phrase_detail_data); + } //update function and data to be base64 compatible $phrase_detail_data = "lua(streamfile.lua ".$phrase_detail_data.")"; $sql = "update v_phrase_details set "; @@ -137,6 +140,9 @@ if ($domains_processed == 1) { //update function and data to use standard method $phrase_detail_data = str_replace('lua(streamfile.lua ', '', $phrase_detail_data); $phrase_detail_data = str_replace(')', '', $phrase_detail_data); + if (substr_count($phrase_detail_data, '/') === 0) { + $phrase_detail_data = $_SESSION['switch']['recordings']['dir'].'/'.$phrase_detail_data; + } $sql = "update v_phrase_details set "; $sql .= "phrase_detail_function = 'play-file', "; $sql .= "phrase_detail_data = '".$phrase_detail_data."' "; diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php index b048515d99..fa42452439 100644 --- a/app/phrases/phrase_edit.php +++ b/app/phrases/phrase_edit.php @@ -305,7 +305,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "opt_group.appendChild(new Option(\"".$row["recording_name"]."\", \"lua(streamfile.lua ".$row["recording_filename"].")\"));\n"; } else { - echo "opt_group.appendChild(new Option(\"".$row["recording_name"]."\", \"".$row["recording_filename"]."\"));\n"; + echo "opt_group.appendChild(new Option(\"".$row["recording_name"]."\", \"".$_SESSION['switch']['recordings']['dir'].'/'.$row["recording_filename"]."\"));\n"; } } echo "obj_action.appendChild(opt_group);\n"; @@ -470,7 +470,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } if ($field['phrase_detail_function'] == 'play-file') { $phrase_detail_function = $text['label-play']; - $phrase_detail_data = $field['phrase_detail_data']; + $phrase_detail_data = str_replace($_SESSION['switch']['recordings']['dir'].'/', '', $field['phrase_detail_data']); } echo "\n"; echo " ".$phrase_detail_function." \n"; diff --git a/resources/install/scripts/streamfile.lua b/resources/install/scripts/streamfile.lua index c5093729c9..377974dae7 100644 --- a/resources/install/scripts/streamfile.lua +++ b/resources/install/scripts/streamfile.lua @@ -134,7 +134,7 @@ session:answer(); slept = session:getVariable("slept"); if (slept == nil or slept == "false") then - freeswitch.consoleLog("notice", "[ivr_menu] sleeping....\n"); + freeswitch.consoleLog("notice", "[ivr_menu] sleeping (1s)\n"); session:sleep(1000); if (slept == "false") then session:setVariable("slept", "true");