diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE
index 185afa00..4d43e4b2 100644
--- a/agc_2-X/trunk/UPGRADE
+++ b/agc_2-X/trunk/UPGRADE
@@ -426,6 +426,10 @@ OTHER CHANGES:
98. Added preprocess leads in script to filter leads and generate standard
format lead files before being imported
+99. Added the ability to have call times go beyond midnight for inbound calls.
+
+100. Added capability for agent interface to have webphone as a thin top bar
+
diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
index 8287e905..fcc98992 100644
--- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
+++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
@@ -77,7 +77,7 @@ is_webphone ENUM('Y','N') default 'N',
use_external_server_ip ENUM('Y','N') default 'N',
codecs_list VARCHAR(100) default '',
codecs_with_template ENUM('0','1') default '0',
-webphone_dialpad ENUM('Y','N','TOGGLE') default 'Y',
+webphone_dialpad ENUM('Y','N','TOGGLE','TOGGLE_OFF') default 'Y',
index (server_ip),
unique index extenserver (extension, server_ip)
);
@@ -608,7 +608,7 @@ agent_fullscreen ENUM('Y','N') default 'N',
allowed_reports VARCHAR(2000) default 'ALL REPORTS',
webphone_url_override VARCHAR(255) default '',
webphone_systemkey_override VARCHAR(100) default '',
-webphone_dialpad_override ENUM('DISABLED','Y','N','TOGGLE') default 'DISABLED'
+webphone_dialpad_override ENUM('DISABLED','Y','N','TOGGLE','TOGGLE_OFF') default 'DISABLED'
);
CREATE TABLE vicidial_campaigns (
@@ -2411,7 +2411,7 @@ ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT N
CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log;
-UPDATE system_settings SET db_schema_version='1256',db_schema_update_date=NOW();
+UPDATE system_settings SET db_schema_version='1257',db_schema_update_date=NOW();
GRANT RELOAD ON *.* TO cron@'%';
GRANT RELOAD ON *.* TO cron@localhost;
diff --git a/agc_2-X/trunk/extras/upgrade_2.4.sql b/agc_2-X/trunk/extras/upgrade_2.4.sql
index c6d80342..0d53d4b0 100644
--- a/agc_2-X/trunk/extras/upgrade_2.4.sql
+++ b/agc_2-X/trunk/extras/upgrade_2.4.sql
@@ -633,3 +633,8 @@ UPDATE system_settings SET db_schema_version='1255',db_schema_update_date=NOW();
ALTER TABLE vicidial_campaigns ADD display_leads_count ENUM('Y','N') default 'N';
UPDATE system_settings SET db_schema_version='1256',db_schema_update_date=NOW();
+
+ALTER TABLE phones MODIFY webphone_dialpad ENUM('Y','N','TOGGLE','TOGGLE_OFF') default 'Y';
+ALTER TABLE vicidial_user_groups MODIFY webphone_dialpad_override ENUM('DISABLED','Y','N','TOGGLE','TOGGLE_OFF') default 'DISABLED';
+
+UPDATE system_settings SET db_schema_version='1257',db_schema_update_date=NOW();
diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt
index 18f8dbe7..f8ac0070 100644
--- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt
+++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt
@@ -496,6 +496,7 @@ RELOAD NOW||
refresh||
You can also set a label to ---HIDE--- to hide both the label and the field||
For inbound only, you can also set the stop call time higher than 2400 if you want the call time to go beyond midnight. So if you want your call time to run from 6 am until 2 am the next day, you would put 0600 as the start time and 2600 as the stop time||
+TOGGLE_OFF will default to not show the dialpad on first load, but will allow the user to show the dialpad by clicking on the dialpad link||
AST_LISTS_campaign_stats.php
diff --git a/agc_2-X/trunk/www/agc/options-example.php b/agc_2-X/trunk/www/agc/options-example.php
index dd87043f..dc12f18e 100644
--- a/agc_2-X/trunk/www/agc/options-example.php
+++ b/agc_2-X/trunk/www/agc/options-example.php
@@ -46,8 +46,16 @@ $BROWSER_HEIGHT = 500; # set to the minimum browser height, default=500
$BROWSER_WIDTH = 770; # set to the minimum browser width, default=770
$webphone_width = 460; # set the webphone frame width
$webphone_height = 500; # set the webphone frame height
+$webphone_pad = 0; # set the table cellpadding for the webphone
+$webphone_location = 'right'; # set the location on the agent screen 'right' or 'bar'
$MAIN_COLOR = '#CCCCCC'; # old default is E0C2D6
$SCRIPT_COLOR = '#E6E6E6'; # old default is FFE7D0
$SIDEBAR_COLOR = '#F6F6F6';
-?>
+# thin bar webphone settings:
+# $webphone_width = 1085; # set the webphone frame width
+# $webphone_height = 36; # set the webphone frame height
+# $webphone_pad = 0; # set the table cellpadding for the webphone
+# $webphone_location = 'bar'; # set the location on the agent screen 'right' or 'bar'
+
+?>
\ No newline at end of file
diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php
index fefc1397..27b05888 100644
--- a/agc_2-X/trunk/www/agc/vicidial.php
+++ b/agc_2-X/trunk/www/agc/vicidial.php
@@ -327,10 +327,11 @@
# 101207-1621 - Added scroll to the top after in-group, pause code, etc... selections, and added focus blur to several functions
# 101208-1210 - Fixed focus/blur coding to work after Dispo
# 101216-1758 - Added the ability to hide fields if the label is set to ---HIDE--- in System Settings
+# 101227-1645 - Added dialplan off toggle options, and settings and code changes for top bar webphone
#
-$version = '2.4-304';
-$build = '101216-1758';
+$version = '2.4-305';
+$build = '101227-1645';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=69;
$one_mysql_log=0;
@@ -444,54 +445,57 @@ if ($qm_conf_ct > 0)
##### DEFINABLE SETTINGS AND OPTIONS
###########################################
+# set defaults for hard-coded variables
+$conf_silent_prefix = '5'; # vicidial_conferences prefix to enter silently and muted for recording
+$dtmf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently
+$HKuser_level = '5'; # minimum vicidial user_level for HotKeys
+$campaign_login_list = '1'; # show drop-down list of campaigns at login
+$manual_dial_preview = '1'; # allow preview lead option when manual dial
+$multi_line_comments = '1'; # set to 1 to allow multi-line comment box
+$user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login
+$view_scripts = '1'; # set to 1 to show the SCRIPTS tab
+$dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo
+$callholdstatus = '1'; # set to 1 to show calls on hold count
+$agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count
+ $campagentstatctmax = '3'; # Number of seconds for campaign call and agent stats
+$show_campname_pulldown = '1'; # set to 1 to show campaign name on login pulldown
+$webform_sessionname = '1'; # set to 1 to include the session_name in webform URL
+$local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server
+$clientDST = '1'; # set to 1 to check for DST on server for agent time
+$no_delete_sessions = '1'; # set to 1 to not delete sessions at logout
+$volumecontrol_active = '1'; # set to 1 to allow agents to alter volume of channels
+$PreseT_DiaL_LinKs = '0'; # set to 1 to show a DIAL link for Dial Presets
+$LogiNAJAX = '1'; # set to 1 to do lookups on campaigns for login
+$HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls"
+$hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Hangup Customer
+$LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout
+$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login
+$DefaulTAlTDiaL = '0'; # set to 1 to enable ALT DIAL by default if enabled for the campaign
+$AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option
+$disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen
+$hide_timeclock_link = '0'; # set to 1 to hide the timeclock link on the agent login screen
+$conf_check_attempts = '3'; # number of attempts to try before loosing webserver connection, for bad network setups
+
+$TEST_all_statuses = '0'; # TEST variable allows all statuses in dispo screen
+
+$stretch_dimensions = '1'; # sets the vicidial screen to the size of the browser window
+$BROWSER_HEIGHT = 500; # set to the minimum browser height, default=500
+$BROWSER_WIDTH = 770; # set to the minimum browser width, default=770
+$webphone_width = 460; # set the webphone frame width
+$webphone_height = 500; # set the webphone frame height
+$webphone_pad = 0; # set the table cellpadding for the webphone
+$webphone_location = 'right'; # set the location on the agent screen 'right' or 'bar'
+$MAIN_COLOR = '#CCCCCC'; # old default is E0C2D6
+$SCRIPT_COLOR = '#E6E6E6'; # old default is FFE7D0
+$FORM_COLOR = '#EFEFEF';
+$SIDEBAR_COLOR = '#F6F6F6';
+
+# if options file exists, use the override values for the above variables
+# see the options-example.php file for more information
if (file_exists('options.php'))
{
require('options.php');
}
-else
- {
- $conf_silent_prefix = '5'; # vicidial_conferences prefix to enter silently and muted for recording
- $dtmf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently
- $HKuser_level = '5'; # minimum vicidial user_level for HotKeys
- $campaign_login_list = '1'; # show drop-down list of campaigns at login
- $manual_dial_preview = '1'; # allow preview lead option when manual dial
- $multi_line_comments = '1'; # set to 1 to allow multi-line comment box
- $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login
- $view_scripts = '1'; # set to 1 to show the SCRIPTS tab
- $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo
- $callholdstatus = '1'; # set to 1 to show calls on hold count
- $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count
- $campagentstatctmax = '3'; # Number of seconds for campaign call and agent stats
- $show_campname_pulldown = '1'; # set to 1 to show campaign name on login pulldown
- $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL
- $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server
- $clientDST = '1'; # set to 1 to check for DST on server for agent time
- $no_delete_sessions = '1'; # set to 1 to not delete sessions at logout
- $volumecontrol_active = '1'; # set to 1 to allow agents to alter volume of channels
- $PreseT_DiaL_LinKs = '0'; # set to 1 to show a DIAL link for Dial Presets
- $LogiNAJAX = '1'; # set to 1 to do lookups on campaigns for login
- $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls"
- $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Hangup Customer
- $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout
- $PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login
- $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT DIAL by default if enabled for the campaign
- $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option
- $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen
- $hide_timeclock_link = '0'; # set to 1 to hide the timeclock link on the agent login screen
- $conf_check_attempts = '3'; # number of attempts to try before loosing webserver connection, for bad network setups
-
- $TEST_all_statuses = '0'; # TEST variable allows all statuses in dispo screen
-
- $stretch_dimensions = '1'; # sets the vicidial screen to the size of the browser window
- $BROWSER_HEIGHT = 500; # set to the minimum browser height, default=500
- $BROWSER_WIDTH = 770; # set to the minimum browser width, default=770
- $webphone_width = 460; # set the webphone frame width
- $webphone_height = 500; # set the webphone frame height
- $MAIN_COLOR = '#CCCCCC'; # old default is E0C2D6
- $SCRIPT_COLOR = '#E6E6E6'; # old default is FFE7D0
- $FORM_COLOR = '#EFEFEF';
- $SIDEBAR_COLOR = '#F6F6F6';
- }
### BEGIN find any custom field labels ###
$label_title = 'Title';
@@ -2236,7 +2240,9 @@ else
}
$webphone_options='INITIAL_LOAD';
if ($webphone_dialpad == 'Y') {$webphone_options .= "--DIALPAD_Y";}
+ if ($webphone_dialpad == 'N') {$webphone_options .= "--DIALPAD_N";}
if ($webphone_dialpad == 'TOGGLE') {$webphone_options .= "--DIALPAD_TOGGLE";}
+ if ($webphone_dialpad == 'TOGGLE_OFF') {$webphone_options .= "--DIALPAD_OFF_TOGGLE";}
### base64 encode variables
$b64_phone_login = base64_encode($extension);
@@ -2250,7 +2256,14 @@ else
$b64_system_key = base64_encode($system_key);
$WebPhonEurl = "$webphone_url?phone_login=$b64_phone_login&phone_login=$b64_phone_login&phone_pass=$b64_phone_pass&server_ip=$b64_server_ip&callerid=$b64_callerid&protocol=$b64_protocol&codecs=$b64_codecs&options=$b64_options&system_key=$b64_system_key";
- $webphone_content = "";
+ if ($webphone_location == 'bar')
+ {
+ $webphone_content = "";
+ }
+ else
+ {
+ $webphone_content = "";
+ }
}
##### grab the campaign_weight and number of calls today on that campaign for the agent
@@ -2553,6 +2566,7 @@ $MASTERwidth=($BROWSER_WIDTH - 340);
$MASTERheight=($BROWSER_HEIGHT - 200);
if ($MASTERwidth < 430) {$MASTERwidth = '430';}
if ($MASTERheight < 300) {$MASTERheight = '300';}
+if ($webphone_location == 'bar') {$MASTERwidth = ($MASTERwidth + $webphone_height);}
$CAwidth = ($MASTERwidth + 340); # 770 - cover all (none-in-session, customer hunngup, etc...)
$SBwidth = ($MASTERwidth + 331); # 761 - SideBar starting point
@@ -2581,6 +2595,15 @@ $CBheight = ($MASTERheight + 50); # 350 - Agent Callback, pause code, volume co
$SSheight = ($MASTERheight + 31); # 331 - script content
$HTheight = ($MASTERheight + 10); # 310 - transfer frame, callback comments and hotkey
$BPheight = ($MASTERheight - 250); # 50 - bottom buffer, Agent Xfer Span
+$SCheight = 49; # 49 - seconds on call display
+$SFheight = 65; # 65 - height of the script and form contents
+$SRheight = 69; # 69 - height of the script and form refrech links
+if ($webphone_location == 'bar')
+ {
+ $SCheight = ($SCheight + $webphone_height);
+# $SFheight = ($SFheight + $webphone_height);
+ $SRheight = ($SRheight + $webphone_height);
+ }
$AVTheight = '0';
if ($is_webphone) {$AVTheight = '20';}
@@ -11459,7 +11482,14 @@ $zi=2;
Select a CallBack Date :
+ \n";}
+ ?>
Select a Date Below
@@ -12131,6 +12188,10 @@ Available Agents Transfer: ;" id="CallBacKsLisTBox">
height=>
CALLBACKS FOR AGENT : Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list.
+ \n";}
+ ?>
Refresh
@@ -12183,6 +12244,10 @@ Available Agents Transfer: ;" id="CloserSelectBox">
height=>
CLOSER INBOUND GROUP SELECTION
+ \n";}
+ ?>
Closer Inbound Group Selection
;" id="TerritorySelectBox">