From ef8dc3d7bf105ed944a577ae84d50ffaf52a9508 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 28 Sep 2015 16:07:34 +0000 Subject: [PATCH] Fixed issue with API transfers and dial_override flag Change to Agent API to allow * and # in phone_number field git-svn-id: svn://192.168.202.10@2387 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/agc/api.php | 8 +++++--- www/agc/vicidial.php | 11 +++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/www/agc/api.php b/www/agc/api.php index 3de9dd51..1b6173d6 100644 --- a/www/agc/api.php +++ b/www/agc/api.php @@ -83,9 +83,11 @@ # 150429-1717 - Added user allowed function restrictions # 150512-2027 - Added filtering of hash sign on some input variables, Issue #851 # 150626-2120 - Modified mysqli_error() to mysqli_connect_error() where appropriate +# 150928-1157 - Fix allowing for * and # in phone_number field +# -$version = '2.12-49'; -$build = '150626-2120'; +$version = '2.12-50'; +$build = '150928-1157'; $startMS = microtime(); @@ -277,7 +279,7 @@ if ($non_latin < 1) $ingroup_choices = preg_replace("/[^- \_0-9a-zA-Z]/","",$ingroup_choices); $set_as_default = preg_replace("/[^A-Z]/","",$set_as_default); $phone_code = preg_replace("/[^0-9X]/","",$phone_code); - $phone_number = preg_replace("/[^0-9]/","",$phone_number); + $phone_number = preg_replace("/[^\*#0-9]/","",$phone_number); $lead_id = preg_replace("/[^0-9]/","",$lead_id); $vendor_id = preg_replace('/;|#/','',$vendor_id); $vendor_id = preg_replace('/\+/',' ',$vendor_id); diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 1b63d0ea..3c370621 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -500,10 +500,11 @@ # 150909-0212 - Fixed MDlogEPOCH variable issue #882 # 150917-0926 - Added dynamic default field maxlengths based on DB schema # 150923-1952 - Added DID custum fields as web and form variables +# 150928-1205 - Fixed issue with API transfers and dial_override flag # -$version = '2.12-472c'; -$build = '150923-1952'; +$version = '2.12-473c'; +$build = '150928-1205'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=85; $one_mysql_log=0; @@ -5202,6 +5203,10 @@ function set_length(SLnumber,SLlength_goal,SLdirection) {leave_3way_call('FIRST');} if (api_transferconf_function == 'BLIND_TRANSFER') { + if (api_transferconf_override=='YES') + {document.vicidial_form.xferoverride.checked=true;} + if (api_transferconf_override=='NO') + {document.vicidial_form.xferoverride.checked=false;} document.vicidial_form.xfernumber.value = api_transferconf_number; mainxfer_send_redirect('XfeRBLIND',lastcustchannel,lastcustserverip); } @@ -5221,6 +5226,8 @@ function set_length(SLnumber,SLlength_goal,SLdirection) {document.vicidial_form.consultativexfer.checked=false;} if (api_transferconf_override=='YES') {document.vicidial_form.xferoverride.checked=true;} + if (api_transferconf_override=='NO') + {document.vicidial_form.xferoverride.checked=false;} API_selected_xfergroup = api_transferconf_group; document.vicidial_form.xfernumber.value = api_transferconf_number; active_group_alias = api_transferconf_group_alias;