ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DID related fixes

Browse Source 
added presets to webforms and script as allowed variables

git-svn-id: svn://192.168.202.10@1307 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2010-01-16 14:32:00 +00:00
parent 7036a53e18
commit bcac242cda
14 changed files with 1658 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/branches/agc_2.2.0/agi/agi-DID_route.agi
+27 -20
View File
@@ -6,11 +6,12 @@
# send the calls to various places depending on the settings for each DID.
#
#
# You need to put a line similar to this below in your extensions.conf file:
# You need to put a line similar to this below in your extensions.conf file in
# the context for where incoming calls go from your trunks:
# ;inbound DID catch-all:
#exten => _X.,1,AGI(agi-DID_route.agi)
#
# Copyright (C) 2009 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2010 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# changes:
# 81007-0324 - First Build
@@ -20,6 +21,7 @@
# 90507-1145 - Added CALLMENU option
# 90825-2252 - Changed PHONE to route using dialplan number
# 91122-0743 - Added QueueMetrics logging as DID INFO entries
# 100116-0631 - Logging bug fixes
#
$script = 'agi-DID_route.agi';
@@ -44,10 +46,10 @@ $now_date_epoch = time();
$now_date = "$year-$mon-$mday $hour:$min:$sec";
$CLInow_date = "$year-$mon-$mday\\ $hour:$min:$sec";
$start_time=$now_date;
$CIDdate = "$mon$mday$hour$min$sec";
$tsSQLdate = "$year$mon$mday$hour$min$sec";
$SQLdate = "$year-$mon-$mday $hour:$min:$sec";
$SQLdateBEGIN = $SQLdate;
$CIDdate = "$mon$mday$hour$min$sec";
$tsSQLdate = "$year$mon$mday$hour$min$sec";
$SQLdate = "$year-$mon-$mday $hour:$min:$sec";
$SQLdateBEGIN = $SQLdate;
# default path to astguiclient configuration file:
$PATHconf = '/etc/astguiclient.conf';
@@ -174,6 +176,7 @@ if ( (!$callerid) or ($callerid =~ /unknown/) )
### Grab DID values from the database
$DIDs_in_system=0;
$stmtA = "SELECT did_id,did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,menu_id FROM vicidial_inbound_dids where did_pattern = '$extension' and did_active='Y';";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -195,24 +198,19 @@ if ($sthArows > 0)
$user_unavailable_action = $aryA[11];
$user_route_settings_ingroup = $aryA[12];
$menu_id = $aryA[13];
$DIDs_in_system++;
}
$sthA->finish();
$stmtA = "INSERT INTO vicidial_did_log SET uniqueid='$uniqueid',channel='$channel',server_ip='$VARserver_ip',caller_id_number='$callerid',caller_id_name='$calleridname',extension='$extension',call_date='$SQLdate',did_id='$did_id',did_route='$did_route';";
if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;}
$affected_rowsL = $dbhA->do($stmtA);
if ($AGILOG) {$agi_string = "-- DID LOG : |$affected_rowsL|$stmtA|"; &agi_output;}
if ($AGILOG) {$did_string = "$SQLdate|$uniqueid|$channel|$extension|$callerid|$calleridname|$did_id|$did_route|"; &did_output;}
if ($sthArows < 1)
{
### Grab DID values from the database for a default DID pattern if there is one
$stmtA = "SELECT did_id,did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,menu_id FROM vicidial_inbound_dids where did_pattern = 'default' and did_active='Y';";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$sthArows=$sthA->rows;
if ($sthArows > 0)
$DIDs_in_system=$sthA->rows;
if ($DIDs_in_system > 0)
{
@aryA = $sthA->fetchrow_array;
$did_id = $aryA[0];
@@ -231,12 +229,21 @@ if ($sthArows < 1)
$menu_id = $aryA[13];
}
$sthA->finish();
}
if ($sthArows < 1)
{
### if nothing found, exit script
exit;
}
### Log the call
$stmtA = "INSERT INTO vicidial_did_log SET uniqueid='$uniqueid',channel='$channel',server_ip='$VARserver_ip',caller_id_number='$callerid',caller_id_name='$calleridname',extension='$extension',call_date='$SQLdate',did_id='$did_id',did_route='$did_route';";
if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;}
$affected_rowsL = $dbhA->do($stmtA);
if ($AGILOG) {$agi_string = "-- DID LOG : |$affected_rowsL|$stmtA|"; &agi_output;}
if ($AGILOG) {$did_string = "$SQLdate|$uniqueid|$channel|$extension|$callerid|$calleridname|$did_id|$did_route|"; &did_output;}
if ($DIDs_in_system < 1)
{
### if nothing found, exit script
if ($AGILOG) {$did_string = "NO default DID DEFINED! EXITING... $SQLdate|$uniqueid|$channel|$extension|$callerid|$calleridname|"; &did_output;}
exit;
}
### Grab Server values from the database
agc_2-X/branches/agc_2.2.0/docs/conf_examples/extensions.conf.sample
+27 -16
View File
@@ -176,26 +176,37 @@ exten => _9119XXXXXXXX,1,Dial(${TRUNKblind}/9998819112,55,to)
; exten => _91NXXNXXXXXX,3,Hangup
; special extensions for North America to catch invalid phone numbers
; exten => _91XXX[0-1]XXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXX[0-1]XXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXX[0-1]XXXXXX,3,Hangup
; exten => _91XXX[0-1]XXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXX[0-1]XXXXXX,n,Hangup
; exten => _91[0-1]XXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91[0-1]XXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91[0-1]XXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXX,3,Hangup
; exten => _91[0-1]XXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91[0-1]XXXXXXXXX,n,Hangup
; exten => _91XXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXX,n,Hangup
; exten => _91XXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXX,n,Hangup
; exten => _91XXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXX,3,Hangup
; exten => _91XXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXX,n,Hangup
; exten => _91XXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXX,n,Hangup
; exten => _91XXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXX,n,Hangup
; exten => _91XXXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXX,n,Hangup
; exten => _91XXXXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXXX,n,Hangup
; dial a USA long distance outbound number through the loopback-no-log context
; exten => _91NXXNXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91NXXNXXXXXX,2,Dial(${TRUNKloop}/888${EXTEN:2},55,o)
; exten => _91NXXNXXXXXX,3,Hangup
;exten => 888NXXNXXXXXX,1,Goto(loopback-no-log,91${EXTEN:3},1)
exten => 8889990011112,1,Goto(loopback-no-log,9990011112,1)
@@ -284,7 +295,7 @@ exten => 8889990011112,1,Goto(loopback-no-log,9990011112,1)
exten => _90009.,1,Answer ; Answer the line
exten => _90009.,2,Dial(${TRUNKloop}/9${EXTEN},,to)
exten => _90009.,3,Hangup
exten => _990009.,1,Answer ; Answer the line
exten => _990009.,1,Answer ; Answer the line, Sometimes needs to be removed
exten => _990009.,2,AGI(agi-VDAD_ALL_inbound.agi,CLOSER-----LB-----CL_TESTCAMP-----7275551212-----Closer-----park----------999-----1)
exten => _990009.,3,Hangup
; DID forwarded calls
agc_2-X/branches/agc_2.2.0/docs/conf_examples/extensions.conf.sample-1.4
+21 -15
View File
@@ -180,26 +180,32 @@ exten => _9119XXXXXXXX,1,Dial(${TRUNKblind}/9998819112,55,to)
; exten => _91NXXNXXXXXX,3,Hangup
; special extensions for North America to catch invalid phone numbers
; exten => _91XXX[0-1]XXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXX[0-1]XXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXX[0-1]XXXXXX,3,Hangup
; exten => _91XXX[0-1]XXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXX[0-1]XXXXXX,n,Hangup
; exten => _91[0-1]XXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91[0-1]XXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91[0-1]XXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXX,3,Hangup
; exten => _91[0-1]XXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91[0-1]XXXXXXXXX,n,Hangup
; exten => _91XXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXX,n,Hangup
; exten => _91XXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXX,n,Hangup
; exten => _91XXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXX,3,Hangup
; exten => _91XXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXX,n,Hangup
; exten => _91XXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXX,n,Hangup
; exten => _91XXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXX,n,Hangup
; exten => _91XXXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXX,n,Hangup
; exten => _91XXXXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91XXXXXXXXXXXXX,2,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXXX,3,Hangup
; exten => _91XXXXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to)
; exten => _91XXXXXXXXXXXXX,n,Hangup
; dial a USA long distance outbound number through the loopback-no-log context
; exten => _91NXXNXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log)
; exten => _91NXXNXXXXXX,2,Dial(${TRUNKloop}/888${EXTEN:2},55,o)
agc_2-X/branches/agc_2.2.0/www/agc/vdc_script_display.php
+36 -4
View File
@@ -1,7 +1,7 @@
<?php
# vdc_script_display.php
#
# Copyright (C) 2009 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2010 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# This script is designed display the contents of the SCRIPT tab in the agent interface
#
@@ -10,10 +10,11 @@
# 90827-1548 - Added list override script option
# 91204-1913 - Added recording_filename and recording_id variables
# 91211-1103 - Added user_custom_... variables
# 100116-0702 - Added preset variables
#
$version = '2.2.0-4';
$build = '91211-1103';
$version = '2.2.0-5';
$build = '100116-0702';
require("dbconnect.php");
@@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four
elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];}
if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];}
elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];}
if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];}
elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];}
if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];}
elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];}
if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];}
elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];}
if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];}
elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];}
if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];}
elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];}
if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];}
elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];}
if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];}
elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];}
if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];}
elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];}
if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];}
elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];}
if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];}
@@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text))
$user_custom_three = eregi_replace(' ','+',$user_custom_three);
$user_custom_four = eregi_replace(' ','+',$user_custom_four);
$user_custom_five = eregi_replace(' ','+',$user_custom_five);
$preset_number_a = eregi_replace(' ','+',$preset_number_a);
$preset_number_b = eregi_replace(' ','+',$preset_number_b);
$preset_number_c = eregi_replace(' ','+',$preset_number_c);
$preset_number_d = eregi_replace(' ','+',$preset_number_d);
$preset_number_e = eregi_replace(' ','+',$preset_number_e);
$preset_number_f = eregi_replace(' ','+',$preset_number_f);
$preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a);
$preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b);
}
$script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text);
@@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr
$script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text);
$script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text);
$script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text);
$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text);
$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text);
$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text);
$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text);
$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text);
$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text);
$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text);
$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text);
$script_text = eregi_replace("\n","<BR>",$script_text);
$script_text = stripslashes($script_text);
agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php
+135 -29
View File
@@ -271,10 +271,11 @@
# 100107-0108 - Added dynamic screen size based on login screen browser dimensions
# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting
# 100109-1338 - Fixed Manual dial live call detection
# 100116-0709 - Added presets to script and web form variables
#
$version = '2.2.0-249';
$build = '100109-1338';
$version = '2.2.0-250';
$build = '100116-0709';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=64;
$one_mysql_log=0;
@@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&user_custom_three=" + VU_custom_three + '' +
"&user_custom_four=" + VU_custom_four + '' +
"&user_custom_five=" + VU_custom_five + '' +
"&preset_number_a=" + CalL_XC_a_NuMber + '' +
"&preset_number_b=" + CalL_XC_b_NuMber + '' +
"&preset_number_c=" + CalL_XC_c_NuMber + '' +
"&preset_number_d=" + CalL_XC_d_NuMber + '' +
"&preset_number_e=" + CalL_XC_e_NuMber + '' +
"&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' +
"&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -8735,11 +8813,11 @@ else
var RGplus = new RegExp(" ","g");
var RGiframe = new RegExp("iframe","gi");
var xtest;
xtest=unescape(encoded);
encoded=utf8_decode(xtest);
var xtest;
xtest=unescape(encoded);
encoded=utf8_decode(xtest);
if (scriptformat == 'YES')
if (scriptformat == 'YES')
{
var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value;
var SCsource_id = source_id;
@@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest);
var SCuser_custom_three = VU_custom_three;
var SCuser_custom_four = VU_custom_four;
var SCuser_custom_five = VU_custom_five;
var SCpreset_number_a = CalL_XC_a_NuMber;
var SCpreset_number_b = CalL_XC_b_NuMber;
var SCpreset_number_c = CalL_XC_c_NuMber;
var SCpreset_number_d = CalL_XC_d_NuMber;
var SCpreset_number_e = CalL_XC_e_NuMber;
var SCpreset_dtmf_a = CalL_XC_a_Dtmf;
var SCpreset_dtmf_b = CalL_XC_b_Dtmf;
var SCweb_vars = LIVE_web_vars;
if (encoded.match(RGiframe))
@@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest);
SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+');
SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+');
SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+');
SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+');
SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+');
SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+');
SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+');
SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+');
SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+');
SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+');
SCweb_vars = SCweb_vars.replace(RGplus,'+');
}
@@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest);
var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g");
var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g");
var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g");
var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g");
var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g");
var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g");
var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g");
var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g");
var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g");
var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g");
var RGweb_vars = new RegExp("--A--web_vars--B--","g");
encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code);
@@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest);
encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three);
encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four);
encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five);
encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a);
encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b);
encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c);
encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d);
encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e);
encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a);
encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b);
encoded = encoded.replace(RGweb_vars, SCweb_vars);
}
decoded=encoded; // simple no ?
decoded = decoded.replace(RGnl, "<BR>");
// while (i < encoded.length) {
// var ch = encoded.charAt(i);
// if (ch == "%") {
// if (i < (encoded.length-2)
// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1
// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) {
// decoded += unescape( encoded.substr(i,3) );
// i += 3;
// } else {
// alert( 'Bad escape combo near ...' + encoded.substr(i) );
// decoded += "%[ERR]";
// i++;
// }
// } else {
// decoded += ch;
// i++;
// }
// } // while
// decoded = decoded.replace(RGnl, "<BR>");
//
return false;
decoded=encoded; // simple no ?
decoded = decoded.replace(RGnl, "<BR>");
// while (i < encoded.length) {
// var ch = encoded.charAt(i);
// if (ch == "%") {
// if (i < (encoded.length-2)
// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1
// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) {
// decoded += unescape( encoded.substr(i,3) );
// i += 3;
// } else {
// alert( 'Bad escape combo near ...' + encoded.substr(i) );
// decoded += "%[ERR]";
// i++;
// }
// } else {
// decoded += ch;
// i++;
// }
// } // while
// decoded = decoded.replace(RGnl, "<BR>");
//
return false;
};
agc_2-X/branches/agc_2.2.0/www/vicidial/AST_DIDstats.php
+529 -537
View File
File diff suppressed because it is too large Load Diff
agc_2-X/branches/agc_2.2.0/www/vicidial/admin.php
+54 -3
View File
@@ -1,7 +1,7 @@
<?php
# admin.php - VICIDIAL administration page
#
# Copyright (C) 2009 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2010 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
require("dbconnect.php");
@@ -2043,11 +2043,12 @@ else
# 91228-1837 - Added timer action settings to in-groups and campaigns
# 100103-0727 - Added Start/Dispo call url, 3/4/5 conf number presets, Lists conf-number overrides
# 100104-1454 - Fixed in-group/campaign copy duplication issue
# 100116-0718 - Added presets to script select list
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
$admin_version = '2.2.0-233';
$build = '100104-1454';
$admin_version = '2.2.0-234';
$build = '100116-0718';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
@@ -6187,6 +6188,14 @@ if ($ADD==7111111)
$user_custom_three = 'custom three';
$user_custom_four = 'custom four';
$user_custom_five = 'custom five';
$preset_number_a = 'preset_a';
$preset_number_b = 'preset_b';
$preset_number_c = 'preset_c';
$preset_number_d = 'preset_d';
$preset_number_e = 'preset_e';
$preset_number_f = 'preset_f';
$preset_dtmf_a = 'preset_dtmf_a';
$preset_dtmf_b = 'preset_dtmf_b';
echo "</title>\n";
echo "</head>\n";
@@ -6253,6 +6262,14 @@ if ($ADD==7111111)
$user_custom_three = eregi_replace(' ','+',$user_custom_three);
$user_custom_four = eregi_replace(' ','+',$user_custom_four);
$user_custom_five = eregi_replace(' ','+',$user_custom_five);
$preset_number_a = eregi_replace(' ','+',$preset_number_a);
$preset_number_b = eregi_replace(' ','+',$preset_number_b);
$preset_number_c = eregi_replace(' ','+',$preset_number_c);
$preset_number_d = eregi_replace(' ','+',$preset_number_d);
$preset_number_e = eregi_replace(' ','+',$preset_number_e);
$preset_number_f = eregi_replace(' ','+',$preset_number_f);
$preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a);
$preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b);
}
$script_text = eregi_replace('--A--vendor_lead_code--B--',"$vendor_lead_code",$script_text);
@@ -6308,6 +6325,14 @@ if ($ADD==7111111)
$script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text);
$script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text);
$script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text);
$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text);
$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text);
$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text);
$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text);
$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text);
$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text);
$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text);
$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text);
$script_text = eregi_replace("\n","<BR>",$script_text);
@@ -7362,6 +7387,19 @@ if ($ADD==1111111)
echo "<option>script_height</option>";
echo "<option>recording_filename</option>";
echo "<option>recording_id</option>";
echo "<option>user_custom_one</option>";
echo "<option>user_custom_two</option>";
echo "<option>user_custom_three</option>";
echo "<option>user_custom_four</option>";
echo "<option>user_custom_five</option>";
echo "<option>preset_number_a</option>";
echo "<option>preset_number_b</option>";
echo "<option>preset_number_c</option>";
echo "<option>preset_number_d</option>";
echo "<option>preset_number_e</option>";
echo "<option>preset_number_f</option>";
echo "<option>preset_dtmf_a</option>";
echo "<option>preset_dtmf_b</option>";
echo "</select>";
echo "<input type=\"button\" name=\"insertField\" value=\"Insert\" onClick=\"scriptInsertField();\"><BR>";
# END Insert Field
@@ -20618,6 +20656,19 @@ if ($ADD==3111111)
echo "<option>script_height</option>";
echo "<option>recording_filename</option>";
echo "<option>recording_id</option>";
echo "<option>user_custom_one</option>";
echo "<option>user_custom_two</option>";
echo "<option>user_custom_three</option>";
echo "<option>user_custom_four</option>";
echo "<option>user_custom_five</option>";
echo "<option>preset_number_a</option>";
echo "<option>preset_number_b</option>";
echo "<option>preset_number_c</option>";
echo "<option>preset_number_d</option>";
echo "<option>preset_number_e</option>";
echo "<option>preset_number_f</option>";
echo "<option>preset_dtmf_a</option>";
echo "<option>preset_dtmf_b</option>";
echo "</select>";
echo "<input type=\"button\" name=\"insertField\" value=\"Insert\" onClick=\"scriptInsertField();\"><BR>";
# END Insert Field