From 5842f7dde5e42fdd0a3848d571043edfc3e177ea Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 2 Mar 2021 15:35:54 +0000 Subject: [PATCH] Changed admin.php Logout to auto-logout through AJAX, with redirect to Admin Home URL git-svn-id: svn://192.168.202.10@3360 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin.php | 66 ++++++++++++++++-- .../trunk/www/vicidial/images/2FA_icon.png | Bin 0 -> 1215 bytes .../www/vicidial/images/2FA_icon_white.png | Bin 0 -> 1319 bytes 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 agc_2-X/trunk/www/vicidial/images/2FA_icon.png create mode 100644 agc_2-X/trunk/www/vicidial/images/2FA_icon_white.png diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 1ab97cb8..5938850d 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -2575,7 +2575,7 @@ if (strlen($dial_status) > 0) ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,enable_queuemetrics_logging,enable_vtiger_integration,qc_features_active,outbound_autodial_active,sounds_central_control_active,enable_second_webform,user_territories_active,custom_fields_enabled,admin_web_directory,webphone_url,first_login_trigger,hosted_settings,default_phone_registration_password,default_phone_login_password,default_server_password,test_campaign_calls,active_voicemail_server,voicemail_timezones,default_voicemail_timezone,default_local_gmt,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting,svn_revision,allow_emails,level_8_disable_add,pass_key,pass_hash_enabled,disable_auto_dial,country_code_list_stats,frozen_server_call_clear,active_modules,allow_chats,enable_languages,language_method,meetme_enter_login_filename,meetme_enter_leave3way_filename,enable_did_entry_list_id,enable_third_webform,default_language,user_hide_realtime_enabled,log_recording_access,alt_ivr_logging,admin_row_click,admin_screen_colors,ofcom_uk_drop_calc,agent_screen_colors,script_remove_js,manual_auto_next,user_new_lead_limit,agent_xfer_park_3way,agent_soundboards,web_loader_phone_length,agent_script,enable_auto_reports,enable_pause_code_limits,enable_drop_lists,allow_ip_lists,system_ip_blacklist,hide_inactive_lists,allow_manage_active_lists,expired_lists_inactive,did_system_filter,enable_gdpr_download_deletion,mute_recordings,user_admin_redirect,list_status_modification_confirmation,sip_event_logging,call_quota_lead_ranking,enable_second_script,enable_first_webform,recording_buttons,opensips_cid_name,require_password_length,user_account_emails,outbound_cid_any,entries_per_page,browser_call_alerts,inbound_answer_config,enable_international_dncs,daily_call_count_limit,allow_shared_dial,agent_search_method FROM system_settings;"; +$stmt = "SELECT use_non_latin,enable_queuemetrics_logging,enable_vtiger_integration,qc_features_active,outbound_autodial_active,sounds_central_control_active,enable_second_webform,user_territories_active,custom_fields_enabled,admin_web_directory,webphone_url,first_login_trigger,hosted_settings,default_phone_registration_password,default_phone_login_password,default_server_password,test_campaign_calls,active_voicemail_server,voicemail_timezones,default_voicemail_timezone,default_local_gmt,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting,svn_revision,allow_emails,level_8_disable_add,pass_key,pass_hash_enabled,disable_auto_dial,country_code_list_stats,frozen_server_call_clear,active_modules,allow_chats,enable_languages,language_method,meetme_enter_login_filename,meetme_enter_leave3way_filename,enable_did_entry_list_id,enable_third_webform,default_language,user_hide_realtime_enabled,log_recording_access,alt_ivr_logging,admin_row_click,admin_screen_colors,ofcom_uk_drop_calc,agent_screen_colors,script_remove_js,manual_auto_next,user_new_lead_limit,agent_xfer_park_3way,agent_soundboards,web_loader_phone_length,agent_script,enable_auto_reports,enable_pause_code_limits,enable_drop_lists,allow_ip_lists,system_ip_blacklist,hide_inactive_lists,allow_manage_active_lists,expired_lists_inactive,did_system_filter,enable_gdpr_download_deletion,mute_recordings,user_admin_redirect,list_status_modification_confirmation,sip_event_logging,call_quota_lead_ranking,enable_second_script,enable_first_webform,recording_buttons,opensips_cid_name,require_password_length,user_account_emails,outbound_cid_any,entries_per_page,browser_call_alerts,inbound_answer_config,enable_international_dncs,daily_call_count_limit,allow_shared_dial,agent_search_method,admin_home_url FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -2676,6 +2676,7 @@ if ($qm_conf_ct > 0) $SSdaily_call_count_limit = $row[91]; $SSallow_shared_dial = $row[92]; $SSagent_search_method = $row[93]; + $SSadmin_home_url = $row[94]; } ##### END SETTINGS LOOKUP ##### ########################################### @@ -5477,12 +5478,13 @@ if ($SSscript_remove_js > 0) # 210211-1145 - Added Matex use information # 210226-1545 - Added Copy Phone functionality # 210227-1126 - Variable filter changes +# 210302-1032 - Changed Logout to auto-logout through AJAX, with redirect to Admin Home URL # # 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.14-789a'; -$build = '210227-1126'; +$admin_version = '2.14-790a'; +$build = '210302-1032'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -5544,8 +5546,62 @@ if ($force_logout) { if( (strlen($PHP_AUTH_USER)>0) or (strlen($PHP_AUTH_PW)>0) ) { - Header("WWW-Authenticate: Basic realm=\"CONTACT-CENTER-ADMIN\""); - Header("HTTP/1.0 401 Unauthorized"); + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + ?> + + \n"; + echo "\n"; + + # Header("WWW-Authenticate: Basic realm=\"CONTACT-CENTER-ADMIN\""); + # Header("HTTP/1.0 401 Unauthorized"); } echo _QXZ("You have now logged out. Thank you")."\n
"._QXZ("To log back in").", "._QXZ("click here").""; exit; diff --git a/agc_2-X/trunk/www/vicidial/images/2FA_icon.png b/agc_2-X/trunk/www/vicidial/images/2FA_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c77b11d32599bc732ce71ba2b9e4dc1b3112b990 GIT binary patch literal 1215 zcmV;w1VHWFU8GbZ8()Nlj2>E@cM*00bjRL_t(o!_C=ih?P|o z2H?lWNmCos?xmC^L6A{-iL8($#4dFI6JfK zpn|BZq@i-itVGSbHqOlH&wJqGaL&v*#^_f4p!kW>_S&wMt=8TTfIPAFcUXp1bQ=XG>*gMyu`lPZ|KCP zq)6F1@g%m^<76xr_47IRSL;o_SKY1E`UWfccVSe$Ko#<4FsxK-(=^L=;LmXAa2$!_ zo8`P2K$qfU{EW@nxh)tIpy%LnoY3shkHbrKB>uO!7L)q%cPM7W=bnCi?g;HQEu!z@ z(U7@B?lMfp`0(ReEXOi@mAR|&STw_n-M0jy)0QR68yRk8;F{|MJmdtG^ zqKyLm0aG%s4J!kvzckqpRaLgYn@v?-V|61y4{9JKKEoGr zxFBV=k-~6Tq~GL#ZckL}){*tvC-^=5czpy)f7XLnF&%H@<;wZmj-Aa0x)(oX;fn&c z45X*VGu?O%_uw0RomxI8&##RLDK!)5-%&bnW^`oFOYj@R~w`1^l1#N7@+>GCwNR<-R*#*IUT_P?Z zS5~2*6$P=fBA|=wOsf}YEAFhaz-<{n9qS7H9oZm7s|B)zN5UARv!RM(n;KPIS5{e| zy|CNcDi&G3{;L{o)*N37czjsuOcl2?Nt7Noxin&=-V*w9Zcya-yrp8i2R9Am=Hsp!3oa}$z$|>w z55P`5h@mwb<8YF8Ab#>MNxH}v=cc}c~Fem4y?G=)3VWGwk8EeA>iC}v{5)N5A dHlUko{{vFgCr$twpTqzF002ovPDHLkV1m*YJumH1p*3JL`03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00fIkL_t(o!_Ap%h?P|o zhM(;?Ickl0OG~Xx34)BuG}1znkjl_5{>+k!jOa#`1a`sdM_E{5<)5Gknl6|WmXv50 zLW}B07fs9ZLTV-6#_Ke)q=>6`>AM=c?1` ziBNl~XQ?aw7YEgOYHd#<*OI!1)G6wz#gC_GrkRYDy7tz=d%t_7u!8(SErWZ)vL@{O*fs*BS62rM9IWW zx17~dgT1Th;1I9_I2d+^0wbzryc$GT0v`bzfW1IdgwBaU^b%kua7K3#{SH_Ne3eq# z(!t^U5O@Q)8Mrkv$#En4F7Q}NX?>6x0n7l#1A`(zZUt5Yt5Ql|tLuSvz~jJ>YE+$p z>PsD@kY(zbF}GHIQr)aJs?BPf+NvH^cSrr7lCgh#%q@jOxdlxpM1NGr#k_j;(;(Ct zcB!*7KAu;b{!gMesVQpx>e#uw*r(3S_*hp7(Owlq#pl4e!Uh zKA<5oL@rc9^kZO)Iuy7u1WIRU16~6r0B^?P3h~+i9IiIe7T~9pQX6npB=Z81wleRu z0xPsE!A22!H1S zC&j!i)h2p0BgX~;Cjgs(St+F%z@iM@7jmyhJV1 zhy<~kjKXP)qUpwFlx`(E%x1a0KLaaLN{55w!pz|*;MZ6z!0APsC9pql9<5dHE|KHzi09|2+cV>v z)M-UFCPXnPg-6x8xD;+JdbTIZaqcpDT?q#bk(!AA+l$Cv9mQax`dJy0JJm^HV^$=1 zi|nLIh)z^@6dBpCUJ=j7mAD@N7FU=x9aN`>)w-~;B6L9kZR)a0g~`YeAEgAzDKY1o z5F>f3rN%#^HiOLqVOQzTXMKZR$hnuz2UWlH&H>y9V@2L+&81;#{lhn0k7PPply0kWS&oX4+R>u@wvq!08)Y0m& zZ0{+WXB*1cYg9)ci-;blep$wNOQe?<)C+b=3oa}`MLRwq}TWKkF_iH>qtu`vY8acSh