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

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

Browse Source
This commit is contained in:
markjcrane
2016-03-03 14:04:32 -07:00
parent d8af09ced7 2230a6710d
commit 768347451d
4 changed files with 43 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/call_centers/call_center_agent_edit.php
View File

@@ -140,37 +140,21 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//add the call_timeout and confirm
$agent_contact = $first.',call_timeout='.$agent_call_timeout.$last;
$agent_contact = "{".$confirm.",call_timeout=".$agent_call_timeout.",sip_invite_domain=".$_SESSION['domain_name']."}".$agent_contact;
echo "\n\n".$agent_contact."\n\n";
}
}
else {
//found
$position = strrpos($agent_contact, "}");
$first = substr($agent_contact, 0, $position);
$last = substr($agent_contact, $position);
//add call_timeout and sip_invite_domain, only if missing
$call_timeout = (stristr($agent_contact, 'call_timeout') === FALSE) ? ',call_timeout='.$agent_call_timeout : null;
$sip_invite_domain = (stristr($agent_contact, 'sip_invite_domain') === FALSE) ? ',sip_invite_domain='.$_SESSION['domain_name'] : null;
//compose
if(stristr($agent_contact, 'sofia/gateway') === FALSE) {
//not found
$position = strrpos($agent_contact, "}");
$first = substr($agent_contact, 0, $position);
$last = substr($agent_contact, $position);
if(stristr($agent_contact, 'call_timeout') === FALSE) {
$call_timeout = ',call_timeout='.$agent_call_timeout;
}
else {
$call_timeout = '';
}
$agent_contact = $first.',sip_invite_domain='.$_SESSION['domain_name'].$call_timeout.$last;
$agent_contact = $first.$sip_invite_domain.$call_timeout.$last;
}
else {
//found
$position = strrpos($agent_contact, "}");
$first = substr($agent_contact, 0, $position);
$last = substr($agent_contact, $position);
if(stristr($agent_contact, 'call_timeout') === FALSE) {
//add the call_timeout and confirm
$agent_contact = $first.','.$confirm.',sip_invite_domain='.$_SESSION['domain_name'].'call_timeout='.$agent_call_timeout.$last;
}
else {
//add confirm
$agent_contact = $first.',sip_invite_domain='.$_SESSION['domain_name'].','.$confirm.$last;
}
$agent_contact = $first.','.$confirm.$sip_invite_domain.$call_timeout.$last;
}
}

7
app/dialplan_outbound/dialplan_outbound_add.php
View File

@@ -420,7 +420,12 @@ else {
$dialplan_detail_tag = 'action'; //condition, action, antiaction
$dialplan_detail_type = 'set';
$dialplan_detail_data = 'effective_caller_id_name=${outbound_caller_id_name}';
if ($dialplan_expression == '^(911)$') {
$dialplan_detail_data = 'effective_caller_id_name=${emergency_caller_id_name}';
}
else {
$dialplan_detail_data = 'effective_caller_id_name=${outbound_caller_id_name}';
}
$dialplan_detail_order = '030';
$dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);

33
core/users/user_setting_delete.php
View File

@@ -38,26 +38,29 @@ else {
$language = new text;
$text = $language->get();
//get the variables
if (count($_GET)>0) {
$id = check_str($_GET["id"]);
$user_uuid = check_str($_GET["user_uuid"]);
}
//delete user settings
$user_setting_uuids = $_REQUEST["id"];
$user_uuid = check_str($_REQUEST["user_uuid"]);
//delete the record
if (strlen($id) > 0) {
//delete user_setting
if (sizeof($user_setting_uuids) > 0) {
foreach ($user_setting_uuids as $user_setting_uuid) {
$sql = "delete from v_user_settings ";
$sql .= "where user_uuid = '$user_uuid' ";
$sql .= "and user_setting_uuid = '$id' ";
$sql .= "where user_uuid = '".$user_uuid."' ";
$sql .= "and user_setting_uuid = '".$user_setting_uuid."' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset($sql);
unset ($prep_statement, $sql);
}
// set message
$_SESSION["message"] = $text['message-delete'].": ".sizeof($user_setting_uuids);
}
else {
// set message
$_SESSION["message"] = $text['message-delete_failed'];
$_SESSION["message_mood"] = "negative";
}
//redirect the user
$_SESSION["message"] = $text['message-delete'];
header("Location: usersupdate.php?id=".$user_uuid);
return;
header("Location: usersupdate.php?id=".check_str($_REQUEST["user_uuid"]));
exit;
?>

52
core/users/user_settings.php
View File

@@ -34,15 +34,12 @@ else {
exit;
}
//toggle setting enabled
if (sizeof($_REQUEST) > 1) {
$user_uuid = check_str($_REQUEST["user_id"]);
$user_setting_uuids = $_REQUEST["id"];
$enabled = check_str($_REQUEST['enabled']);
if (sizeof($_REQUEST) > 1) {
$action = check_str($_REQUEST["action"]);
$user_uuid = check_str($_REQUEST["user_id"]);
$user_setting_uuids = $_REQUEST["id"];
$enabled = check_str($_REQUEST['enabled']);
//change enabled value
if ($user_uuid != '' && sizeof($user_setting_uuids) == 1 && $enabled != '') {
$sql = "update v_user_settings set ";
$sql .= "user_setting_enabled = '".$enabled."' ";
@@ -56,35 +53,7 @@ if (sizeof($_REQUEST) > 1) {
header("Location: usersupdate.php?id=".$user_uuid);
exit;
}
//delete user settings
if ($action == 'delete' && permission_exists('user_setting_delete')) {
//add multi-lingual support
$language = new text;
$text = $language->get();
if (sizeof($user_setting_uuids) > 0) {
foreach ($user_setting_uuids as $user_setting_uuid) {
$sql = "delete from v_user_settings ";
$sql .= "where user_setting_uuid = '".$user_setting_uuid."' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset ($prep_statement, $sql);
}
// set message
$_SESSION["message"] = $text['message-delete'].": ".sizeof($user_setting_uuids);
}
else {
// set message
$_SESSION["message"] = $text['message-delete_failed'];
$_SESSION["message_mood"] = "negative";
}
header("Location: usersupdate.php?id=".check_str($_REQUEST["user_uuid"]));
exit;
}
} //REQUEST
}
//include the paging
require_once "resources/paging.php";
@@ -94,8 +63,7 @@ if (sizeof($_REQUEST) > 1) {
$order = check_str($_GET["order"]);
//show the content
echo "<form name='user_frm' id='user_frm' method='GET' action='user_settings.php'>";
echo "<input type='hidden' name='action' id='action' value=''>";
echo "<form name='frm_settings' id='frm_settings' method='get' action='user_setting_delete.php'>";
echo "<input type='hidden' name='user_uuid' value='".$user_uuid."'>";
//prepare to page the results
@@ -187,7 +155,7 @@ if (sizeof($_REQUEST) > 1) {
echo "<a href='user_setting_edit.php?user_setting_category=".urlencode($row['user_setting_category'])."&user_uuid=".check_str($_GET['id'])."' alt='".$text['button-add']."'>".$v_link_label_add."</a>";
}
if (permission_exists('user_setting_delete')) {
echo "<a href='javascript:void(0);' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('action').value = 'delete'; document.forms.user_frm.submit(); }\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
echo "<a href='javascript:void(0);' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm_settings').submit(); }\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
}
echo "</td>\n";
echo "</tr>\n";
@@ -246,7 +214,7 @@ if (sizeof($_REQUEST) > 1) {
echo "<a href='user_setting_edit.php?user_uuid=".$row['user_uuid']."&id=".$row['user_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
}
if (permission_exists('user_setting_delete')) {
echo "<a href='user_settings.php?user_uuid=".$row['user_uuid']."&id[]=".$row['user_setting_uuid']."&action=delete' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
echo "<a href='user_setting_delete.php?user_uuid=".$row['user_uuid']."&id[]=".$row['user_setting_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
}
echo " </td>\n";
echo "</tr>\n";
@@ -267,7 +235,7 @@ if (sizeof($_REQUEST) > 1) {
echo "<a href='user_setting_edit.php?user_uuid=".check_str($_GET['id'])."' alt='".$text['button-add']."'>$v_link_label_add</a>";
}
if (permission_exists('user_setting_delete') && $result_count > 0) {
echo "<a href='javascript:void(0);' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('action').value = 'delete'; document.getElementById('user_frm').submit(); }\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
echo "<a href='javascript:void(0);' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm_settings').submit(); }\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
}
echo " </td>\n";
echo " </tr>\n";