[  * Filter statistics depending on CDRTool login rights
Adrian Georgescu <ag@ag-projects.com>**20061119122714
   * Add links to statistrics screen from main menu
   * removed /var/www/CDRTool/scripts/generateHTMLUsageIndexFile.php 
     /var/www/CDRTool/status/usage/index.phtml is generated on the fly
 
] hunk ./cdrlib_ser.phtml 4536
-        global $verbose;
hunk ./cdrlib_ser.phtml 4539
+		global $CDRTool;
+
+		if (strlen($CDRTool['filter']['domain'])) {
+        	$this->allowedDomains=explode(" ",$CDRTool['filter']['domain']);
+            $allowed_domains_sql="";
+            $j=0;
+            foreach ($this->allowedDomains as $_domain) {
+                if ($j>0) $allowed_domains_sql.=",";
+                $allowed_domains_sql.="'".addslashes($_domain)."'";
+                $j++;
+            }
+        }
hunk ./cdrlib_ser.phtml 4561
-        $this->verbose   = $verbose;
hunk ./cdrlib_ser.phtml 4567
+
+        if ($allowed_domains_sql) {
+        	$where.= sprintf("and domain in (%s)",$allowed_domains_sql) ;
+        }
+
hunk ./cdrlib_ser.phtml 4576
+
hunk ./debian/changelog 5
-  * Show protocol in sip online
+  * Show transport protocol in SIP online
hunk ./debian/changelog 7
+  * Filter statistics depending on CDRTool login rights
+  * Add links to statistrics screen from main menu
+  * removed /var/www/CDRTool/scripts/generateHTMLUsageIndexFile.php 
+    /var/www/CDRTool/status/usage/index.phtml is generated on the fly 
hunk ./debian/changelog 12
- -- Adrian Georgescu <ag@ag-projects.com>  Sun, 19 Nov 2006 12:11:20 +0100
+ -- Adrian Georgescu <ag@ag-projects.com>  Sun, 19 Nov 2006 13:24:40 +0100
hunk ./phplib/local.inc 597
-            print " <a href=callsearch.phtml>Call search</a> ";
+            print " <a href=callsearch.phtml>Search</a> ";
hunk ./phplib/local.inc 600
-            print "| <a href=rating_tables.phtml>Rating tables</a>";
+            print "| <a href=rating_tables.phtml>Rating</a>";
hunk ./phplib/local.inc 603
+        if ($perm->have_perm("statistics")) {
+        	print "| <a href=status/sip_online.phtml target=status>Registrar</a>";
+            print "| <a href=status/media_sessions.phtml target=status>Media</a>";
+            print "| <a href=status/usage/index.phtml target=status>Usage</a>";
+        }
+
hunk ./phplib/local.inc 612
-        if ($perm->have_perm("statistics") && $perm->have_perm("admin")) {
-            print "| <a href=status/usage/index.phtml target=sip_statistics>Usage</a>";
-        }
-        
hunk ./scripts/generateHTMLUsageIndexFile.php 1
-#!/usr/bin/php
-<?
-$path=dirname(realpath($_SERVER['PHP_SELF']));
-include($path."/../global.inc");
-include($path."/../sip_statistics_lib.phtml");
-
-$SIPstatistics=new SIPstatistics ();
-$SIPstatistics->generateHTMLUsageIndexPage();
-
-?>
rmfile ./scripts/generateHTMLUsageIndexFile.php
hunk ./sip_statistics_lib.phtml 27
-        $path = dirname(realpath($_SERVER['PHP_SELF']));
-        include($path."/../status/config/media_servers.php");
-
-        $this->mediaServers=$servers;
hunk ./sip_statistics_lib.phtml 98
-            \$perm->check(\"statistics\",\"admin\");
+            \$perm->check(\"statistics\");
+
+            global \$CDRTool;
+    
+            if (strlen(\$CDRTool['filter']['domain'])) {
+                \$allowedDomains=explode(' ',\$CDRTool['filter']['domain']);
+            }
+
hunk ./sip_statistics_lib.phtml 121
+
+            <? if (\$perm->have_perm('admin')) { ?>
+
hunk ./sip_statistics_lib.phtml 141
+            <? } ?>
+
hunk ./sip_statistics_lib.phtml 164
+
hunk ./sip_statistics_lib.phtml 170
+            <? if (in_array('$key',\$allowedDomains)) { ?>
hunk ./sip_statistics_lib.phtml 183
+            <? } ?>
hunk ./sip_statistics_lib.phtml 338
+        $path = dirname(realpath($_SERVER['PHP_SELF']));
+        include($path."/../status/config/media_servers.php");
+
+        $this->mediaServers=$servers;
+
hunk ./status/sip_online.phtml 8
-$perm->check("admin");
+
+$perm->check("statistics");
hunk ./status/sip_online.phtml 24
+$expandAll=$_REQUEST['expandAll'];
+
addfile ./status/usage/index.phtml
hunk ./status/usage/index.phtml 1
+<?
+include("../../global.inc");
+page_open(
+     array("sess" => "CDRTool_Session",
+           "auth" => "CDRTool_Auth",
+           "perm" => "CDRTool_Perm"
+           ));
+
+$perm->check("statistics");
+
+include($path."../../sip_statistics_lib.phtml");
+
+$SIPstatistics=new SIPstatistics ();
+$SIPstatistics->getSipEnabledZones();
+
+global $CDRTool;
+
+if (strlen($CDRTool['filter']['domain'])) {
+    $allowedDomains=explode(' ',$CDRTool['filter']['domain']);
+}
+
+?>
+
+<HTML>
+<HEAD>
+    <TITLE>AG Projects SIP statistics</TITLE>
+    <META HTTP-EQUIV='Refresh' CONTENT='300'>
+    <META HTTP-EQUIV='Cache-Control' content='no-cache'>
+    <META HTTP-EQUIV='Pragma' CONTENT='no-cache'>
+    <META HTTP-EQUIV='Expires' CONTENT='Thu, 16 Dec 2004 16:08:32 GMT'>
+</HEAD>
+
+<BODY bgcolor='#ffffff' text='#000000' link='#000000' vlink='#000000' alink='#000000'>
+
+<DIV align='left'><font size='5' face=verdana><B>AG Projects SIP statistics</B></font></DIV>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=10>
+
+<? if ($perm->have_perm('admin')) { ?>
+
+<TR>
+<TD><DIV align='center'><B> Online Users for total </B></DIV>
+<DIV><A HREF='total_users.html'><IMG BORDER=0 ALT='total_users Traffic Graph' SRC='total_users-day.png'></A>
+<SMALL><!--#flastmod file='total_users.html' --></SMALL></DIV>
+</TD><TD><DIV align='center'><B> Active Sessions for total </B></DIV>
+<DIV><A HREF='total_sessions.html'><IMG BORDER=0 ALT='total_sessions Traffic Graph' SRC='total_sessions-day.png'></A>
+<SMALL><!--#flastmod file='total_sessions.html' --></SMALL></DIV>
+</TD><TD><DIV align='center'><B> IP Traffic for total </B></DIV>
+<DIV><A HREF='total_traffic.html'><IMG BORDER=0 ALT='total_traffic Traffic Graph' SRC='total_traffic-day.png'></A>
+<SMALL><!--#flastmod file='total_traffic.html' --></SMALL></DIV>
+</TD></TR>
+<TR>
+
+<?
+}
+if (is_array($allowedDomains))  {
+	$domains=array_intersect($allowedDomains,array_keys($SIPstatistics->SipEnabledZones));
+} else {
+    $domains=array_keys($SIPstatistics->SipEnabledZones);
+}
+
+foreach ($domains as $key) {
+    printf ("
+    <TR>
+    <TD><DIV align='center'><B> Online Users for %s </B></DIV>
+    <DIV><A HREF='%s_users.html'><IMG BORDER=0 ALT='%s_users Traffic Graph' SRC='%s_users-day.png'></A>
+    <SMALL><!--#flastmod file='%s_users.html' --></SMALL></DIV>
+    </TD><TD><DIV align='center'><B> Active Sessions for %s </B></DIV>
+    <DIV><A HREF='%s_sessions.html'><IMG BORDER=0 ALT='%s_sessions Traffic Graph' SRC='%s_sessions-day.png'></A>
+    <SMALL><!--#flastmod file='%s_sessions.html' --></SMALL></DIV>
+    </TD><TD><DIV align='center'><B> IP Traffic for %s </B></DIV>
+    <DIV><A HREF='%s_traffic.html'><IMG BORDER=0 ALT='%s_traffic Traffic Graph' SRC='%s_traffic-day.png'></A>
+    <SMALL><!--#flastmod file='%s_traffic.html' --></SMALL></DIV>
+    </TD></TR>
+    <TR>
+    ",
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key,
+    $key
+    );
+}
+
+?>
+
+</TABLE>
+</BODY>
+</HTML>
+<?
+page_close();
+?>