From 97586986dda47a144e9a62d4da144f0fb28e7868 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 7 Oct 2020 20:00:37 +0000 Subject: [PATCH] Fix for admin menu items display in some non admin.php admin pages git-svn-id: svn://192.168.202.10@3303 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin_bulk_tools.php | 6 +++++- agc_2-X/trunk/www/vicidial/admin_email_accounts.php | 3 ++- agc_2-X/trunk/www/vicidial/admin_languages.php | 4 +++- agc_2-X/trunk/www/vicidial/admin_soundboard.php | 4 +++- agc_2-X/trunk/www/vicidial/callcard_admin.php | 4 +++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php b/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php index 7296929e..4901b915 100644 --- a/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php +++ b/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php @@ -127,7 +127,7 @@ if ($ACCIDclear_all == "Y") {$form_to_run="ACCIDDELETEconfirm";} ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$sys_settings_stmt = "SELECT use_non_latin,enable_languages,language_method FROM system_settings;"; +$sys_settings_stmt = "SELECT use_non_latin,enable_languages,language_method,campaign_cid_areacodes_enabled,sounds_central_control_active,contacts_enabled,enable_auto_reports FROM system_settings;"; $sys_settings_rslt=mysql_to_mysqli($sys_settings_stmt, $link); if ($DB) {echo "$sys_settings_stmt|";} $num_rows = mysqli_num_rows($sys_settings_rslt); @@ -137,6 +137,10 @@ if ($num_rows > 0) $non_latin = $sys_settings_row[0]; $SSenable_languages = $sys_settings_row[1]; $SSlanguage_method = $sys_settings_row[2]; + $SScampaign_cid_areacodes_enabled = $sys_settings_row[3]; + $SSsounds_central_control_active = $sys_settings_row[4]; + $SScontacts_enabled = $sys_settings_row[5]; + $SSenable_auto_reports = $sys_settings_row[6]; } else { diff --git a/agc_2-X/trunk/www/vicidial/admin_email_accounts.php b/agc_2-X/trunk/www/vicidial/admin_email_accounts.php index 74088882..9c712b0c 100644 --- a/agc_2-X/trunk/www/vicidial/admin_email_accounts.php +++ b/agc_2-X/trunk/www/vicidial/admin_email_accounts.php @@ -96,7 +96,7 @@ if (isset($_GET["agent_search_method"])) {$agent_search_method=$_GET["agent_ ############################################# ##### 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,allow_emails,allow_emails,level_8_disable_add,enable_languages,language_method,active_modules 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,allow_emails,allow_emails,level_8_disable_add,enable_languages,language_method,active_modules,enable_auto_reports FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -140,6 +140,7 @@ if ($qm_conf_ct > 0) $SSenable_languages = $row[34]; $SSlanguage_method = $row[35]; $SSactive_modules = $row[36]; + $SSenable_auto_reports = $row[37]; } ##### END SETTINGS LOOKUP ##### ########################################### diff --git a/agc_2-X/trunk/www/vicidial/admin_languages.php b/agc_2-X/trunk/www/vicidial/admin_languages.php index 651b6586..db452469 100644 --- a/agc_2-X/trunk/www/vicidial/admin_languages.php +++ b/agc_2-X/trunk/www/vicidial/admin_languages.php @@ -84,7 +84,7 @@ $PHP_SELF=$_SERVER['PHP_SELF']; ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,auto_dial_limit,user_territories_active,allow_custom_dialplan,callcard_enabled,admin_modify_refresh,nocache_admin,webroot_writable,allow_emails,active_modules,sounds_central_control_active,qc_features_active,contacts_enabled,enable_languages,language_method,admin_web_directory,admin_screen_colors FROM system_settings;"; +$stmt = "SELECT use_non_latin,auto_dial_limit,user_territories_active,allow_custom_dialplan,callcard_enabled,admin_modify_refresh,nocache_admin,webroot_writable,allow_emails,active_modules,sounds_central_control_active,qc_features_active,contacts_enabled,enable_languages,language_method,admin_web_directory,admin_screen_colors,enable_auto_reports,campaign_cid_areacodes_enabled FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -108,6 +108,8 @@ if ($qm_conf_ct > 0) $SSlanguage_method = $row[14]; $SSadmin_web_directory = $row[15]; $SSadmin_screen_colors = $row[16]; + $SSenable_auto_reports = $row[17]; + $SScampaign_cid_areacodes_enabled = $row[18]; } ##### END SETTINGS LOOKUP ##### ########################################### diff --git a/agc_2-X/trunk/www/vicidial/admin_soundboard.php b/agc_2-X/trunk/www/vicidial/admin_soundboard.php index 6a279c77..8a7b1a8f 100644 --- a/agc_2-X/trunk/www/vicidial/admin_soundboard.php +++ b/agc_2-X/trunk/www/vicidial/admin_soundboard.php @@ -87,7 +87,7 @@ if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,auto_dial_limit,user_territories_active,allow_custom_dialplan,callcard_enabled,admin_modify_refresh,nocache_admin,webroot_writable,allow_emails,active_modules,sounds_central_control_active,qc_features_active,contacts_enabled,enable_languages,active_modules,agent_soundboards,language_method FROM system_settings;"; +$stmt = "SELECT use_non_latin,auto_dial_limit,user_territories_active,allow_custom_dialplan,callcard_enabled,admin_modify_refresh,nocache_admin,webroot_writable,allow_emails,active_modules,sounds_central_control_active,qc_features_active,contacts_enabled,enable_languages,active_modules,agent_soundboards,language_method,enable_auto_reports,campaign_cid_areacodes_enabled FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -111,6 +111,8 @@ if ($qm_conf_ct > 0) $SSactive_modules = $row[14]; $SSagent_soundboards = $row[15]; $SSlanguage_method = $row[16]; + $SSenable_auto_reports = $row[17]; + $SScampaign_cid_areacodes_enabled = $row[18]; } ##### END SETTINGS LOOKUP ##### ########################################### diff --git a/agc_2-X/trunk/www/vicidial/callcard_admin.php b/agc_2-X/trunk/www/vicidial/callcard_admin.php index ba2a6d92..a4220891 100644 --- a/agc_2-X/trunk/www/vicidial/callcard_admin.php +++ b/agc_2-X/trunk/www/vicidial/callcard_admin.php @@ -87,7 +87,7 @@ $SEARCHONLY=0; ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,callcard_enabled,enable_languages,language_method,active_modules,contacts_enabled,allow_emails,outbound_autodial_active,enable_tts_integration,sounds_central_control_active,qc_features_active FROM system_settings;"; +$stmt = "SELECT use_non_latin,callcard_enabled,enable_languages,language_method,active_modules,contacts_enabled,allow_emails,outbound_autodial_active,enable_tts_integration,sounds_central_control_active,qc_features_active,enable_auto_reports,campaign_cid_areacodes_enabled FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $ss_conf_ct = mysqli_num_rows($rslt); @@ -105,6 +105,8 @@ if ($ss_conf_ct > 0) $SSenable_tts_integration = $row[8]; $SSsounds_central_control_active = $row[9]; $SSqc_features_active = $row[10]; + $SSenable_auto_reports = $row[11]; + $SScampaign_cid_areacodes_enabled = $row[12]; } ##### END SETTINGS LOOKUP ##### ###########################################