diff --git a/agc_2-X/branches/agc_30/Makefile.PL b/agc_2-X/branches/TO_BE_DELETED_agc_30/Makefile.PL
similarity index 100%
rename from agc_2-X/branches/agc_30/Makefile.PL
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/Makefile.PL
diff --git a/agc_2-X/branches/agc_30/bin/agc_status.pl b/agc_2-X/branches/TO_BE_DELETED_agc_30/bin/agc_status.pl
similarity index 100%
rename from agc_2-X/branches/agc_30/bin/agc_status.pl
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/bin/agc_status.pl
diff --git a/agc_2-X/branches/agc_30/bin/agid.pl b/agc_2-X/branches/TO_BE_DELETED_agc_30/bin/agid.pl
similarity index 100%
rename from agc_2-X/branches/agc_30/bin/agid.pl
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/bin/agid.pl
diff --git a/agc_2-X/branches/agc_30/bin/dialerd.pl b/agc_2-X/branches/TO_BE_DELETED_agc_30/bin/dialerd.pl
similarity index 100%
rename from agc_2-X/branches/agc_30/bin/dialerd.pl
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/bin/dialerd.pl
diff --git a/agc_2-X/branches/agc_30/etc/agid.conf b/agc_2-X/branches/TO_BE_DELETED_agc_30/etc/agid.conf
similarity index 100%
rename from agc_2-X/branches/agc_30/etc/agid.conf
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/etc/agid.conf
diff --git a/agc_2-X/branches/agc_30/etc/astguiclient.yaml b/agc_2-X/branches/TO_BE_DELETED_agc_30/etc/astguiclient.yaml
similarity index 100%
rename from agc_2-X/branches/agc_30/etc/astguiclient.yaml
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/etc/astguiclient.yaml
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/AGI.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/AGI.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/AGI.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/AGI.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Campaign.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Campaign.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Campaign.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Campaign.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Campaign/Agent.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Campaign/Agent.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Campaign/Agent.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Campaign/Agent.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Campaign/Record.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Campaign/Record.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Campaign/Record.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Campaign/Record.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Config.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Config.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Config.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Config.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Daemon/AGI.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Daemon/AGI.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Daemon/AGI.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Daemon/AGI.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Daemon/Dialer.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Daemon/Dialer.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Daemon/Dialer.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Daemon/Dialer.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Daemon/VDAD.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Daemon/VDAD.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Daemon/VDAD.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Daemon/VDAD.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Log.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Log.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Log.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Log.pm
diff --git a/agc_2-X/branches/agc_30/lib/Astguiclient/Util.pm b/agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Util.pm
similarity index 100%
rename from agc_2-X/branches/agc_30/lib/Astguiclient/Util.pm
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/lib/Astguiclient/Util.pm
diff --git a/agc_2-X/branches/agc_30/t/00-load.t b/agc_2-X/branches/TO_BE_DELETED_agc_30/t/00-load.t
similarity index 100%
rename from agc_2-X/branches/agc_30/t/00-load.t
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/t/00-load.t
diff --git a/agc_2-X/branches/agc_30/t/01-dependencies.t b/agc_2-X/branches/TO_BE_DELETED_agc_30/t/01-dependencies.t
similarity index 100%
rename from agc_2-X/branches/agc_30/t/01-dependencies.t
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/t/01-dependencies.t
diff --git a/agc_2-X/branches/agc_30/t/02-database.t b/agc_2-X/branches/TO_BE_DELETED_agc_30/t/02-database.t
similarity index 100%
rename from agc_2-X/branches/agc_30/t/02-database.t
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/t/02-database.t
diff --git a/agc_2-X/branches/agc_30/t/03-config.t b/agc_2-X/branches/TO_BE_DELETED_agc_30/t/03-config.t
similarity index 100%
rename from agc_2-X/branches/agc_30/t/03-config.t
rename to agc_2-X/branches/TO_BE_DELETED_agc_30/t/03-config.t
diff --git a/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php b/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php
index 84c55b12..54fc3cfd 100644
--- a/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php
+++ b/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php
@@ -6787,7 +6787,7 @@ Your Status:
Calls Dialing: MY CALLBACK ONLY
";}
?>
- CB Comments:
+ CB Comments:
SUBMIT
diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE
index dad726b2..223a34fa 100644
--- a/agc_2-X/trunk/UPGRADE
+++ b/agc_2-X/trunk/UPGRADE
@@ -281,6 +281,9 @@ NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom
defining the following parameters: date range, campaigns, in-groups, statuses,
lists and user groups. A flat tab-delimited text file is exported.
+67. Added new monitoring functionality to allow monitoring from one agent to
+ another without hanging up
+
diff --git a/agc_2-X/trunk/docs/Inbound_VDAC_IVR.txt b/agc_2-X/trunk/docs/Inbound_VDAC_IVR.txt
index 4a79215a..8eee4a6d 100644
--- a/agc_2-X/trunk/docs/Inbound_VDAC_IVR.txt
+++ b/agc_2-X/trunk/docs/Inbound_VDAC_IVR.txt
@@ -8,7 +8,7 @@ A log of the calls going into this agi-VDAD_inbound_calltime_check.agi script is
The agi-VDAD_inbound_calltime_check.agi script can also be used to log the progression of a call through an IVR if you place it at major points in your IVR dialplan. The third field that you can define allows you to set a note or comment that is placed into the database when the call goes through that step.
-Now included in the vicidial web directory is the AST_IVRstats.php report whish can show you the statistics on the progression of customers through an Asterisk dialplan-based IVR using tracking with this script.
+Now included in the vicidial web directory is the AST_IVRstats.php report which can show you the statistics on the progression of customers through an Asterisk dialplan-based IVR using tracking with this script.
The example below shows how to do a very simple IVR before sending to a queue asking if the caller wants English, Spanish, French or German language service.
diff --git a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample
index d1cea950..fdb791ad 100644
--- a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample
+++ b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample
@@ -102,11 +102,12 @@ exten => 2102,2,Voicemail,u2102 ; Send to voicemail...
exten => 401,1,Dial((IAX2/firefly01@firefly01/s||t)
exten => 401,2,Hangup
+; 100-350 phone extensions now auto-generated
; extensions for other SIP and IAX call center phones
; cc100-cc150 SIP Phones
-exten => _1[0-5]X,1,Dial(sip/cc${EXTEN},20,to)
+;exten => _1[0-5]X,1,Dial(sip/cc${EXTEN},20,to)
; cc300-cc350 IAX Phones
-exten => _3[0-5]X,1,Dial(IAX2/cc${EXTEN},20,to)
+;exten => _3[0-5]X,1,Dial(IAX2/cc${EXTEN},20,to)
; extensions if using a T1 channelbank
exten => _19XX,1,Dial(Zap/${EXTEN:2},30,o)
@@ -401,6 +402,12 @@ exten => 8500998,2,Playback(silence)
exten => 8500998,3,AGI(agi-dtmf.agi)
exten => 8500998,4,Hangup
+; multi-remote-monitor entry extensions
+exten => 8162,1,Dial(${TRUNKblind}/34567890123456789,55,to)
+
+exten => 34567890123456789,1,Answer
+exten => 34567890123456789,2,Goto(monitor,s,1)
+
;#### VDAD STANDARD TRANSFER ENTRIES ####
; Below are the parameters needed for the agi-VDAD_ALL_outbound.agi script to be run properly
; 1. the method of call handling for the script:
@@ -556,3 +563,29 @@ exten => 99999999999,11,Playback(conf)
exten => 99999999999,12,Playback(conf)
exten => 99999999999,13,Playback(conf)
exten => 99999999999,14,Hangup
+
+
+[monitor]
+exten => h,1,DeadAGI(agi://127.0.0.1:4577/call_log--HVcauses--PRI-----NODEBUG-----${HANGUPCAUSE}-----${DIALSTATUS}-----${DIALEDTIME}-----${ANSWEREDTIME})
+
+exten => s,1,SetVar(TIMEOUT(digit)=10)
+exten => s,n,SetVar(TIMEOUT(response)=10)
+exten => s,n,SetVar(MEETME_EXIT_CONTEXT=monitor_exit)
+exten => s,n,Background(vm-extension) ; need audio prompt.
+exten => s,n,WaitExten(10)
+
+exten => i,1,Goto(monitor_exit,s,1)
+exten => #,1,Goto(monitor_exit,s,1)
+exten => t,1,Goto(monitor_exit,s,1)
+
+exten => _8[0-2]XX,1,Meetme(8600${EXTEN:1},FmqX) ; Listen
+exten => _99[0-2]XX,1,Meetme(8600${EXTEN:2},FX) ; Barge
+
+[monitor_exit]
+exten => h,1,DeadAGI(agi://127.0.0.1:4577/call_log--HVcauses--PRI-----NODEBUG-----${HANGUPCAUSE}-----${DIALSTATUS}-----${DIALEDTIME}-----${ANSWEREDTIME})
+
+exten => _X,1,Goto(monitor,s,1)
+
+exten => i,1,Goto(monitor,s,1)
+exten => #,1,Goto(monitor,s,1)
+exten => t,1,Goto(monitor,s,1)
diff --git a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4 b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4
index 07e0c4eb..f3127afc 100644
--- a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4
+++ b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4
@@ -102,11 +102,12 @@ exten => 2102,2,Voicemail,u2102 ; Send to voicemail...
exten => 401,1,Dial((IAX2/firefly01@firefly01/s||t)
exten => 401,2,Hangup
+; 100-350 phone extensions now auto-generated
; extensions for other SIP and IAX call center phones
; cc100-cc150 SIP Phones
-exten => _1[0-5]X,1,Dial(sip/cc${EXTEN},20,to)
+;exten => _1[0-5]X,1,Dial(sip/cc${EXTEN},20,to)
; cc300-cc350 IAX Phones
-exten => _3[0-5]X,1,Dial(IAX2/cc${EXTEN},20,to)
+;exten => _3[0-5]X,1,Dial(IAX2/cc${EXTEN},20,to)
; extensions if using a T1 channelbank
exten => _19XX,1,Dial(Zap/${EXTEN:2},30,o)
@@ -401,6 +402,12 @@ exten => 8500998,2,Playback(silence)
exten => 8500998,3,AGI(agi-dtmf.agi)
exten => 8500998,4,Hangup
+; multi-remote-monitor entry extensions
+exten => 8162,1,Dial(${TRUNKblind}/34567890123456789,55,to)
+
+exten => 34567890123456789,1,Answer
+exten => 34567890123456789,2,Goto(monitor,s,1)
+
;#### VDAD STANDARD TRANSFER ENTRIES ####
; Below are the parameters needed for the agi-VDAD_ALL_outbound.agi script to be run properly
; 1. the method of call handling for the script:
@@ -556,3 +563,29 @@ exten => 99999999999,11,Playback(conf)
exten => 99999999999,12,Playback(conf)
exten => 99999999999,13,Playback(conf)
exten => 99999999999,14,Hangup
+
+
+[monitor]
+exten => h,1,DeadAGI(agi://127.0.0.1:4577/call_log--HVcauses--PRI-----NODEBUG-----${HANGUPCAUSE}-----${DIALSTATUS}-----${DIALEDTIME}-----${ANSWEREDTIME})
+
+exten => s,1,Set(TIMEOUT(digit)=10)
+exten => s,n,Set(TIMEOUT(response)=10)
+exten => s,n,Set(MEETME_EXIT_CONTEXT=monitor_exit)
+exten => s,n,Background(vm-extension) ; need audio prompt.
+exten => s,n,WaitExten(10)
+
+exten => i,1,Goto(monitor_exit,s,1)
+exten => #,1,Goto(monitor_exit,s,1)
+exten => t,1,Goto(monitor_exit,s,1)
+
+exten => _8[0-2]XX,1,Meetme(8600${EXTEN:1},FmqX) ; Listen
+exten => _99[0-2]XX,1,Meetme(8600${EXTEN:2},FX) ; Barge
+
+[monitor_exit]
+exten => h,1,DeadAGI(agi://127.0.0.1:4577/call_log--HVcauses--PRI-----NODEBUG-----${HANGUPCAUSE}-----${DIALSTATUS}-----${DIALEDTIME}-----${ANSWEREDTIME})
+
+exten => _X,1,Goto(monitor,s,1)
+
+exten => i,1,Goto(monitor,s,1)
+exten => #,1,Goto(monitor,s,1)
+exten => t,1,Goto(monitor,s,1)
diff --git a/agc_2-X/trunk/extras/upgrade_2.0.5.sql b/agc_2-X/trunk/extras/upgrade_2.0.5.sql
index dc582515..feed338f 100644
--- a/agc_2-X/trunk/extras/upgrade_2.0.5.sql
+++ b/agc_2-X/trunk/extras/upgrade_2.0.5.sql
@@ -787,3 +787,10 @@ ALTER TABLE vicidial_users ADD export_reports ENUM('1','0') default '0';
ALTER TABLE vicidial_admin_log MODIFY event_type ENUM('ADD','COPY','LOAD','RESET','MODIFY','DELETE','SEARCH','LOGIN','LOGOUT','CLEAR','OVERRIDE','EXPORT','OTHER') default 'OTHER';
UPDATE system_settings SET db_schema_version='1134';
+
+
+
+
+ALTER TABLE vicidial_campaigns DROP campaign_shift_start_time;
+ALTER TABLE vicidial_campaigns DROP campaign_shift_length;
+ALTER TABLE vicidial_campaigns DROP campaign_day_start_time;