Voicemail: Fix an issue with the Back button on Voicemail Greetings page.

This commit is contained in:
reliberate
2016-07-01 02:53:01 -06:00
parent 0d549fe368
commit 5f33e2b592
3 changed files with 11 additions and 8 deletions

View File

@@ -39,6 +39,9 @@ require_once "resources/check_auth.php";
$order_by = check_str($_GET["order_by"]);
$order = check_str($_GET["order"]);
//set the back button url
$_SESSION['back'][$_SERVER['PHP_SELF']] = ($_GET['back'] != '') ? urldecode($_GET['back']) : $_SESSION['back'][$_SERVER['PHP_SELF']];
//define order by default
if ($order_by == '') {
$order_by = "greeting_name";
@@ -326,14 +329,14 @@ require_once "resources/check_auth.php";
echo " <br><br>\n";
echo " ".$text['description']." <strong>".$voicemail_id."</strong>\n";
echo " </td>";
echo " <td align='right' nowrap valign='top'>\n";
echo " <input type='button' class='btn' name='' alt='back' onclick=\"window.location='".$_SESSION['back'][$_SERVER['PHP_SELF']]."';\" value='".$text['button-back']."'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\n";
if (permission_exists('voicemail_greeting_upload')) {
echo " <td align='right' nowrap valign='top'>\n";
echo " <input type='button' class='btn' name='' alt='back' onclick=\"window.location='".PROJECT_PATH."/app/voicemails/voicemails.php';\" value='".$text['button-back']."'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\n";
echo " <input name='file' type='file' class='formfld fileinput' id='file'>\n";
echo " <input name='type' type='hidden' value='rec'>\n";
echo " <input name='submit' type='submit' class='btn' id='upload' value=\"".$text['button-upload']."\">\n";
echo " </td>\n";
echo " <input name='file' type='file' class='formfld fileinput' id='file'>\n";
echo " <input name='type' type='hidden' value='rec'>\n";
echo " <input name='submit' type='submit' class='btn' id='upload' value=\"".$text['button-upload']."\">\n";
}
echo " </td>\n";
echo " </tr>";
echo "</table>\n";
echo "<br />\n";

View File

@@ -114,7 +114,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
echo " <td colspan='".(($_SESSION['voicemail']['storage_type']['text'] != 'base64') ? 3 : 2)."' valign='bottom' align='right'>\n";
echo " <input type='button' class='btn' alt='".$text['button-toggle']."' onclick=\"$('#frm').attr('action', 'voicemail_message_toggle.php').submit();\" value='".$text['button-toggle']."'>\n";
if (permission_exists('voicemail_greeting_view')) {
echo " <input type='button' class='btn' alt='".$text['button-greetings']."' onclick=\"document.location.href='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$field['voicemail_id']."'\" value='".$text['button-greetings']."'>\n";
echo " <input type='button' class='btn' alt='".$text['button-greetings']."' onclick=\"document.location.href='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$field['voicemail_id']."&back=".urlencode($_SERVER["REQUEST_URI"])."'\" value='".$text['button-greetings']."'>\n";
}
if (permission_exists('voicemail_edit')) {
echo " <input type='button' class='btn' alt='".$text['button-settings']."' onclick=\"document.location.href='voicemail_edit.php?id=".$field['voicemail_uuid']."'\" value='".$text['button-settings']."'>\n";

View File

@@ -200,7 +200,7 @@ else {
echo " <a href='voicemail_messages.php?id=".$row['voicemail_uuid']."'>".$text['label-messages']."</a>&nbsp;&nbsp;\n";
}
if (permission_exists('voicemail_greeting_view')) {
echo " <a href='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$row['voicemail_id']."'>".$text['label-greetings']."</a>\n";
echo " <a href='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$row['voicemail_id']."&back=".urlencode($_SERVER["REQUEST_URI"])."'>".$text['label-greetings']."</a>\n";
}
echo " </td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$text['label-'.$row['voicemail_enabled']]."&nbsp;</td>\n";