mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Bugfixes (#5949)
* Added missing parameter to send_email() * Preserving the call-center queue_record_template value when saving * Removed unused declarations using the commented-out $last_offered_call * Fix for redirecting to previous page after login, if set * Removed duplicate bugfix in /resources/login.php
This commit is contained in:
@@ -219,14 +219,6 @@
|
||||
$talk_time = $agent_row['talk_time'];
|
||||
$ready_time = $agent_row['ready_time'];
|
||||
|
||||
$last_offered_call_seconds = time() - $last_offered_call;
|
||||
$last_offered_call_length_hour = floor($last_offered_call_seconds/3600);
|
||||
$last_offered_call_length_min = floor($last_offered_call_seconds/60 - ($last_offered_call_length_hour * 60));
|
||||
$last_offered_call_length_sec = $last_offered_call_seconds - (($last_offered_call_length_hour * 3600) + ($last_offered_call_length_min * 60));
|
||||
$last_offered_call_length_min = sprintf("%02d", $last_offered_call_length_min);
|
||||
$last_offered_call_length_sec = sprintf("%02d", $last_offered_call_length_sec);
|
||||
$last_offered_call_length = $last_offered_call_length_hour.':'.$last_offered_call_length_min.':'.$last_offered_call_length_sec;
|
||||
|
||||
$last_status_change_seconds = time() - $last_status_change;
|
||||
$last_status_change_length_hour = floor($last_status_change_seconds/3600);
|
||||
$last_status_change_length_min = floor($last_status_change_seconds/60 - ($last_status_change_length_hour * 60));
|
||||
@@ -394,4 +386,4 @@
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
||||
@@ -877,7 +877,7 @@
|
||||
$record_template = $_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.\${record_ext}";
|
||||
echo " <select class='formfld' name='queue_record_template'>\n";
|
||||
if (strlen($queue_record_template) > 0) {
|
||||
echo " <option value='".escape($record_template)."' selected='selected' >".$text['option-true']."</option>\n";
|
||||
echo " <option value='".escape($queue_record_template)."' selected='selected' >".$text['option-true']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='".escape($record_template)."'>".$text['option-true']."</option>\n";
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
$email_body = str_replace('${domain}', $domain_name, $email_body);
|
||||
|
||||
//send reset link
|
||||
if (send_email($email, $email_subject, $email_body)) {
|
||||
if (send_email($email, $email_subject, $email_body, $eml_error)) {
|
||||
//email sent
|
||||
message::add($text['message-reset_link_sent'], 'positive', 2500);
|
||||
}
|
||||
@@ -242,6 +242,11 @@
|
||||
//set variable if not set
|
||||
if (!isset($_SESSION['login']['domain_name_visible']['boolean'])) { $_SESSION['login']['domain_name_visible']['boolean'] = null; }
|
||||
|
||||
//set the requested destination after login
|
||||
if (!empty($_REQUEST['path'])) {
|
||||
$_SESSION['login']['destination']['url'] = $_REQUEST['path'];
|
||||
}
|
||||
|
||||
//set a default login destination
|
||||
if (strlen($_SESSION['login']['destination']['url']) == 0) {
|
||||
$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/user_settings/user_dashboard.php";
|
||||
|
||||
Reference in New Issue
Block a user