diff --git a/agc_2-X/trunk/www/agc/active_list_refresh.php b/agc_2-X/trunk/www/agc/active_list_refresh.php index cb586335..a454afcf 100644 --- a/agc_2-X/trunk/www/agc/active_list_refresh.php +++ b/agc_2-X/trunk/www/agc/active_list_refresh.php @@ -88,7 +88,7 @@ if (isset($_GET["field_name"])) {$field_name=$_GET["field_name"];} ### security strip all non-alphanumeric characters out of the variables ### $user=preg_replace("/[^0-9a-zA-Z]/","",$user); -$pass=preg_replace("/[^0-9a-zA-Z]/","",$pass); +$pass=preg_replace("/\'|\"|\\\\|;| /","",$pass); $ADD=preg_replace("/[^0-9]/","",$ADD); $order=preg_replace("/[^0-9a-zA-Z]/","",$order); $format=preg_replace("/[^0-9a-zA-Z]/","",$format); @@ -126,7 +126,7 @@ $NOW_TIME = date("Y-m-d H:i:s"); if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/agc_2-X/trunk/www/agc/astguiclient.php b/agc_2-X/trunk/www/agc/astguiclient.php index 8ccdf88f..a3480683 100644 --- a/agc_2-X/trunk/www/agc/astguiclient.php +++ b/agc_2-X/trunk/www/agc/astguiclient.php @@ -64,7 +64,8 @@ # 130802-1002 - Changed to PHP mysqli functions # 140811-0848 - Changed to use QXZ function for echoing text # 141118-1230 - Formatting changes for QXZ output -# +# 141125-0947 - Using pass hashes in AJAX +# require_once("dbconnect_mysqli.php"); require_once("functions.php"); @@ -97,7 +98,7 @@ while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = preg_replace("/^./","",$user_abb); $forever_stop++;} $version = '2.2.6-1'; -$build = '141118-1230'; +$build = '141125-0947'; ### security strip all non-alphanumeric characters out of the variables ### $DB=preg_replace("/[^0-9a-z]/","",$DB); @@ -125,9 +126,12 @@ $month_old = mktime(0, 0, 0, date("m"), date("d")-7, date("Y")); $past_month_date = date("Y-m-d H:i:s",$month_old); $auth=0; -$auth_message = user_authorization($user,$pass,'',1,0,0); -if ($auth_message == 'GOOD') - {$auth=1;} +$auth_message = user_authorization($user,$pass,'',1,0,1); +if (preg_match("/^GOOD/",$auth_message)) + { + $auth=1; + $pass_hash = preg_replace("/GOOD\|/",'',$auth_message); + } $US='_'; $CL=':'; @@ -490,7 +494,9 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var admin_monitor_enabled = ''; var XfeR_channel = ''; var user = ''; - var pass = ''; + var pass = '12) {echo $pass_hash;} else {echo $pass;} ?>'; + var orig_pass = ''; + var pass_hash = ''; var phone_login = ''; var phone_pass = ''; var session_name = ''; @@ -1803,7 +1809,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } if (xmlhttp) { - checkconf_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&conf_exten=" + taskconfnum + "&bcrypt=OFF"; + checkconf_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&conf_exten=" + taskconfnum + "&bcrypt=ON"; xmlhttp.open('POST', 'conf_exten_check.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(checkconf_query); @@ -2389,7 +2395,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} hideDiv('MainPanel'); showDiv('LogouTBox'); - document.getElementById("LogouTBoxLink").innerHTML = "\n"; + document.getElementById("LogouTBoxLink").innerHTML = "\n"; logout_stop_timeouts = 1; diff --git a/agc_2-X/trunk/www/agc/call_log_display.php b/agc_2-X/trunk/www/agc/call_log_display.php index 69f75040..22735adb 100644 --- a/agc_2-X/trunk/www/agc/call_log_display.php +++ b/agc_2-X/trunk/www/agc/call_log_display.php @@ -57,7 +57,7 @@ if (isset($_GET["protocol"])) {$protocol=$_GET["protocol"];} elseif (isset($_POST["protocol"])) {$protocol=$_POST["protocol"];} $user=preg_replace("/[^0-9a-zA-Z]/","",$user); -$pass=preg_replace("/[^0-9a-zA-Z]/","",$pass); +$pass=preg_replace("/\'|\"|\\\\|;| /","",$pass); $session_name = preg_replace("/\'|\"|\\\\|;/","",$session_name); $server_ip = preg_replace("/\'|\"|\\\\|;/","",$server_ip); @@ -76,7 +76,7 @@ $NOW_TIME = date("Y-m-d H:i:s"); if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/agc_2-X/trunk/www/agc/inbound_popup.php b/agc_2-X/trunk/www/agc/inbound_popup.php index a9b4fccf..6f451562 100644 --- a/agc_2-X/trunk/www/agc/inbound_popup.php +++ b/agc_2-X/trunk/www/agc/inbound_popup.php @@ -69,7 +69,7 @@ if (isset($_GET["local_web_callerID_URL_enc"])) {$local_web_callerID_URL = raw else {$local_web_callerID_URL = '';} $user=preg_replace("/[^0-9a-zA-Z]/","",$user); -$pass=preg_replace("/[^0-9a-zA-Z]/","",$pass); +$pass=preg_replace("/\'|\"|\\\\|;| /","",$pass); $session_name = preg_replace("/\'|\"|\\\\|;/","",$session_name); $server_ip = preg_replace("/\'|\"|\\\\|;/","",$server_ip); @@ -86,7 +86,7 @@ $DO = '-1'; if ( (preg_match("/^Zap/i",$channel)) and (!preg_match("/-/i",$channel)) ) {$channel = "$channel$DO";} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/agc_2-X/trunk/www/agc/live_exten_check.php b/agc_2-X/trunk/www/agc/live_exten_check.php index 831271cc..642888fa 100644 --- a/agc_2-X/trunk/www/agc/live_exten_check.php +++ b/agc_2-X/trunk/www/agc/live_exten_check.php @@ -77,7 +77,7 @@ $NOW_TIME = date("Y-m-d H:i:s"); if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/agc_2-X/trunk/www/agc/park_calls_display.php b/agc_2-X/trunk/www/agc/park_calls_display.php index b646fad4..6e7787ca 100644 --- a/agc_2-X/trunk/www/agc/park_calls_display.php +++ b/agc_2-X/trunk/www/agc/park_calls_display.php @@ -50,7 +50,7 @@ if (isset($_GET["protocol"])) {$protocol=$_GET["protocol"];} elseif (isset($_POST["protocol"])) {$protocol=$_POST["protocol"];} $user=preg_replace("/[^0-9a-zA-Z]/","",$user); -$pass=preg_replace("/[^0-9a-zA-Z]/","",$pass); +$pass=preg_replace("/\'|\"|\\\\|;| /","",$pass); $session_name = preg_replace("/\'|\"|\\\\|;/","",$session_name); $server_ip = preg_replace("/\'|\"|\\\\|;/","",$server_ip); @@ -66,7 +66,7 @@ $NOW_TIME = date("Y-m-d H:i:s"); if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/agc_2-X/trunk/www/agc/voicemail_check.php b/agc_2-X/trunk/www/agc/voicemail_check.php index 1d350c76..e5e8fa1d 100644 --- a/agc_2-X/trunk/www/agc/voicemail_check.php +++ b/agc_2-X/trunk/www/agc/voicemail_check.php @@ -48,7 +48,7 @@ if (isset($_GET["vmail_box"])) {$vmail_box=$_GET["vmail_box"];} elseif (isset($_POST["vmail_box"])) {$vmail_box=$_POST["vmail_box"];} $user=preg_replace("/[^0-9a-zA-Z]/","",$user); -$pass=preg_replace("/[^0-9a-zA-Z]/","",$pass); +$pass=preg_replace("/\'|\"|\\\\|;| /","",$pass); $session_name = preg_replace("/\'|\"|\\\\|;/","",$session_name); $server_ip = preg_replace("/\'|\"|\\\\|;/","",$server_ip); @@ -63,7 +63,7 @@ $NOW_TIME = date("Y-m-d H:i:s"); if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php index 344b1c92..f0c4a576 100644 --- a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php +++ b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php @@ -43,6 +43,7 @@ # 140319-1913 - Added option to show percentages for various fields # 140328-0005 - Converted division calculations to use MathZDC function # 141113-2334 - Finalized adding QXZ translation to all admin files +# 141125-0951 - Changed TOTAL column label to LOGIN TIME for uniform headers with other reports, issue #427 # $startMS = microtime(); @@ -1325,9 +1326,9 @@ while ($i < $subs_to_print) } $ASCII_text.=_QXZ("PAUSE CODE BREAKDOWN",20).": ["._QXZ("DOWNLOAD")."]\n\n"; -$ASCII_text.="+-----------------+----------+----------------------+----------------------+----------+----------+----------+ +$sub_statusesHEAD\n"; -$ASCII_text.="| "._QXZ("USER NAME",15)." | "._QXZ("ID",8)." | "._QXZ("CURRENT USER GROUP",20)." | "._QXZ("MOST RECENT USER GRP",20)." | "._QXZ("TOTAL",8)." | "._QXZ("NONPAUSE",8)." | "._QXZ("PAUSE",8)." | |$sub_statusesHTML\n"; -$ASCII_text.="+-----------------+----------+----------------------+----------------------+----------+----------+----------+ +$sub_statusesHEAD\n"; +$ASCII_text.="+-----------------+----------+----------------------+----------------------+------------+----------+----------+ +$sub_statusesHEAD\n"; +$ASCII_text.="| "._QXZ("USER NAME",15)." | "._QXZ("ID",8)." | "._QXZ("CURRENT USER GROUP",20)." | "._QXZ("MOST RECENT USER GRP",20)." | "._QXZ("LOGIN TIME",10)." | "._QXZ("NONPAUSE",8)." | "._QXZ("PAUSE",8)." | |$sub_statusesHTML\n"; +$ASCII_text.="+-----------------+----------+----------------------+----------------------+------------+----------+----------+ +$sub_statusesHEAD\n"; $CSV_header="\""._QXZ("Agent Performance Detail",47)." $NOW_TIME\"\n"; $CSV_header.="\""._QXZ("Time range").": $query_date_BEGIN "._QXZ("to")." $query_date_END\"\n\n"; @@ -1445,7 +1446,7 @@ while ($m < $k) $pfUSERtotPAUSE_MS = sprintf("%8s", $USERtotPAUSE_MS); $pfUSERtotNONPAUSE_MS = sprintf("%8s", $USERtotNONPAUSE_MS); - $pfUSERtotTOTAL_MS = sprintf("%8s", $USERtotTOTAL_MS); + $pfUSERtotTOTAL_MS = sprintf("%10s", $USERtotTOTAL_MS); $BOTTOMoutput = "| $Sfull_name | $Suser | $Suser_group | $Slast_user_group | $pfUSERtotTOTAL_MS | $pfUSERtotNONPAUSE_MS | $pfUSERtotPAUSE_MS | |$SstatusesHTML\n"; @@ -1528,16 +1529,15 @@ while ($n < $j) $TOTtotPAUSE_MS = sprintf("%10s", $TOTtotPAUSE_MS); $TOTtotNONPAUSE_MS = sprintf("%10s", $TOTtotNONPAUSE_MS); - $TOTtotTOTAL_MS = sprintf("%10s", $TOTtotTOTAL_MS); + $TOTtotTOTAL_MS = sprintf("%12s", $TOTtotTOTAL_MS); while(strlen($TOTtotPAUSE_MS)>10) {$TOTtotPAUSE_MS = substr("$TOTtotPAUSE_MS", 0, -1);} while(strlen($TOTtotNONPAUSE_MS)>10) {$TOTtotNONPAUSE_MS = substr("$TOTtotNONPAUSE_MS", 0, -1);} - while(strlen($TOTtotTOTAL_MS)>10) {$TOTtotTOTAL_MS = substr("$TOTtotTOTAL_MS", 0, -1);} + while(strlen($TOTtotTOTAL_MS)>12) {$TOTtotTOTAL_MS = substr("$TOTtotTOTAL_MS", 0, -1);} - -$ASCII_text.="+-----------------+----------+----------------------+----------------------+----------+----------+----------+ +$sub_statusesHEAD\n"; +$ASCII_text.="+-----------------+----------+----------------------+----------------------+------------+----------+----------+ +$sub_statusesHEAD\n"; $ASCII_text.="| "._QXZ("TOTALS",33)." "._QXZ("AGENTS",32,"r").":$TOT_AGENTS |$TOTtotTOTAL_MS|$TOTtotNONPAUSE_MS|$TOTtotPAUSE_MS| |$SUMstatusesHTML\n"; -$ASCII_text.="+-----------------+----------+----------------------+----------------------+----------+----------+----------+ +$sub_statusesHEAD\n"; +$ASCII_text.="+-----------------+----------+----------------------+----------------------+------------+----------+----------+ +$sub_statusesHEAD\n"; for ($e=0; $e".trim($TOTtotTOTAL_MS).""; -$NONPAUSE_graph.=""._QXZ("TOTAL").":".trim($TOTtotNONPAUSE_MS).""; -$PAUSE_graph.=""._QXZ("TOTAL").":".trim($TOTtotPAUSE_MS)."%"; +$TOTAL_graph.=""._QXZ("LOGIN TIME").":".trim($TOTtotTOTAL_MS).""; +$NONPAUSE_graph.=""._QXZ("LOGIN TIME").":".trim($TOTtotNONPAUSE_MS).""; +$PAUSE_graph.=""._QXZ("LOGIN TIME").":".trim($TOTtotPAUSE_MS)."%"; for ($e=0; $e"._QXZ("CALLS").""._QXZ("TIME CLOCK").""._QXZ("AGENT TIME").""; + $GRAPH2=""._QXZ("CALLS").""._QXZ("TIME CLOCK").""._QXZ("LOGIN TIME").""; if ($show_parks) { $GRAPH2.=""._QXZ("PARKS").""._QXZ("PARKTIME").""._QXZ("AVGPARK").""._QXZ("PARKS/CALL").""; } @@ -508,7 +509,7 @@ else $graph_header=""; $CALLS_graph=$graph_header.""; $TIMECLOCK_graph=$graph_header.""; - $AGENTTIME_graph=$graph_header.""; + $AGENTTIME_graph=$graph_header.""; $WAIT_graph=$graph_header.""; $WAITPCT_graph=$graph_header.""; $TALK_graph=$graph_header.""; @@ -710,12 +711,12 @@ else { $ASCII_text.=_QXZ("AGENT TIME BREAKDOWN").":\n"; $ASCII_text.="+-----------------+----------+----------+------------+------------$park_HEADER_DIV+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+ +$sub_statusesHEAD\n"; - $ASCII_text.="| "._QXZ("USER NAME",15)." | "._QXZ("ID",8)." | "._QXZ("CALLS",8)." | "._QXZ("TIME CLOCK",10)." | "._QXZ("AGENT TIME",10)." |$park_HEADER "._QXZ("WAIT",10)." | "._QXZ("WAIT",8)." % | "._QXZ("TALK",10)." | "._QXZ("TALK TIME",9)." %| "._QXZ("DISPO",10)." | "._QXZ("DISPOTIME",9)." %| "._QXZ("PAUSE",10)." | "._QXZ("PAUSETIME",9)." %| "._QXZ("DEAD",10)." | "._QXZ("DEAD TIME",9)." %| "._QXZ("CUSTOMER",10)." | |$sub_statusesHTML\n"; + $ASCII_text.="| "._QXZ("USER NAME",15)." | "._QXZ("ID",8)." | "._QXZ("CALLS",8)." | "._QXZ("TIME CLOCK",10)." | "._QXZ("LOGIN TIME",10)." |$park_HEADER "._QXZ("WAIT",10)." | "._QXZ("WAIT",8)." % | "._QXZ("TALK",10)." | "._QXZ("TALK TIME",9)." %| "._QXZ("DISPO",10)." | "._QXZ("DISPOTIME",9)." %| "._QXZ("PAUSE",10)." | "._QXZ("PAUSETIME",9)." %| "._QXZ("DEAD",10)." | "._QXZ("DEAD TIME",9)." %| "._QXZ("CUSTOMER",10)." | |$sub_statusesHTML\n"; $ASCII_text.="+-----------------+----------+----------+------------+------------$park_HEADER_DIV+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+ +$sub_statusesHEAD\n"; } else { - $file_output .= _QXZ("USER").","._QXZ("ID").","._QXZ("CALLS").","._QXZ("TIME CLOCK").","._QXZ("AGENT TIME")."$park_HEADER_CSV,$sub_statusesFILE\n"; + $file_output .= _QXZ("USER").","._QXZ("ID").","._QXZ("CALLS").","._QXZ("TIME CLOCK").","._QXZ("LOGIN TIME")."$park_HEADER_CSV,$sub_statusesFILE\n"; } ##### END print the output to screen or put into file output variable
"._QXZ("AGENT TIME BREAKDOWN")."
STATUS"._QXZ("CALLS")."
"._QXZ("TIME CLOCK")."
"._QXZ("AGENT TIME")."
"._QXZ("LOGIN TIME")."
"._QXZ("WAIT")."
"._QXZ("WAIT")." %
"._QXZ("TALK")."