diff --git a/agc_2-X/trunk/docs/BASE_INSTALL.txt b/agc_2-X/trunk/docs/BASE_INSTALL.txt index a19c2472..005a0fb8 100644 --- a/agc_2-X/trunk/docs/BASE_INSTALL.txt +++ b/agc_2-X/trunk/docs/BASE_INSTALL.txt @@ -80,7 +80,7 @@ cd ../asterisk-1.2.12.1 wget http://www.eflo.net/files/cli_chan_concise_delimiter.patch patch -p1 < ./cli_chan_concise_delimiter.patch - File to patch: cli.c - (1.2.12 only) - channel.c bug fix - **THERE IS NO FIX FOR ASTERISK 1.2.11** + (1.2.12 only, not for 1.2.12.1) - channel.c bug fix - **THERE IS NO FIX FOR ASTERISK 1.2.11** wget http://www.eflo.net/files/channel.c-42600.patch patch -p1 < ./channel.c-42600.patch - File to patch: channel.c @@ -234,7 +234,7 @@ GRANT SELECT,INSERT,UPDATE,DELETE on asterisk.* TO cron@localhost IDENTIFIED BY use asterisk; -\. /usr/src/astguiclient/MySQL_AST_CREATE_tables.sql +\. /usr/src/astguiclient/trunk/extras/MySQL_AST_CREATE_tables.sql or you may need to run this if you get an error: \. /usr/src/astguiclient/astguiclient/MySQL_AST_CREATE_tables.sql diff --git a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php index 39ad1c5d..94440370 100644 --- a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php +++ b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php @@ -17,6 +17,7 @@ # 60901-1123 - Changed display elements at the top of the screen # 60905-1342 - Fixed non INCALL|QUEUE timer column # 61002-1642 - Added TRUNK SHORT/FILL stats +# 61101-1318 - Added SIP and IAX Listen and Barge links option # header ("Content-type: text/html; charset=utf-8"); @@ -42,6 +43,11 @@ if (isset($_GET["submit"])) {$submit=$_GET["submit"];} elseif (isset($_POST["submit"])) {$submit=$_POST["submit"];} if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} +if (isset($_GET["SIPmonitorLINK"])) {$SIPmonitorLINK=$_GET["SIPmonitorLINK"];} + elseif (isset($_POST["SIPmonitorLINK"])) {$SIPmonitorLINK=$_POST["SIPmonitorLINK"];} +if (isset($_GET["IAXmonitorLINK"])) {$IAXmonitorLINK=$_GET["IAXmonitorLINK"];} + elseif (isset($_POST["IAXmonitorLINK"])) {$IAXmonitorLINK=$_POST["IAXmonitorLINK"];} + if (!isset($group)) {$group='';} @@ -160,14 +166,17 @@ if ($reset_counter > 7) \n"; -echo"\n"; +echo"\n"; echo "VICIDIAL: Time On VDAD Campaign: $group\n"; echo "
\n"; echo "VICIDIAL: Realtime Campaign: \n"; echo "\n"; echo "\n"; echo "\n"; +echo "\n"; +echo "\n"; echo "\n"; } echo "\n"; echo "         \n"; -echo "STOP | GO"; -echo "         MODIFY | REPORTS \n"; +echo "STOP | SLOW | GO"; +echo "       MODIFY | REPORTS \n"; echo "\n\n"; @@ -364,9 +373,19 @@ $agent_total=0; $Aecho = ''; $Aecho .= "VICIDIAL: Agents Time On Calls Campaign: $group $NOW_TIME\n\n"; -$Aecho .= "+------------|--------+-----------+--------+-----------------+-----------------+---------+------------+\n"; -$Aecho .= "| STATION | USER | SESSIONID | STATUS | SERVER IP | CALL SERVER IP | MM:SS | CAMPAIGN |\n"; -$Aecho .= "+------------|--------+-----------+--------+-----------------+-----------------+---------+------------+\n"; + +if ( ($SIPmonitorLINK>0) or ($IAXmonitorLINK>0) ) + { + $Aecho .= "+------------|--------+------------------+-------+--------+-----------------+-----------------+---------+------------+\n"; + $Aecho .= "| STATION | USER | SESSIONID | BARGE | STATUS | SERVER IP | CALL SERVER IP | MM:SS | CAMPAIGN |\n"; + $Aecho .= "+------------|--------+------------------+-------+--------+-----------------+-----------------+---------+------------+\n"; + } +else + { + $Aecho .= "+------------|--------+-----------+--------+-----------------+-----------------+---------+------------+\n"; + $Aecho .= "| STATION | USER | SESSIONID | STATUS | SERVER IP | CALL SERVER IP | MM:SS | CAMPAIGN |\n"; + $Aecho .= "+------------|--------+-----------+--------+-----------------+-----------------+---------+------------+\n"; + } $stmt="select extension,user,conf_exten,status,server_ip,UNIX_TIMESTAMP(last_call_time),UNIX_TIMESTAMP(last_call_finish),call_server_ip,campaign_id from vicidial_live_agents where campaign_id='" . mysql_real_escape_string($group) . "' order by status,last_call_time;"; @@ -388,6 +407,7 @@ $talking_to_print = mysql_num_rows($rslt); $extension = sprintf("%-10s", $extension); while(strlen($extension)>10) {$extension = substr("$extension", 0, -1);} $user = sprintf("%-6s", $row[1]); + $Lsessionid = $row[2]; $sessionid = sprintf("%-9s", $row[2]); $status = sprintf("%-6s", $row[3]); $server_ip = sprintf("%-15s", $row[4]); @@ -424,13 +444,27 @@ $talking_to_print = mysql_num_rows($rslt); if ( (eregi("READY",$status)) or (eregi("CLOSER",$status)) ) {$agent_ready++; $agent_total++;} if ( (eregi("READY",$status)) or (eregi("CLOSER",$status)) ) {$G=''; $EG='';} + $L=''; + $R=''; + if ($SIPmonitorLINK>0) {$L=" LISTEN"; $R=' | ';} + if ($IAXmonitorLINK>0) {$L=" LISTEN"; $R=' | ';} + if ($SIPmonitorLINK>1) {$R=" | BARGE";} + if ($IAXmonitorLINK>1) {$R=" | BARGE";} + $agentcount++; - $Aecho .= "| $G$extension$EG | $G$user$EG | $G$sessionid$EG | $G$status$EG | $G$server_ip$EG | $G$call_server_ip$EG | $G$call_time_MS$EG | $G$campaign_id$EG |\n"; + $Aecho .= "| $G$extension$EG | $G$user$EG | $G$sessionid$EG$L$R | $G$status$EG | $G$server_ip$EG | $G$call_server_ip$EG | $G$call_time_MS$EG | $G$campaign_id$EG |\n"; $i++; } - $Aecho .= "+------------|--------+-----------+--------+-----------------+-----------------+---------+------------+\n"; + if ( ($SIPmonitorLINK>0) or ($IAXmonitorLINK>0) ) + { + $Aecho .= "+------------|--------+------------------+-------+--------+-----------------+-----------------+---------+------------+\n"; + } + else + { + $Aecho .= "+------------|--------+-----------+--------+-----------------+-----------------+---------+------------+\n"; + } $Aecho .= " $agentcount agents logged in on all servers\n"; $Aecho .= " System Load Average: $load_ave\n\n"; diff --git a/agc_2-X/trunk/www/vicidial/server_stats.php b/agc_2-X/trunk/www/vicidial/server_stats.php index a427f5c0..1ca42cc7 100644 --- a/agc_2-X/trunk/www/vicidial/server_stats.php +++ b/agc_2-X/trunk/www/vicidial/server_stats.php @@ -7,6 +7,7 @@ # # 60620-1037 - Added Link back to Admin section # - Added required user/pass to gain access to this page +# 61101-1331 - Added SIP/IAX listen/barge links # require("dbconnect.php"); @@ -61,7 +62,7 @@ while ($i < $servers_to_print) VICIDIAL: Server Stats and Reports                           BACK TO ADMIN