diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index cdbbda80..5feaf1e0 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -131,6 +131,9 @@ OTHER CHANGES: 26. Added case-sensitive user ID validation on agent login. +27. Added option in phones and voicemail to display message counts on the + Admin Summary screen. + 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 415734dc..bf7566da 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -86,6 +86,7 @@ user_group VARCHAR(20) default '---ALL---', voicemail_greeting VARCHAR(100) default '', voicemail_dump_exten_no_inst VARCHAR(20) default '85026666666667', voicemail_instructions ENUM('Y','N') default 'Y', +on_login_report enum('Y','N') NOT NULL default 'N', index (server_ip), index (voicemail_id), index (dialplan_number), @@ -2319,7 +2320,8 @@ delete_vm_after_email ENUM('N','Y') default 'N', voicemail_timezone VARCHAR(30) default 'eastern', voicemail_options VARCHAR(255) default '', user_group VARCHAR(20) default '---ALL---', -voicemail_greeting VARCHAR(100) default '' +voicemail_greeting VARCHAR(100) default '', +on_login_report enum('Y','N') NOT NULL default 'N' ) ENGINE=MyISAM; CREATE TABLE vicidial_user_territory_log ( @@ -3365,4 +3367,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1401',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1402',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.10.sql b/agc_2-X/trunk/extras/upgrade_2.10.sql index e936e02d..3c494091 100644 --- a/agc_2-X/trunk/extras/upgrade_2.10.sql +++ b/agc_2-X/trunk/extras/upgrade_2.10.sql @@ -174,3 +174,9 @@ UPDATE system_settings SET db_schema_version='1400',db_schema_update_date=NOW() ALTER TABLE vicidial_campaigns MODIFY manual_dial_search_checkbox ENUM('SELECTED','SELECTED_RESET','UNSELECTED','UNSELECTED_RESET','SELECTED_LOCK','UNSELECTED_LOCK') default 'SELECTED'; UPDATE system_settings SET db_schema_version='1401',db_schema_update_date=NOW() where db_schema_version < 1401; + +ALTER TABLE vicidial_voicemail ADD on_login_report enum('Y','N') NOT NULL default 'N'; + +ALTER TABLE phones ADD on_login_report enum('Y','N') NOT NULL default 'N'; + +UPDATE system_settings SET db_schema_version='1402',db_schema_update_date=NOW() where db_schema_version < 1402; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index af7f57c5..6219847a 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1768,6 +1768,8 @@ if (isset($_GET["old_voicemail_greeting"])) {$old_voicemail_greeting=$_GET["o elseif (isset($_POST["old_voicemail_greeting"])) {$old_voicemail_greeting=$_POST["old_voicemail_greeting"];} if (isset($_GET["allow_voicemail_greeting"])) {$allow_voicemail_greeting=$_GET["allow_voicemail_greeting"];} elseif (isset($_POST["allow_voicemail_greeting"])) {$allow_voicemail_greeting=$_POST["allow_voicemail_greeting"];} +if (isset($_GET["show_vm_on_summary"])) {$show_vm_on_summary=$_GET["show_vm_on_summary"];} + elseif (isset($_POST["show_vm_on_summary"])) {$show_vm_on_summary=$_POST["show_vm_on_summary"];} if (isset($_GET["pause_after_next_call"])) {$pause_after_next_call=$_GET["pause_after_next_call"];} elseif (isset($_POST["pause_after_next_call"])) {$pause_after_next_call=$_POST["pause_after_next_call"];} if (isset($_GET["owner_populate"])) {$owner_populate=$_GET["owner_populate"];} @@ -3433,12 +3435,13 @@ else # 150119-0920 - Added more list local calltime safety, issue #812 # 150120-0749 - Prevent modification of user_group ID, Hide non-functional agent_extended_alt_dial campaign feature, Export Calls Report Carrier added # 150210-0657 - Added LOCK options for manual_dial_search_checkbox campaign setting +# 150217-0702 - Added Show VM on Summary Screen option for phones and voicemail boxes # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.10-473a'; -$build = '150210-0657'; +$admin_version = '2.10-474a'; +$build = '150217-0702'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -14168,7 +14171,7 @@ if ($ADD==41111111111) if ( ($voicemail_greeting == '') and (strlen($old_voicemail_greeting) > 0) ) {$voicemail_greeting = '---DELETE---';} - $stmt="UPDATE phones set extension='$extension', dialplan_number='$dialplan_number', voicemail_id='$voicemail_id', phone_ip='$phone_ip', computer_ip='$computer_ip', server_ip='$server_ip', login='$login', pass='$pass', status='$status', active='$active', phone_type='$phone_type', fullname='$fullname', company='$company', picture='$picture', protocol='$protocol', local_gmt='$local_gmt', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', login_user='$login_user', login_pass='$login_pass', login_campaign='$login_campaign', park_on_extension='$park_on_extension', conf_on_extension='$conf_on_extension', VICIDIAL_park_on_extension='$VICIDIAL_park_on_extension', VICIDIAL_park_on_filename='$VICIDIAL_park_on_filename', monitor_prefix='$monitor_prefix', recording_exten='$recording_exten', voicemail_exten='$voicemail_exten', voicemail_dump_exten='$voicemail_dump_exten', ext_context='$ext_context', dtmf_send_extension='$dtmf_send_extension', call_out_number_group='$call_out_number_group', client_browser='$client_browser', install_directory='$install_directory', local_web_callerID_URL='" . mysqli_real_escape_string($link, $local_web_callerID_URL) . "', VICIDIAL_web_URL='" . mysqli_real_escape_string($link, $VICIDIAL_web_URL) . "', AGI_call_logging_enabled='$AGI_call_logging_enabled', user_switching_enabled='$user_switching_enabled', conferencing_enabled='$conferencing_enabled', admin_hangup_enabled='$admin_hangup_enabled', admin_hijack_enabled='$admin_hijack_enabled', admin_monitor_enabled='$admin_monitor_enabled', call_parking_enabled='$call_parking_enabled', updater_check_enabled='$updater_check_enabled', AFLogging_enabled='$AFLogging_enabled', QUEUE_ACTION_enabled='$QUEUE_ACTION_enabled', CallerID_popup_enabled='$CallerID_popup_enabled', voicemail_button_enabled='$voicemail_button_enabled', enable_fast_refresh='$enable_fast_refresh', fast_refresh_rate='$fast_refresh_rate', enable_persistant_mysql='$enable_persistant_mysql', auto_dial_next_number='$auto_dial_next_number', VDstop_rec_after_each_call='$VDstop_rec_after_each_call', DBX_server='$DBX_server', DBX_database='$DBX_database', DBX_user='$DBX_user', DBX_pass='$DBX_pass', DBX_port='$DBX_port', DBY_server='$DBY_server', DBY_database='$DBY_database', DBY_user='$DBY_user', DBY_pass='$DBY_pass', DBY_port='$DBY_port', outbound_cid='$outbound_cid', enable_sipsak_messages='$enable_sipsak_messages', email='$email', template_id='$template_id', conf_override='$conf_override',phone_context='$phone_context',phone_ring_timeout='$phone_ring_timeout',conf_secret='$conf_secret', delete_vm_after_email='$delete_vm_after_email',is_webphone='$is_webphone',use_external_server_ip='$use_external_server_ip',codecs_list='$codecs_list',codecs_with_template='$codecs_with_template',webphone_dialpad='$webphone_dialpad',on_hook_agent='$on_hook_agent',webphone_auto_answer='$webphone_auto_answer',voicemail_timezone='$voicemail_timezone',voicemail_options='$voicemail_options',user_group='$user_group',voicemail_greeting='$voicemail_greeting',voicemail_dump_exten_no_inst='$voicemail_dump_exten_no_inst',voicemail_instructions='$voicemail_instructions' where extension='$old_extension' and server_ip='$old_server_ip';"; + $stmt="UPDATE phones set extension='$extension', dialplan_number='$dialplan_number', voicemail_id='$voicemail_id', phone_ip='$phone_ip', computer_ip='$computer_ip', server_ip='$server_ip', login='$login', pass='$pass', status='$status', active='$active', phone_type='$phone_type', fullname='$fullname', company='$company', picture='$picture', protocol='$protocol', local_gmt='$local_gmt', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', login_user='$login_user', login_pass='$login_pass', login_campaign='$login_campaign', park_on_extension='$park_on_extension', conf_on_extension='$conf_on_extension', VICIDIAL_park_on_extension='$VICIDIAL_park_on_extension', VICIDIAL_park_on_filename='$VICIDIAL_park_on_filename', monitor_prefix='$monitor_prefix', recording_exten='$recording_exten', voicemail_exten='$voicemail_exten', voicemail_dump_exten='$voicemail_dump_exten', ext_context='$ext_context', dtmf_send_extension='$dtmf_send_extension', call_out_number_group='$call_out_number_group', client_browser='$client_browser', install_directory='$install_directory', local_web_callerID_URL='" . mysqli_real_escape_string($link, $local_web_callerID_URL) . "', VICIDIAL_web_URL='" . mysqli_real_escape_string($link, $VICIDIAL_web_URL) . "', AGI_call_logging_enabled='$AGI_call_logging_enabled', user_switching_enabled='$user_switching_enabled', conferencing_enabled='$conferencing_enabled', admin_hangup_enabled='$admin_hangup_enabled', admin_hijack_enabled='$admin_hijack_enabled', admin_monitor_enabled='$admin_monitor_enabled', call_parking_enabled='$call_parking_enabled', updater_check_enabled='$updater_check_enabled', AFLogging_enabled='$AFLogging_enabled', QUEUE_ACTION_enabled='$QUEUE_ACTION_enabled', CallerID_popup_enabled='$CallerID_popup_enabled', voicemail_button_enabled='$voicemail_button_enabled', enable_fast_refresh='$enable_fast_refresh', fast_refresh_rate='$fast_refresh_rate', enable_persistant_mysql='$enable_persistant_mysql', auto_dial_next_number='$auto_dial_next_number', VDstop_rec_after_each_call='$VDstop_rec_after_each_call', DBX_server='$DBX_server', DBX_database='$DBX_database', DBX_user='$DBX_user', DBX_pass='$DBX_pass', DBX_port='$DBX_port', DBY_server='$DBY_server', DBY_database='$DBY_database', DBY_user='$DBY_user', DBY_pass='$DBY_pass', DBY_port='$DBY_port', outbound_cid='$outbound_cid', enable_sipsak_messages='$enable_sipsak_messages', email='$email', template_id='$template_id', conf_override='$conf_override',phone_context='$phone_context',phone_ring_timeout='$phone_ring_timeout',conf_secret='$conf_secret', delete_vm_after_email='$delete_vm_after_email',is_webphone='$is_webphone',use_external_server_ip='$use_external_server_ip',codecs_list='$codecs_list',codecs_with_template='$codecs_with_template',webphone_dialpad='$webphone_dialpad',on_hook_agent='$on_hook_agent',webphone_auto_answer='$webphone_auto_answer',voicemail_timezone='$voicemail_timezone',voicemail_options='$voicemail_options',user_group='$user_group',voicemail_greeting='$voicemail_greeting',voicemail_dump_exten_no_inst='$voicemail_dump_exten_no_inst',voicemail_instructions='$voicemail_instructions',on_login_report='$show_vm_on_summary' where extension='$old_extension' and server_ip='$old_server_ip';"; $rslt=mysql_to_mysqli($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$server_ip';"; @@ -14628,7 +14631,7 @@ if ($ADD==471111111111) { if ( ($voicemail_greeting == '') and (strlen($old_voicemail_greeting) > 0) ) {$voicemail_greeting = '---DELETE---';} - $stmt="UPDATE vicidial_voicemail set fullname='$fullname',active='$active',pass='$pass',email='$email',delete_vm_after_email='$delete_vm_after_email',voicemail_timezone='$voicemail_timezone',voicemail_options='$voicemail_options',user_group='$user_group',voicemail_greeting='$voicemail_greeting' where voicemail_id='$voicemail_id';"; + $stmt="UPDATE vicidial_voicemail set fullname='$fullname',active='$active',pass='$pass',email='$email',delete_vm_after_email='$delete_vm_after_email',voicemail_timezone='$voicemail_timezone',voicemail_options='$voicemail_options',user_group='$user_group',voicemail_greeting='$voicemail_greeting',on_login_report='$show_vm_on_summary' where voicemail_id='$voicemail_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "|$stmt|";} @@ -28254,7 +28257,7 @@ if ($ADD==31111111111) echo "\n"; + echo "\n"; + + echo "\n"; echo "\n"; echo "\n"; @@ -29288,7 +29293,7 @@ if ($ADD==371111111111) echo "
\n"; echo ""; - $stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email,is_webphone,use_external_server_ip,codecs_list,codecs_with_template,webphone_dialpad,on_hook_agent,webphone_auto_answer,voicemail_timezone,voicemail_options,user_group,voicemail_greeting,voicemail_dump_exten_no_inst,voicemail_instructions from phones where extension='$extension' and server_ip='$server_ip' $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email,is_webphone,use_external_server_ip,codecs_list,codecs_with_template,webphone_dialpad,on_hook_agent,webphone_auto_answer,voicemail_timezone,voicemail_options,user_group,voicemail_greeting,voicemail_dump_exten_no_inst,voicemail_instructions,on_login_report from phones where extension='$extension' and server_ip='$server_ip' $LOGadmin_viewable_groupsSQL;"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); @@ -28322,7 +28325,9 @@ if ($ADD==31111111111) echo ""; } - echo "
"._QXZ("Voicemail Instructions").": $NWB#phones-voicemail_instructions$NWE
"._QXZ("Voicemail Instructions").": $NWB#phones-voicemail_instructions$NWE
"._QXZ("Show VM on Summary Screen").": $NWB#phones-show_vm_on_summary$NWE
"._QXZ("Company").": $NWB#phones-company$NWE
"._QXZ("Picture").": $NWB#phones-picture$NWE
\n"; echo "\n"; + echo "\n"; if ($SSallow_voicemail_greeting > 0) { echo "\n"; @@ -34201,19 +34208,19 @@ if ($ADD==999990) $agent_total++; if ( (preg_match("/INCALL/i",$status)) or (preg_match("/QUEUE/i",$status)) ) {$agent_incall++; } } - if (preg_match("/MXAG/",$SShosted_settings)) + if (preg_match("/MXAG/",$SShosted_settings)) + { + $vla_set = $SShosted_settings; + $vla_set = preg_replace("/.*MXAG|_BUILD_|DRA| /",'',$vla_set); + $vla_set = preg_replace('/[^0-9]/','',$vla_set); + if (strlen($vla_set)>0) { - $vla_set = $SShosted_settings; - $vla_set = preg_replace("/.*MXAG|_BUILD_|DRA| /",'',$vla_set); - $vla_set = preg_replace('/[^0-9]/','',$vla_set); - if (strlen($vla_set)>0) - { - $AAf=''; $AAb=''; - if ($agent_total >= $vla_set) - {$AAf=''; $AAb='';} - $agent_total = "$AAf$agent_total / $vla_set$AAb"; - } + $AAf=''; $AAb=''; + if ($agent_total >= $vla_set) + {$AAf=''; $AAb='';} + $agent_total = "$AAf$agent_total / $vla_set$AAb"; } + } echo ""; echo ""; @@ -34243,7 +34250,41 @@ if ($ADD==999990) echo "\n"; echo "\n"; echo "\n"; - + + // New voicemailbox code + $stmt="(SELECT voicemail_id,count(*),messages,old_messages,'vm','vm' from vicidial_voicemail where on_login_report='Y' $LOGadmin_viewable_groupsSQL group by voicemail_id) UNION (SELECT voicemail_id,count(*),messages,old_messages,extension,server_ip from phones where on_login_report='Y' $LOGadmin_viewable_groupsSQL group by voicemail_id) order by voicemail_id;"; + $rslt=mysql_to_mysqli($stmt, $link); + $vm_rows=mysqli_num_rows($rslt); + if ($vm_rows>0) + { + echo ""; + echo ""; # Padding + echo ""; + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + while($row=mysqli_fetch_array($rslt)) + { + echo "\n"; + if ($row[4] == 'vm') + { + echo "\n"; + } + else + { + echo "\n"; + } + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + } + // End new voicemail box code echo "
\n"; echo ""; - $stmt="SELECT voicemail_id,pass,fullname,active,email,messages,old_messages,delete_vm_after_email,voicemail_timezone,voicemail_options,user_group,voicemail_greeting from vicidial_voicemail where voicemail_id='$voicemail_id' $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT voicemail_id,pass,fullname,active,email,messages,old_messages,delete_vm_after_email,voicemail_timezone,voicemail_options,user_group,voicemail_greeting,on_login_report from vicidial_voicemail where voicemail_id='$voicemail_id' $LOGadmin_viewable_groupsSQL;"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $voicemail_id = $row[0]; @@ -29303,6 +29308,7 @@ if ($ADD==371111111111) $voicemail_options = $row[9]; $user_group = $row[10]; $voicemail_greeting = $row[11]; + $show_vm_on_summary = $row[12]; echo "
"._QXZ("MODIFY A VOICEMAIL BOX").": $tts_id
\n"; echo "\n"; @@ -29320,6 +29326,7 @@ if ($ADD==371111111111) echo "\n"; echo "$NWB#voicemail-user_group$NWE
"._QXZ("Delete Voicemail After Email").": $NWB#voicemail-delete_vm_after_email$NWE
"._QXZ("Show VM on Summary Screen").": $NWB#voicemail-show_vm_on_summary$NWE
"._QXZ("Voicemail Greeting").": "._QXZ("audio chooser")." $NWB#voicemail-voicemail_greeting$NWE
  "._QXZ("Agents Logged In")."  
"._QXZ("Lists").": ".($lists["Y"]+0)."".($lists["N"]+0)."".($lists["Y"]+$lists["N"]+0)."
"._QXZ("In-Groups").": ".($ingroups["Y"]+0)."".($ingroups["N"]+0)."".($ingroups["Y"]+$ingroups["N"]+0)."
"._QXZ("DIDs").": ".($dids["Y"]+0)."".($dids["N"]+0)."".($dids["Y"]+$dids["N"]+0)."
 
  Voicemail Box    New    Old    Total  
$row[0]:$row[0]:$row[2]$row[3]".($row[2]+$row[3])."
\n"; echo "
\n"; diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index f0609eda..47777c3d 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -38,6 +38,7 @@ # 150120-0636 - Hide non-functional agent_extended_alt_dial campaign feature # 150204-1246 - Small fixes, issue #826 # 150210-0659 - Added LOCK options for manual_dial_search_checkbox +# 150217-0657 - Added vmail show on login option # require("dbconnect_mysqli.php"); @@ -3451,18 +3452,22 @@ if ($SSoutbound_autodial_active > 0)
+
-
+
-
+
-
+
-
@@ -3472,18 +3477,27 @@ if ($SSoutbound_autodial_active > 0)
+
- +
+ +
+ - +
+
-
+
-
+
- 0) - +
+ + - +