nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 09:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voicemail: Fixes to Greeting select box. Bypass browser password manager pop-up when saving.

Browse Source
This commit is contained in:
reliberate
2016-02-25 14:39:28 -07:00
parent 8da349c3e9
commit 3b327be2dd
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/voicemails/voicemail_edit.php
View File

@@ -141,9 +141,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "voicemail_uuid, ";
$sql .= "voicemail_id, ";
$sql .= "voicemail_password, ";
if (strlen($greeting_id) > 0) {
$sql .= "greeting_id, ";
}
$sql .= "greeting_id, ";
$sql .= "voicemail_mail_to, ";
$sql .= "voicemail_file, ";
$sql .= "voicemail_local_after_email, ";
@@ -156,9 +154,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'".uuid()."', ";
$sql .= "'".$voicemail_id."', ";
$sql .= "'".$voicemail_password."', ";
if (strlen($greeting_id) > 0) {
$sql .= "'".$greeting_id."', ";
}
$sql .= (($greeting_id != '') ? "'".$greeting_id."'" : 'null').", ";
$sql .= "'".$voicemail_mail_to."', ";
$sql .= "'".$voicemail_file."', ";
$sql .= "'".$voicemail_local_after_email."', ";
@@ -175,12 +171,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql = "update v_voicemails set ";
$sql .= "voicemail_id = '".$voicemail_id."', ";
$sql .= "voicemail_password = '".$voicemail_password."', ";
if (strlen($greeting_id) > 0) {
$sql .= "greeting_id = '".$greeting_id."', ";
}
else {
$sql .= "greeting_id = null, ";
}
$sql .= "greeting_id = ".(($greeting_id != '') ? "'".$greeting_id."'" : 'null').", ";
$sql .= "voicemail_mail_to = '".$voicemail_mail_to."', ";
$sql .= "voicemail_file = '".$voicemail_file."', ";
$sql .= "voicemail_local_after_email = '".$voicemail_local_after_email."', ";
@@ -294,6 +285,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$greetings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
echo "<pre>".print_r($greetings, true)."</pre><br><br>";
$greeting_count = count($greetings);
unset ($prep_statement, $sql);
@@ -302,7 +294,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$document['title'] = $text['title-voicemail'];
//show the content
echo "<form method='post' name='frm' action=''>\n";
echo "<form method='post' name='frm' id='frm' action=''>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td align='left' width='30%' nowrap='nowrap' valign='top'>";
@@ -311,7 +303,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n";
echo "<td width='70%' align='right' valign='top'>\n";
echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"javascript:history.back();\" value='".$text['button-back']."'>\n";
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo " <input type='button' class='btn' value='".$text['button-save']."' onclick='submit_form();'>\n";
echo "</td>\n";
echo "</tr>\n";
@@ -346,8 +338,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value=''></option>\n";
if ($greeting_count > 0) {
foreach ($greetings as $greeting) {
$selected = ($greeting['id'] == $greeting_id) ? 'selected' : null;
echo "<option value='".$greeting['id']."' ".$selected.">".$greeting['greeting_name']."</option>\n";
$selected = ($greeting['greeting_id'] == $greeting_id) ? 'selected' : null;
echo "<option value='".$greeting['greeting_id']."' ".$selected.">".$greeting['greeting_name']."</option>\n";
}
}
echo " </select>\n";
@@ -445,7 +437,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n";
echo " <td>\n";
echo " <input type='submit' class='btn' value=\"".$text['button-add']."\">\n";
echo " <input type='button' class='btn' value=\"".$text['button-add']."\" onclick='submit_form();'>\n";
echo " </td>\n";
echo " </tr>\n";
}
@@ -562,7 +554,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='".$field['voicemail_uuid']."'>".$field['voicemail_id']."</option>\n";
}
echo " </select>";
echo " <input type=\"submit\" class='btn' value=\"".$text['button-add']."\">\n";
echo " <input type='button' class='btn' value=\"".$text['button-add']."\" onclick='submit_form();'>\n";
unset($sql, $result);
echo " <br>\n";
echo " ".$text['description-forward_destinations']."\n";
@@ -614,13 +606,26 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <input type='hidden' name='referer_path' value='".$http_referer['path']."'>\n";
echo " <input type='hidden' name='referer_query' value='".$http_referer['query']."'>\n";
echo " <br>";
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo " <input type='button' class='btn' value='".$text['button-save']."' onclick='submit_form();'>\n";
echo " </td>\n";
echo " </tr>";
echo "</table>";
echo "<br><br>";
echo "</form>";
echo "<script>\n";
//capture enter key to submit form
echo " $(window).keypress(function(event){\n";
echo " if (event.which == 13) { submit_form(); }\n";
echo " });\n";
// convert password fields to
echo " function submit_form() {\n";
echo " $('input:password').css('visibility','hidden');\n";
echo " $('input:password').attr({type:'text'});\n";
echo " $('form#frm').submit();\n";
echo " }\n";
echo "</script>\n";
//include the footer
require_once "resources/footer.php";
?>