diff --git a/UPGRADE b/UPGRADE index f1206ba7..4de28ce7 100644 --- a/UPGRADE +++ b/UPGRADE @@ -29,11 +29,14 @@ OTHER CHANGES: to use AFTHRS/NANQUE/TIMEOT statuses respectively 2. Added an option to record calls that enter through a DID until they end or - enter an in-group queue + enter an in-group queue. MUST ENABLE --MIX CRONTAB ENTRY!!! 3. Added ability to have AGENTDIRECT calls that drop go to user's defined voicemail box +4. Added ability to use a webphone added in an IFRAME in the agent screen. + Tested with Zoiper webphone and sample code included + diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 33ba07d4..40154aff 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -73,6 +73,8 @@ phone_context VARCHAR(20) default 'default', phone_ring_timeout SMALLINT(3) default '60', conf_secret VARCHAR(20) default 'test', delete_vm_after_email ENUM('N','Y') default 'N', +is_webphone ENUM('Y','N') default 'N', +use_external_server_ip ENUM('Y','N') default 'N', index (server_ip), unique index extenserver (extension, server_ip) ); @@ -100,7 +102,7 @@ vd_server_logs ENUM('Y','N') default 'Y', agi_output ENUM('NONE','STDERR','FILE','BOTH') default 'FILE', vicidial_balance_active ENUM('Y','N') default 'N', balance_trunks_offlimits SMALLINT(5) UNSIGNED default '0', -recording_web_link ENUM('SERVER_IP','ALT_IP') default 'SERVER_IP', +recording_web_link ENUM('SERVER_IP','ALT_IP','EXTERNAL_IP') default 'SERVER_IP', alt_server_ip VARCHAR(100) default '', active_asterisk_server ENUM('Y','N') default 'Y', generate_vicidial_conf ENUM('Y','N') default 'Y', @@ -116,7 +118,8 @@ carrier_logging_active ENUM('Y','N') default 'Y', vicidial_balance_rank TINYINT(3) UNSIGNED default '0', rebuild_music_on_hold ENUM('Y','N') default 'Y', active_agent_login_server ENUM('Y','N') default 'Y', -conf_secret VARCHAR(20) default 'test' +conf_secret VARCHAR(20) default 'test', +external_server_ip VARCHAR(100) default '' ); CREATE UNIQUE INDEX server_id on servers (server_id); @@ -1197,7 +1200,10 @@ auto_dial_limit VARCHAR(5) default '4', user_territories_active ENUM('0','1') default '0', allow_custom_dialplan ENUM('0','1') default '0', db_schema_update_date DATETIME, -enable_second_webform ENUM('0','1') default '1' +enable_second_webform ENUM('0','1') default '1', +default_webphone ENUM('1','0') default '0', +default_external_server_ip ENUM('1','0') default '0', +webphone_url VARCHAR(255) default '' ); CREATE TABLE vicidial_campaigns_list_mix ( @@ -2034,7 +2040,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='1197',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1198',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 519530c8..ff2b32e4 100644 --- a/extras/upgrade_2.4.sql +++ b/extras/upgrade_2.4.sql @@ -22,3 +22,15 @@ UPDATE system_settings SET db_schema_version='1196',db_schema_update_date=NOW(); ALTER TABLE vicidial_inbound_groups ADD ignore_list_script_override ENUM('Y','N') default 'N'; UPDATE system_settings SET db_schema_version='1197',db_schema_update_date=NOW(); + +ALTER TABLE servers ADD external_server_ip VARCHAR(100) default ''; +ALTER TABLE servers MODIFY recording_web_link ENUM('SERVER_IP','ALT_IP','EXTERNAL_IP') default 'SERVER_IP'; + +ALTER TABLE phones ADD is_webphone ENUM('Y','N') default 'N'; +ALTER TABLE phones ADD use_external_server_ip ENUM('Y','N') default 'N'; + +ALTER TABLE system_settings ADD default_webphone ENUM('1','0') default '0'; +ALTER TABLE system_settings ADD default_external_server_ip ENUM('1','0') default '0'; +ALTER TABLE system_settings ADD webphone_url VARCHAR(255) default ''; + +UPDATE system_settings SET db_schema_version='1198',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 3cbdf07c..14f60596 100644 --- a/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt +++ b/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt @@ -9,6 +9,18 @@ This option allows you to set the calls coming into this DID to be recorded. Y w Click here to see a list of recordings and calls for this DID|| Ignore List Script Override|| This option allows you to ignore the list ID Script Override option for calls coming into this In-Group. Setting this to Y will ignore any List ID script settings. Default is N|| +External Server IP|| +This setting is where you can put a server IP or other machine name that can be used in place of the server_ip when using a webphone in the agent interface. For this to work you also must have the phones entry set to use the External Server IP. Default is empty|| +Set As Webphone|| +Setting this option to Y will attempt to load a web-based phone when the agent logs into their agent screen. Default is N.|| +Use External Server IP|| +If using as a web phone, you can set this to Y to use the servers External IP to register to instead of the Server IP. Default is empty|| +Default Webphone|| +If set to 1, this option will make all new phones created have Set As Webphone set to Y. Default is 0|| +Default External Server IP|| +If set to 1, this option will make all new phones created have Use External Server IP set to Y. Default is 0|| +Webphone URL|| +This is the URL of the webphone that will be used with this system if it is enabled in the phones record that an agent is using. Default is empty|| ############################################################ CLIENT diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index b01beb12..cc03c0cd 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -273,10 +273,11 @@ # 100109-1338 - Fixed Manual dial live call detection # 100116-0709 - Added presets to script and web form variables # 100123-0954 - changes to AGENTDIRECT selection span +# 100131-2233 - Added functions to allow for a webphone loaded in a separate IFRAME # -$version = '2.4-251'; -$build = '100123-0954'; +$version = '2.4-252'; +$build = '100131-2233'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -657,66 +658,27 @@ else } if ($relogin == 'YES') -{ -echo "
| \n"; -echo "\n"; -echo " |