diff --git a/UPGRADE b/UPGRADE index 8a269094..c6c75d31 100644 --- a/UPGRADE +++ b/UPGRADE @@ -299,6 +299,9 @@ OTHER CHANGES: 64. Added did_id, did_extension, did_pattern and did_description as webform and script variables in the agent screen. +65. Added webphone options for System Key and Dialpad, may not be compatible + with all webphones. + diff --git a/docs/conf_examples/extensions.conf.sample b/docs/conf_examples/extensions.conf.sample index ae25e15d..4af943dd 100644 --- a/docs/conf_examples/extensions.conf.sample +++ b/docs/conf_examples/extensions.conf.sample @@ -202,6 +202,10 @@ exten => _9119XXXXXXXX,1,Dial(${TRUNKblind}/9998819112,55,to) ; exten => _91XXXXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log) ; exten => _91XXXXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to) ; exten => _91XXXXXXXXXXXXX,n,Hangup +; block calls to 555 numbers +; exten => _91NXX555NXXX,1,AGI(agi://127.0.0.1:4577/call_log) +; exten => _91NXX555NXXX,n,Dial(${TRUNKloop}/8889990011112,,to) +; exten => _91NXX555NXXX,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) diff --git a/docs/conf_examples/extensions.conf.sample-1.4 b/docs/conf_examples/extensions.conf.sample-1.4 index e04b7d50..ef84a5d4 100644 --- a/docs/conf_examples/extensions.conf.sample-1.4 +++ b/docs/conf_examples/extensions.conf.sample-1.4 @@ -207,6 +207,10 @@ exten => _9119XXXXXXXX,1,Dial(${TRUNKblind}/9998819112,55,to) ; exten => _91XXXXXXXXXXXXX,1,AGI(agi://127.0.0.1:4577/call_log) ; exten => _91XXXXXXXXXXXXX,n,Dial(${TRUNKloop}/8889990011112,,to) ; exten => _91XXXXXXXXXXXXX,n,Hangup +; block calls to 555 numbers +; exten => _91NXX555NXXX,1,AGI(agi://127.0.0.1:4577/call_log) +; exten => _91NXX555NXXX,n,Dial(${TRUNKloop}/8889990011112,,to) +; exten => _91NXX555NXXX,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) diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 89c969a7..bdada7f9 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -77,6 +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', index (server_ip), unique index extenserver (extension, server_ip) ); @@ -599,7 +600,9 @@ agent_xfer_dial_with_customer ENUM('Y','N') default 'Y', agent_xfer_park_customer_dial ENUM('Y','N') default 'Y', agent_fullscreen ENUM('Y','N') default 'N', allowed_reports VARCHAR(2000) default 'ALL REPORTS', -webphone_url_override VARCHAR(255) default '' +webphone_url_override VARCHAR(255) default '', +webphone_systemkey_override VARCHAR(100) default '', +webphone_dialpad_override ENUM('DISABLED','Y','N','TOGGLE') default 'DISABLED' ); CREATE TABLE vicidial_campaigns ( @@ -1319,7 +1322,8 @@ label_security_phrase VARCHAR(40) default '', label_email VARCHAR(40) default '', label_comments VARCHAR(40) default '', slave_db_server VARCHAR(50) default '', -reports_use_slave_db VARCHAR(2000) default '' +reports_use_slave_db VARCHAR(2000) default '', +webphone_systemkey VARCHAR(100) default '' ); CREATE TABLE vicidial_campaigns_list_mix ( @@ -2352,7 +2356,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='1242',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1243',db_schema_update_date=NOW(); GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/extras/upgrade_2.4.sql b/extras/upgrade_2.4.sql index 65430b4f..ab9c5a40 100644 --- a/extras/upgrade_2.4.sql +++ b/extras/upgrade_2.4.sql @@ -522,3 +522,12 @@ UPDATE system_settings SET db_schema_version='1241',db_schema_update_date=NOW(); ALTER TABLE vicidial_campaigns ADD manual_dial_prefix VARCHAR(20) default ''; UPDATE system_settings SET db_schema_version='1242',db_schema_update_date=NOW(); + +ALTER TABLE system_settings ADD webphone_systemkey VARCHAR(100) default ''; + +ALTER TABLE phones ADD webphone_dialpad ENUM('Y','N','TOGGLE') default 'Y'; + +ALTER TABLE vicidial_user_groups ADD webphone_systemkey_override VARCHAR(100) default ''; +ALTER TABLE vicidial_user_groups ADD webphone_dialpad_override ENUM('DISABLED','Y','N','TOGGLE') default 'DISABLED'; + +UPDATE system_settings SET db_schema_version='1243',db_schema_update_date=NOW(); diff --git a/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt index 10381291..434b247e 100644 --- a/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt +++ b/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt @@ -381,6 +381,14 @@ Manual Dial Prefix|| This optional field allows you to set the dial prefix to be used only when placing manual dial calls from the agent interface, such as using the MANUAL DIAL feature, or Dial Next Number when in the MANUAL dial method, or manual alt number dialing, or scheduled user-only callbacks. Default is empty for disabled, which will use the Dial Prefix defined in the field above. This option does not interfere with the 3way Dial Prefix option|| Here is a list of reserved phrases that cannot be used as menu IDs|| Call Menu ID cannot use reserved words|| +Webphone System Key Override|| +This setting allows you to set an alternate webphone System Key just for the members of one user group. Default is empty|| +Webphone Dialpad Override|| +This setting allows you to activate or deactivate the dialpad on the webphone just for the members of one user group. Default is DISABLED. TOGGLE will allow the user to view and hide the dialpad by clicking a link|| +Webphone Dialpad|| +This setting allows you to activate or deactivate the dialpad for this webphone. Default is Y for enabled. TOGGLE will allow the user to view and hide the dialpad by clicking a link. This feature is not available on all webphone versions|| +Webphone System Key|| +If your system or provider requires it, this is where the System Key for the webphone should be entered in. Default is empty|| AST_VICIDIAL_ingrouplist.php diff --git a/www/agc/conf_exten_check.php b/www/agc/conf_exten_check.php index 19319e66..1c463bbd 100644 --- a/www/agc/conf_exten_check.php +++ b/www/agc/conf_exten_check.php @@ -202,6 +202,8 @@ echo "
$Aagent_log_id=''; $Acallerid=''; $DEADcustomer=0; + $Astatus=''; + $Acampaign_id=''; ### see if the agent has a record in the vicidial_live_agents table $stmt="SELECT count(*) from vicidial_live_agents where user='$user' and server_ip='$server_ip';"; diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 6b78f16e..ea71dc39 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -308,10 +308,11 @@ # 100813-0554 - Added Campaign presets # 100815-1015 - Added manual_dial_prefix campaign option # 100823-1605 - Added DID variables for webform and scripting +# 100827-1436 - Added webphone dialpad options # -$version = '2.4-286'; -$build = '100823-1605'; +$version = '2.4-287'; +$build = '100827-1436'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=66; $one_mysql_log=0; @@ -970,7 +971,7 @@ else $AgentAlert_allowed = $VU_allow_alerts; ### Gather timeclock and shift enforcement restriction settings - $stmt="SELECT forced_timeclock_login,shift_enforcement,group_shifts,agent_status_viewable_groups,agent_status_view_time,agent_call_log_view,agent_xfer_consultative,agent_xfer_dial_override,agent_xfer_vm_transfer,agent_xfer_blind_transfer,agent_xfer_dial_with_customer,agent_xfer_park_customer_dial,agent_fullscreen,webphone_url_override from vicidial_user_groups where user_group='$VU_user_group';"; + $stmt="SELECT forced_timeclock_login,shift_enforcement,group_shifts,agent_status_viewable_groups,agent_status_view_time,agent_call_log_view,agent_xfer_consultative,agent_xfer_dial_override,agent_xfer_vm_transfer,agent_xfer_blind_transfer,agent_xfer_dial_with_customer,agent_xfer_park_customer_dial,agent_fullscreen,webphone_url_override,webphone_dialpad_override,webphone_systemkey_override from vicidial_user_groups where user_group='$VU_user_group';"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01052',$VD_login,$server_ip,$session_name,$one_mysql_log);} $row=mysql_fetch_row($rslt); @@ -1009,6 +1010,10 @@ else {$agent_call_log_view=0;} $agent_fullscreen = $row[12]; $webphone_url = $row[13]; + $webphone_dialpad_override = $row[14]; + $system_key = $row[15]; + if ( ($webphone_dialpad_override != 'DISABLED') and (strlen($webphone_dialpad_override) > 0) ) + {$webphone_dialpad = $webphone_dialpad_override;} ### BEGIN - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR if ( (ereg('Y',$forced_timeclock_login)) or ( (ereg('ADMIN_EXEMPT',$forced_timeclock_login)) and ($VU_user_level < 8) ) ) @@ -1825,7 +1830,7 @@ else echo "\n"; } echo "