diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 04d57963..44752979 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -3747,12 +3747,13 @@ else # 160325-1435 - Changes for sidebar, added callback_useronly_move_minutes campaign feature # 160327-0145 - Reworked System Summary Screen # 160328-0316 - Added links to the real-time report from the summary screen +# 160330-1559 - Redesign of Admin sub-menu and added icons # # 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.12-546a'; -$build = '160328-0316'; +$admin_version = '2.12-547a'; +$build = '160330-1559'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -31924,7 +31925,7 @@ if ($ADD==311111111111111) $modify_footer_refresh=1; } echo "
\n"; - echo ""; + echo " "; $stmt="SELECT count(*) from vicidial_phone_codes;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -32632,11 +32633,11 @@ if ($ADD==321111111111111) $modify_footer_refresh=1; } echo "
\n"; - echo ""; + echo " "; - echo "
\n"; + echo "
\n"; echo ""._QXZ("STATUSES WITHIN THIS SYSTEM").":   $NWB#system_statuses$NWE
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -32768,7 +32769,7 @@ if ($ADD==331111111111111) $modify_footer_refresh=1; } echo "
"._QXZ("STATUS").""._QXZ("DESCRIPTION").""._QXZ("CATEGORY")."
\n"; - echo ""; + echo " "; echo "
\n"; echo ""._QXZ("STATUS CATEGORIES").":   $NWB#status_categories$NWE
\n"; @@ -32915,7 +32916,7 @@ if ($ADD==341111111111111) $modify_footer_refresh=1; } echo "
\n"; - echo ""; + echo " "; echo "
\n"; echo ""._QXZ("QC STATUS CODES WITHIN THIS SYSTEM").":   $NWB#vicidial_qc_status_codes$NWE
\n"; @@ -34181,7 +34182,7 @@ if ($ADD==10000000) if ($ADD==100000000) { echo "
\n"; - echo ""; + echo " "; if (strlen($whereLOGadmin_viewable_groupsSQL) > 0) {$tempLOGadmin_viewable_call_timesSQL = $LOGadmin_viewable_call_timesSQL;} else {$tempLOGadmin_viewable_call_timesSQL = $whereLOGadmin_viewable_call_timesSQL;} @@ -34227,7 +34228,7 @@ if ($ADD==100000000) if ($ADD==1000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT state_call_time_id,state_call_time_state,state_call_time_name,sct_default_start,sct_default_stop,user_group from vicidial_state_call_times $whereLOGadmin_viewable_groupsSQL order by state_call_time_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34272,7 +34273,7 @@ if ($ADD==1000000000) if ($ADD==1200000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT holiday_id,holiday_date,holiday_name,holiday_status,ct_default_start,ct_default_stop,user_group from vicidial_call_time_holidays $whereLOGadmin_viewable_groupsSQL order by holiday_date,holiday_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34319,7 +34320,7 @@ if ($ADD==1200000000) if ($ADD==130000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT shift_id,shift_name,shift_start_time,shift_length,shift_weekdays,user_group from vicidial_shifts $whereLOGadmin_viewable_groupsSQL order by shift_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34364,7 +34365,7 @@ if ($ADD==130000000) if ($ADD==10000000000) { echo "
\n"; - echo ""; + echo " "; $EXTENlink='stage=EXTENDOWN'; $EXTENNUMlink='stage=EXTENNUMDOWN'; @@ -34434,7 +34435,7 @@ if ($ADD==10000000000) if ($ADD==12000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT alias_id,alias_name,logins_list,user_group from phones_alias $whereLOGadmin_viewable_groupsSQL order by alias_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34475,7 +34476,7 @@ if ($ADD==12000000000) if ($ADD==13000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT group_alias_id,group_alias_name,caller_id_number,caller_id_name,active,user_group from groups_alias $whereLOGadmin_viewable_groupsSQL order by group_alias_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34520,7 +34521,7 @@ if ($ADD==13000000000) if ($ADD==100000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT server_id,server_description,server_ip,active,asterisk_version,max_vicidial_trunks,local_gmt,active_agent_login_server from servers $whereLOGadmin_viewable_groupsSQL order by server_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34569,7 +34570,7 @@ if ($ADD==100000000000) if ($ADD==130000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT template_id,template_name,user_group from vicidial_conf_templates $whereLOGadmin_viewable_groupsSQL order by template_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34608,7 +34609,7 @@ if ($ADD==130000000000) if ($ADD==140000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT carrier_id,carrier_name,server_ip,protocol,registration_string,active,user_group from vicidial_server_carriers $whereLOGadmin_viewable_groupsSQL order by carrier_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34661,7 +34662,7 @@ if ($ADD==140000000000) if ($ADD==150000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT tts_id,tts_name,active,tts_text,tts_voice,user_group from vicidial_tts_prompts $whereLOGadmin_viewable_groupsSQL order by tts_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34710,7 +34711,7 @@ if ($ADD==150000000000) if ($ADD==160000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT moh_id,moh_name,active,random,user_group from vicidial_music_on_hold where remove='N' $LOGadmin_viewable_groupsSQL order by moh_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34757,7 +34758,7 @@ if ($ADD==160000000000) if ($ADD==170000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT voicemail_id,fullname,active,messages,old_messages,delete_vm_after_email,user_group from vicidial_voicemail $whereLOGadmin_viewable_groupsSQL order by voicemail_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34805,7 +34806,7 @@ if ($ADD==170000000000) if ($ADD==180000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT label_id,label_name,active,user_group from vicidial_screen_labels $whereLOGadmin_viewable_groupsSQL order by label_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34847,7 +34848,7 @@ if ($ADD==180000000000) if ($ADD==190000000000) { echo "
\n"; - echo ""; + echo " "; if ( (preg_match("/contact_information/",$SStables_use_alt_log_db)) and (strlen($SSalt_log_server_ip)>4) and (strlen($SSalt_log_dbname)>0) ) { @@ -34910,7 +34911,7 @@ if ($ADD==190000000000) if ($ADD==192000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT container_id,container_notes,container_type,user_group,container_entry from vicidial_settings_containers $whereLOGadmin_viewable_groupsSQL order by container_type,container_id"; $rslt=mysql_to_mysqli($stmt, $link); @@ -34954,7 +34955,7 @@ if ($ADD==192000000000) if ($ADD==193000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT status_group_id,status_group_notes,user_group from vicidial_status_groups $whereLOGadmin_viewable_groupsSQL order by status_group_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -35010,7 +35011,7 @@ if ($ADD==193000000000) if ($ADD==1000000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT conf_exten,server_ip,extension from conferences order by conf_exten"; $rslt=mysql_to_mysqli($stmt, $link); @@ -35049,7 +35050,7 @@ if ($ADD==1000000000000) if ($ADD==10000000000000) { echo "
\n"; - echo ""; + echo " "; $stmt="SELECT conf_exten,server_ip,extension from vicidial_conferences order by conf_exten"; $rslt=mysql_to_mysqli($stmt, $link); @@ -36145,6 +36146,7 @@ if ($ADD==999999) ###################### if ($ADD==999998) { + $subhead_font = "style=\"font-family:HELVETICA;font-size:14;color:BLACK;font-weight:bold;\""; ?> @@ -36153,52 +36155,135 @@ if ($ADD==999998) <?php echo _QXZ("Administration: Admin"); ?> Admin
-
-
    + \n"; + echo "\n"; + echo "\n"; - echo "
  • "._QXZ("Call Times")." \n"; - echo "
  • "._QXZ("Shifts")." \n"; - echo "
  • "._QXZ("Phones")." \n"; - echo "
  • "._QXZ("Templates")." \n"; - echo "
  • "._QXZ("Carriers")." \n"; - echo "
  • "._QXZ("Servers")." \n"; - echo "
  • "._QXZ("Conferences")." \n"; - echo "
  • "._QXZ("System Settings")." \n"; - echo "
  • "._QXZ("Agent Screen Labels")." \n"; - echo "
  • "._QXZ("System Statuses")." \n"; - echo "
  • "._QXZ("Status Groups")." \n"; - echo "
  • "._QXZ("Voicemail")." \n"; + echo "
    • \n"; + echo "\n"; + + echo "
     \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "._QXZ("Call Times")."
    "._QXZ("Shifts")."
    "._QXZ("Phones")."
    "._QXZ("Templates")."
    "._QXZ("Carriers")."
    "._QXZ("Servers")."
    \n"; + echo "    		\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "._QXZ("Conferences")."
    "._QXZ("System Settings")."
    "._QXZ("Agent Screen Labels")."
    "._QXZ("System Statuses")."
    "._QXZ("Status Groups")."
    "._QXZ("Voicemail")."
    \n"; + echo "    		\n"; + echo "\n"; if ($SSemail_enabled > 0) { - echo "
  • "._QXZ("Email Accounts")." \n"; + echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; } if ( ($sounds_central_control_active > 0) or ($SSsounds_central_control_active > 0) ) { - echo "
  • "._QXZ("Audio Store")." \n"; - echo "
  • "._QXZ("Music On Hold")." \n"; + echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; } if ($SSenable_languages > 0) { - echo "
  • "._QXZ("Languages")." \n"; + echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + if (preg_match("/avatar/",$SSactive_modules) ) + { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; } if ($SSenable_tts_integration > 0) { - echo "
  • "._QXZ("Text To Speech")." \n"; + echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; } + echo "
    "._QXZ("Email Accounts")."
    "._QXZ("Audio Store")."
    "._QXZ("Music On Hold")."
    "._QXZ("Languages")."
    "._QXZ("Audio Avatars")."
    "._QXZ("Text To Speech")."
    \n"; + echo "    		\n"; + echo "\n"; if ($SScallcard_enabled > 0) { - echo "
  • "._QXZ("CallCard Admin")." \n"; + echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; } if ($SScontacts_enabled > 0) { - echo "
  • "._QXZ("Contacts")." \n"; + echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; } - - echo "
  • "._QXZ("Settings Containers")." \n"; - echo "\n"; - echo "
    • \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "._QXZ("CallCard Admin")."
    "._QXZ("Contacts")."
      \n"; + echo "
    "._QXZ("Settings Containers")."
    \n"; + echo "    		   \n"; } ##### END admin links ##### 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 6495723f..b75b2833 100644 --- a/agc_2-X/trunk/www/vicidial/admin_email_accounts.php +++ b/agc_2-X/trunk/www/vicidial/admin_email_accounts.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2016 Joe Johnson, Matt Florell LICENSE: AGPLv2 # # This page manages the inbound email accounts in ViciDial # @@ -17,10 +17,11 @@ # 150421-2255 - Fixed links to default list ID and default_list_id issue # 150422-1229 - Changed Default List ID # 150513-2310 - Added POP3 Auth Mode +# 160330-1552 - navigation changes and fixes # -$admin_version = '2.12-11'; -$build = '150513-2310'; +$admin_version = '2.12-12'; +$build = '160330-1552'; $sh="emails"; @@ -87,7 +88,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 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 FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -130,6 +131,7 @@ if ($qm_conf_ct > 0) $SSlevel_8_disable_add = $row[33]; $SSenable_languages = $row[34]; $SSlanguage_method = $row[35]; + $SSactive_modules = $row[36]; } ##### END SETTINGS LOOKUP ##### ########################################### @@ -195,13 +197,14 @@ if ($auth < 1) exit; } -$stmt="SELECT full_name,user_level,user_group,modify_email_accounts from vicidial_users where user='$PHP_AUTH_USER';"; +$stmt="SELECT full_name,user_level,user_group,modify_email_accounts,qc_enabled from vicidial_users where user='$PHP_AUTH_USER';"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $LOGfullname = $row[0]; $LOGuser_level = $row[1]; $LOGuser_group = $row[2]; $LOGemails_modify = $row[3]; +$qc_auth = $row[4]; if ($LOGemails_modify < 1) { @@ -830,7 +833,7 @@ else if (($eact=="DELETE" || $eact=="UPDATE") && $email_account_id) } else { - echo ""; + echo " "; if ($message) {echo "$message
    ";} echo "
    "._QXZ("INBOUND EMAIL ACCOUNT LISTINGS").":\n"; echo "
    \n"; diff --git a/agc_2-X/trunk/www/vicidial/admin_header.php b/agc_2-X/trunk/www/vicidial/admin_header.php index 82e010fa..220f9ae1 100644 --- a/agc_2-X/trunk/www/vicidial/admin_header.php +++ b/agc_2-X/trunk/www/vicidial/admin_header.php @@ -60,6 +60,7 @@ # 160325-1428 - Changed layout of sidebar links # 160327-0146 - Changes to design # 160328-1930 - Fixed display bugs +# 160330-1600 - Redesign of Admin sub-menu and added icons # @@ -1195,6 +1196,12 @@ echo "\n"; } .subhead_style_selected:hover{background-color: ;} +.adminmenu_style_selected + { + background-color: white; + } +.adminmenu_style_selected:hover{background-color: #E6E6E6;} + .horiz_line { height: 0px; @@ -1216,6 +1223,7 @@ echo "\n"; font-size:11; color:BLACK; { + --> @@ -1795,57 +1803,57 @@ if ($subcamp_font_size < 4) {$subcamp_font_size='11';} ?> onclick="window.document.location='?ADD=100000000';"> +   \"Users\" onclick="window.document.location='?ADD=130000000';"> +   \"Users\" onclick="window.document.location='?ADD=10000000000';"> +   \"Users\" onclick="window.document.location='?ADD=130000000000';"> +   \"Users\" onclick="window.document.location='?ADD=140000000000';"> +   \"Users\" onclick="window.document.location='?ADD=100000000000';"> +   \"Users\" onclick="window.document.location='?ADD=1000000000000';"> +   \"Users\" onclick="window.document.location='?ADD=311111111111111';"> +   \"Users\" onclick="window.document.location='?ADD=180000000000';"> +   \"Users\" onclick="window.document.location='?ADD=321111111111111';"> +   \"Users\" onclick="window.document.location='?ADD=193000000000';"> +   \"Users\" onclick="window.document.location='?ADD=170000000000';"> +   \"Users\" 0) { ?> onclick="window.document.location='admin_email_accounts.php';"> +   \"Users\" 0) or ($SSsounds_central_control_active > 0) ) { ?> onclick="window.document.location='audio_store.php';"> +   \"Users\" onclick="window.document.location='?ADD=160000000000';"> +   \"Users\" 0) { ?> onclick="window.document.location='admin_languages.php?ADD=163000000000';"> +   \"Users\" onclick="window.document.location='admin_avatar.php?ADD=162000000000';"> +   \"Users\" 0) { ?> onclick="window.document.location='?ADD=150000000000';"> +   \"Users\" 0) { ?> onclick="window.document.location='callcard_admin.php';"> +   \"Users\" 0) { ?> onclick="window.document.location='?ADD=190000000000';"> +   \"Users\" onclick="window.document.location='?ADD=192000000000';"> +   \"Users\" LICENSE: AGPLv2 +# Copyright (C) 2016 Matt Florell LICENSE: AGPLv2 # # this screen manages the optional language tables in ViciDial # @@ -11,10 +11,11 @@ # 141212-0923 - Added active setting # 141227-1041 - Added flags next to country code and active column on list # 141229-1531 - Added code for on-the-fly language translations display +# 160330-1553 - navigation changes and fixes # -$admin_version = '2.10-5'; -$build = '141229-1531'; +$admin_version = '2.12-6'; +$build = '160330-1553'; require("dbconnect_mysqli.php"); require("functions.php"); @@ -1410,7 +1411,7 @@ if ($ADD==363111111111) if ($ADD==163000000000) { echo "
    COLSPAN=2>   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    >   -
    \n"; - echo ""; + echo " "; $stmt="SELECT language_id,language_description,language_code,user_group,modify_date,active from vicidial_languages $whereLOGadmin_viewable_groupsSQL order by language_id;"; if ($DB) {echo "$stmt\n";} diff --git a/agc_2-X/trunk/www/vicidial/audio_store.php b/agc_2-X/trunk/www/vicidial/audio_store.php index 4722c743..ca7a2540 100644 --- a/agc_2-X/trunk/www/vicidial/audio_store.php +++ b/agc_2-X/trunk/www/vicidial/audio_store.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2016 Matt Florell LICENSE: AGPLv2 # # Central Audio Storage script # @@ -21,10 +21,11 @@ # 130901-2001 - Changed to mysqli PHP functions # 141007-2042 - Finalized adding QXZ translation to all admin files # 141229-2052 - Added code for on-the-fly language translations display +# 160330-1550 - navigation changes and fixes, added force_allow var # -$version = '2.10-15'; -$build = '141229-2052'; +$version = '2.12-16'; +$build = '160330-1550'; $MT[0]=''; @@ -55,6 +56,8 @@ if (isset($_GET["audiofile_name"])) {$audiofile_name=$_GET["audiofile_name"]; if (isset($_FILES["audiofile"])) {$audiofile_name=$_FILES["audiofile"]['name'];} if (isset($_GET["lead_file"])) {$lead_file=$_GET["lead_file"];} elseif (isset($_POST["lead_file"])) {$lead_file=$_POST["lead_file"];} +if (isset($_GET["force_allow"])) {$force_allow=$_GET["force_allow"];} + elseif (isset($_POST["force_allow"])) {$force_allow=$_POST["force_allow"];} header ("Content-type: text/html; charset=utf-8"); @@ -63,7 +66,7 @@ header ("Pragma: no-cache"); // HTTP/1.0 ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,sounds_central_control_active,sounds_web_server,sounds_web_directory,outbound_autodial_active,enable_languages,language_method FROM system_settings;"; +$stmt = "SELECT use_non_latin,sounds_central_control_active,sounds_web_server,sounds_web_directory,outbound_autodial_active,enable_languages,language_method,active_modules,contacts_enabled,email_enabled,qc_features_active FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $ss_conf_ct = mysqli_num_rows($rslt); @@ -77,13 +80,17 @@ if ($ss_conf_ct > 0) $SSoutbound_autodial_active = $row[4]; $SSenable_languages = $row[5]; $SSlanguage_method = $row[6]; + $SSactive_modules = $row[7]; + $SScontacts_enabled = $row[8]; + $SSemail_enabled = $row[9]; + $SSqc_features_active = $row[10]; } ##### END SETTINGS LOOKUP ##### ########################################### ### check if sounds server matches this server IP, if not then exit with an error -if ( ( (strlen($sounds_web_server)) != (strlen($server_name)) ) or (!preg_match("/$sounds_web_server/i",$server_name) ) ) +if ( ( ( (strlen($sounds_web_server)) != (strlen($server_name)) ) or (!preg_match("/$sounds_web_server/i",$server_name) ) ) and ($force_allow!='FORCED') ) { echo _QXZ("ERROR").": "._QXZ("server")."($server_name) "._QXZ("does not match sounds web server ip")."($sounds_web_server)\n"; exit; @@ -157,7 +164,7 @@ if ( (!preg_match("/\|$ip\|/", $server_ips)) and ($formIPvalid < 1) ) } $delete_file = preg_replace('/[^-\._0-9a-zA-Z]/','',$delete_file); - $stmt="SELECT selected_language from vicidial_users where user='$PHP_AUTH_USER';"; + $stmt="SELECT selected_language,qc_enabled from vicidial_users where user='$PHP_AUTH_USER';"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); $sl_ct = mysqli_num_rows($rslt); @@ -165,6 +172,7 @@ if ( (!preg_match("/\|$ip\|/", $server_ips)) and ($formIPvalid < 1) ) { $row=mysqli_fetch_row($rslt); $VUselected_language = $row[0]; + $qc_auth = $row[1]; } $auth=0; @@ -367,7 +375,7 @@ require("admin_header.php");   \n"; +echo "
      \n"; $STARTtime = date("U"); $TODAY = date("Y-m-d"); diff --git a/agc_2-X/trunk/www/vicidial/callcard_admin.php b/agc_2-X/trunk/www/vicidial/callcard_admin.php index ed29da4d..18153b04 100644 --- a/agc_2-X/trunk/www/vicidial/callcard_admin.php +++ b/agc_2-X/trunk/www/vicidial/callcard_admin.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2016 Matt Florell LICENSE: AGPLv2 # # This callcard script is to administer the callcard accounts in ViciDial # it is separate from the standard admin.php script. callcard_enabled in @@ -18,10 +18,11 @@ # 130901-1939 - Changed to mysqli PHP functions # 141007-2040 - Finalized adding QXZ translation to all admin files # 141229-2044 - Added code for on-the-fly language translations display +# 160330-1551 - navigation changes and fixes # -$version = '2.10-10'; -$build = '141229-2044'; +$version = '2.12-11'; +$build = '160330-1551'; $MT[0]=''; @@ -83,17 +84,24 @@ $SEARCHONLY=0; ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,callcard_enabled,enable_languages,language_method FROM system_settings;"; +$stmt = "SELECT use_non_latin,callcard_enabled,enable_languages,language_method,active_modules,contacts_enabled,email_enabled,outbound_autodial_active,enable_tts_integration,sounds_central_control_active,qc_features_active FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $ss_conf_ct = mysqli_num_rows($rslt); if ($ss_conf_ct > 0) { $row=mysqli_fetch_row($rslt); - $non_latin = $row[0]; - $callcard_enabled = $row[1]; - $SSenable_languages = $row[2]; - $SSlanguage_method = $row[3]; + $non_latin = $row[0]; + $callcard_enabled = $row[1]; + $SSenable_languages = $row[2]; + $SSlanguage_method = $row[3]; + $SSactive_modules = $row[4]; + $SScontacts_enabled = $row[5]; + $SSemail_enabled = $row[6]; + $SSoutbound_autodial_active = $row[7]; + $SSenable_tts_integration = $row[8]; + $SSsounds_central_control_active = $row[9]; + $SSqc_features_active = $row[10]; } ##### END SETTINGS LOOKUP ##### ########################################### @@ -205,12 +213,13 @@ else exit; } -$stmt="SELECT callcard_admin,user_group,full_name from vicidial_users where user='$USER';"; +$stmt="SELECT callcard_admin,user_group,full_name,qc_enabled from vicidial_users where user='$USER';"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $LOGcallcard_admin = $row[0]; $LOGuser_group = $row[1]; $LOGfullname = $row[2]; +$qc_auth = $row[3]; if($reports_only_user > 0) { @@ -535,7 +544,7 @@ if ($action == "CALLCARD_DETAIL") if ($action == "CALLCARD_SUMMARY") { echo "
    \n"; - echo ""; + echo " "; echo "
    "._QXZ("CallCard Summary").":\n"; echo "
    \n"; echo ""; diff --git a/agc_2-X/trunk/www/vicidial/images/icon_audioavatars.png b/agc_2-X/trunk/www/vicidial/images/icon_audioavatars.png new file mode 100644 index 00000000..60690ce0 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_audioavatars.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_audiostore.png b/agc_2-X/trunk/www/vicidial/images/icon_audiostore.png new file mode 100644 index 00000000..5ccf7f11 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_audiostore.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_callcard.png b/agc_2-X/trunk/www/vicidial/images/icon_callcard.png new file mode 100644 index 00000000..6ff621ba Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_callcard.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_calltimes.png b/agc_2-X/trunk/www/vicidial/images/icon_calltimes.png new file mode 100644 index 00000000..1ce32af0 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_calltimes.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_carriers.png b/agc_2-X/trunk/www/vicidial/images/icon_carriers.png new file mode 100644 index 00000000..1af23547 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_carriers.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_conferences.png b/agc_2-X/trunk/www/vicidial/images/icon_conferences.png new file mode 100644 index 00000000..26cd582f Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_conferences.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_contacts.png b/agc_2-X/trunk/www/vicidial/images/icon_contacts.png new file mode 100644 index 00000000..ffc07d07 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_contacts.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_email.png b/agc_2-X/trunk/www/vicidial/images/icon_email.png new file mode 100644 index 00000000..2f36041c Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_email.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_languages.png b/agc_2-X/trunk/www/vicidial/images/icon_languages.png new file mode 100644 index 00000000..e869d330 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_languages.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_musiconhold.png b/agc_2-X/trunk/www/vicidial/images/icon_musiconhold.png new file mode 100644 index 00000000..01e2177d Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_musiconhold.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_phones.png b/agc_2-X/trunk/www/vicidial/images/icon_phones.png new file mode 100644 index 00000000..786dbe7b Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_phones.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_screenlabels.png b/agc_2-X/trunk/www/vicidial/images/icon_screenlabels.png new file mode 100644 index 00000000..cc6e883b Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_screenlabels.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_servers.png b/agc_2-X/trunk/www/vicidial/images/icon_servers.png new file mode 100644 index 00000000..d731553b Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_servers.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_settings.png b/agc_2-X/trunk/www/vicidial/images/icon_settings.png new file mode 100644 index 00000000..70182b5c Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_settings.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_settingscontainer.png b/agc_2-X/trunk/www/vicidial/images/icon_settingscontainer.png new file mode 100644 index 00000000..ee2cab69 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_settingscontainer.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_shifts.png b/agc_2-X/trunk/www/vicidial/images/icon_shifts.png new file mode 100644 index 00000000..0be5c89a Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_shifts.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_statuses.png b/agc_2-X/trunk/www/vicidial/images/icon_statuses.png new file mode 100644 index 00000000..27d49fcd Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_statuses.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_statusgroups.png b/agc_2-X/trunk/www/vicidial/images/icon_statusgroups.png new file mode 100644 index 00000000..0c6641d4 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_statusgroups.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_templates.png b/agc_2-X/trunk/www/vicidial/images/icon_templates.png new file mode 100644 index 00000000..1d613067 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_templates.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_texttospeech.png b/agc_2-X/trunk/www/vicidial/images/icon_texttospeech.png new file mode 100644 index 00000000..17eaacf9 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_texttospeech.png differ diff --git a/agc_2-X/trunk/www/vicidial/images/icon_voicemail.png b/agc_2-X/trunk/www/vicidial/images/icon_voicemail.png new file mode 100644 index 00000000..20917359 Binary files /dev/null and b/agc_2-X/trunk/www/vicidial/images/icon_voicemail.png differ