- + + - +

- +

- + + query_exec(); + // Actions + $data = $squidclass->query_exec(); - $ver = sqstat_serverInfoHTML(); - $res .= "el('sqstat_serverver').innerHTML = '$ver';"; + $ver = sqstat_serverInfoHTML(); + $res .= "el('sqstat_serverver').innerHTML = '$ver';"; - $time = date("h:i:s d/m/Y"); - $res .= "el('sqstat_updtime').innerHTML = '$time';"; + $time = date("h:i:s d/m/Y"); + $res .= "el('sqstat_updtime').innerHTML = '$time';"; - $data = sqstat_resultHTML( $data ); - if ($squidclass->errno == 0) { - $data = sqstat_AJAX_prep($data); - $res .= "el('sqstat_result').innerHTML = '$data';"; - } - else { - # error - $res .= sqstat_AJAX_error(sqstat_errorHTML()); - } + $data = sqstat_resultHTML( $data ); + if ($squidclass->errno == 0) { + $data = sqstat_AJAX_prep($data); + $res .= "el('sqstat_result').innerHTML = '$data';"; + } else { + // error + $res .= sqstat_AJAX_error(sqstat_errorHTML()); + } - return $res; + return $res; } -function sqstat_AJAX_prep($text) -{ - $text = str_replace("'", "\'", $text); - $text = str_replace("\n", "\\r\\n", $text); - return $text; +function sqstat_AJAX_prep($text) { + $text = str_replace("'", "\'", $text); + $text = str_replace("\n", "\\r\\n", $text); + return $text; } -function sqstat_AJAX_error($err) -{ - $err = sqstat_AJAX_prep($err); - $t .= "el('sqstat_result').innerHTML = '$err';"; - return $t; +function sqstat_AJAX_error($err) { + $err = sqstat_AJAX_prep($err); + $t .= "el('sqstat_result').innerHTML = '$err';"; + return $t; } -# ------------------------------------------------------------------------------ -# Reports -# ------------------------------------------------------------------------------ +/* + *Reports + */ -function sqstat_headerHTML() -{ - global $squidclass; +function sqstat_headerHTML() { + global $squidclass; - $date = date("h:i:s d/m/Y"); - $squidinfo = sqstat_serverInfoHTML(); + $date = date("h:i:s d/m/Y"); + $squidinfo = sqstat_serverInfoHTML(); - if (empty($squidclass->autorefresh)) $squidclass->autorefresh = 0; + if (empty($squidclass->autorefresh)) { + $squidclass->autorefresh = 0; + } - return -<< - + Squid RealTime stat {$squidclass->sqstat_version} for the {$servers} proxy server {$squidinfo}.
Auto refresh: sec. - - Created at: {$date}
+ + Created at: {$date}
EOD; } -function sqstat_serverInfoHTML() -{ - global $squidclass; - return $squidclass->server_version . " ({$squidclass->squidhost}:{$squidclass->squidport})"; +function sqstat_serverInfoHTML() { + global $squidclass; + return $squidclass->server_version . " ({$squidclass->squidhost}:{$squidclass->squidport})"; } -function sqstat_resultHTML($data) -{ - global $squidclass; - - $group_by_name = $squidclass->group_by_name; - $use_js = true; - - $t = array(); - - # table header - $t[] = ""; - $t[] = ""; - $t[] = ""; - if ($squidclass->use_sessions) - $t[] = ""; - $t[] = ""; - $t[] = ""; - - # table body - if (is_array($data['users'])) { - $tbl = array(); - - $con_color = 0; - foreach($data['users'] as $key => $v) { - # skeep total info - if ($key == 'total') continue; - # group row - $tbl[] = ""; - $tbl[] = ""; - $tbl[] = ""; - $tbl[] = ""; - - # connections row - foreach ($v['con'] as $con) { - if ($use_js) - $js = "onMouseout='hideddrivetip()' onMouseover='ddrivetip(\"" . $squidclass->implode_with_keys($con,"
") . "\")'"; - else $js=''; - - # begin new row - $class = (++$con_color % 2 == 0) ? " class='odd'" : ""; - $tbl[] = ""; - - # URL - $uri = "{$con['uritext']}"; - $tbl[] = ""; - $tbl[] = ""; - - # speed - if ($squidclass->use_sessions) { - $cur_s = round($con['cur_speed'], 2) > 0 ? sprintf("%01.2f KB/s", $con['cur_speed']) : ''; - $avg_s = round($con['avg_speed'], 2) > 0 ? sprintf("%01.2f KB/s", $con['avg_speed']) : ''; - $tbl[] = ""; - $tbl[] = ""; - } - - # file size - $filesize = $squidclass->filesize_format($con["bytes"]); - $duration = $squidclass->duration($con["seconds"], "short"); - $tbl[] = ""; - $tbl[] = ""; - - # end row - $tbl[] = ""; - } - - # total user speed - if ($squidclass->use_sessions) { - $user_curr = sprintf("%01.2f KB/s", $v['user_curr']); - $user_avg = sprintf("%01.2f KB/s", $v['user_avg']); - $tbl[] =""; - $tbl[] =""; - $tbl[] =""; - $tbl[] =""; - $tbl[] =""; - } - } - - - # status row - $stat = array(); - $ausers = sprintf("%d", $data['ausers']); - $acon = sprintf("%d", $data['acon']); - $stat[] = ""; - if ($squidclass->use_sessions) { - $total_curr = sprintf("%01.2f", $data['total_curr']); - $total_avg = sprintf("%01.2f", $data['total_avg']); - $stat[] = ""; - } - else { - $stat[] = ""; - } - $t[] = ""; - } - - if ($ausers == 0) { - $t[] = ""; - } - else { - $stat = implode("\n", $stat); - $tbl = implode("\n", $tbl); - $t[] = $stat . $tbl . $stat; - } - - $t[] = "

{$group_by_name}	URI	Curr. Speed	Avg. Speed	Size	Time
" . (is_int($key) ? long2ip($key) : $key) . "
	{$uri}	{$cur_s}	{$avg_s}	{$filesize}	{$duration}
		{$user_curr}	{$user_avg}
Total:	{$ausers} users and {$acon} connections @ {$total_curr}/{$total_avg} KB/s (CURR/AVG)					{$ausers} users and {$acon} connections
No active connections

"; - $t[] = "

Report based on SQStat © Alex Samorukov, 2006

"; - - return implode("\n", $t); +function sqstat_resultHTML($data) { + global $squidclass; + + $group_by_name = $squidclass->group_by_name; + $use_js = true; + + $t = array(); + + // table header + $t[] = ""; + $t[] = ""; + $t[] = ""; + if ($squidclass->use_sessions) { + $t[] = ""; + } + $t[] = ""; + $t[] = ""; + + // table body + if (is_array($data['users'])) { + $tbl = array(); + + $con_color = 0; + foreach($data['users'] as $key => $v) { + // skip total info + if ($key == 'total') { + continue; + } + // group row + $tbl[] = ""; + $tbl[] = ""; + $tbl[] = ""; + $tbl[] = ""; + + // connections row + foreach ($v['con'] as $con) { + if ($use_js) { + $js = "onMouseout='hideddrivetip()' onMouseover='ddrivetip(\"" . $squidclass->implode_with_keys($con,"
") . "\")'"; + } else { + $js=''; + } + + // begin new row + $class = (++$con_color % 2 == 0) ? " class='odd'" : ""; + $tbl[] = ""; + + // URL + $uri = "{$con['uritext']}"; + $tbl[] = ""; + $tbl[] = ""; + + // speed + if ($squidclass->use_sessions) { + $cur_s = round($con['cur_speed'], 2) > 0 ? sprintf("%01.2f KB/s", $con['cur_speed']) : ''; + $avg_s = round($con['avg_speed'], 2) > 0 ? sprintf("%01.2f KB/s", $con['avg_speed']) : ''; + $tbl[] = ""; + $tbl[] = ""; + } + + // file size + $filesize = $squidclass->filesize_format($con["bytes"]); + $duration = $squidclass->duration($con["seconds"], "short"); + $tbl[] = ""; + $tbl[] = ""; + + // end row + $tbl[] = ""; + } + + // total user speed + if ($squidclass->use_sessions) { + $user_curr = sprintf("%01.2f KB/s", $v['user_curr']); + $user_avg = sprintf("%01.2f KB/s", $v['user_avg']); + $tbl[] =""; + $tbl[] =""; + $tbl[] =""; + $tbl[] =""; + $tbl[] =""; + } + } + + + // status row + $stat = array(); + $ausers = sprintf("%d", $data['ausers']); + $acon = sprintf("%d", $data['acon']); + $stat[] = ""; + if ($squidclass->use_sessions) { + $total_curr = sprintf("%01.2f", $data['total_curr']); + $total_avg = sprintf("%01.2f", $data['total_avg']); + $stat[] = ""; + } else { + $stat[] = ""; + } + $t[] = ""; + } // ENDIF (is_array($data['users'])) + + if ($ausers == 0) { + $t[] = ""; + } else { + $stat = implode("\n", $stat); + $tbl = implode("\n", $tbl); + $t[] = $stat . $tbl . $stat; + } + + $t[] = "

{$group_by_name}	URI	Curr. Speed	Avg. Speed	Size	Time
" . (is_int($key) ? long2ip($key) : $key) . "
	{$uri}	{$cur_s}	{$avg_s}	{$filesize}	{$duration}
		{$user_curr}	{$user_avg}
Total:	{$ausers} users and {$acon} connections @ {$total_curr}/{$total_avg} KB/s (CURR/AVG)					{$ausers} users and {$acon} connections
No active connections

"; + $t[] = "

Report based on SQStat © Alex Samorukov, 2006

"; + + return implode("\n", $t); } -function sqstat_errorHTML() -{ - global $squidclass; - $t = array(); +function sqstat_errorHTML() { + global $squidclass; + $t = array(); - # table header - $t[] = ""; - $t[] = ""; - $t[] = ""; - $t[] = "

SqStat error
"; - $t[] = ' Error (' . $squidclass->errno . '): ' . $squidclass->errstr . ' '; - $t[] = "

"; + // table header + $t[] = ""; + $t[] = ""; + $t[] = ""; + $t[] = "

SqStat error
"; + $t[] = ' Error (' . $squidclass->errno . '): ' . $squidclass->errstr . ' '; + $t[] = "

"; - return implode ("\n", $t); + return implode ("\n", $t); } -function sqstat_loadconfig() -{ - global $squidclass, $config; - - $squidclass->errno = 0; - $squidclass->errstr = ''; - - $squidclass->sqstat_version = SQSTAT_VERSION; - - # === load config from pfSense === - $iface = '127.0.0.1'; - $iport = 3128; - $squid_settings = $config['installedpackages']['squid']['config'][0]; - if (!empty($squid_settings)) { - # squid interface IP & port - $realif = array(); - $iface = ($squid_settings['active_interface'] ? $squid_settings['active_interface'] : 'lan'); - $iface = explode(",", $iface); - foreach ($iface as $i => $if) { - $realif[] = sqstat_get_real_interface_address($if); - $iface = $realif[$i][0] ? $realif[$i][0] : '127.0.0.1'; - } - $iport = $squid_settings['proxy_port'] ? $squid_settings['proxy_port'] : 3128; - } - $squidclass->squidhost = $iface; - $squidclass->squidport = $iport; - - $squidclass->group_by = "host"; - $squidclass->resolveip = true; - $squidclass->hosts_file = ''; # hosts file not used - $squidclass->autorefresh = 3; # refresh 3 sec by default - $squidclass->cachemgr_passwd = ''; - - # load hosts file, if defined - if (!empty($squidclass->hosts_file)) { - $squidclass->load_hosts(); - } - - return $squidclass->errno; +function sqstat_loadconfig() { + global $squidclass, $config; + + $squidclass->errno = 0; + $squidclass->errstr = ''; + + $squidclass->sqstat_version = SQSTAT_VERSION; + + /* Load config from pfSense */ + $iface = '127.0.0.1'; + $iport = 3128; + if (is_array($config['installedpackages']['squid']['config'][0])) { + $squid_settings = $config['installedpackages']['squid']['config'][0]; + } else { + $squid_settings = array(); + } + + // Squid interface IP & port + $realif = array(); + $iface = ($squid_settings['active_interface'] ? $squid_settings['active_interface'] : 'lan'); + $iface = explode(",", $iface); + foreach ($iface as $i => $if) { + $realif[] = sqstat_get_real_interface_address($if); + $iface = $realif[$i][0] ? $realif[$i][0] : '127.0.0.1'; + } + $iport = $squid_settings['proxy_port'] ? $squid_settings['proxy_port'] : 3128; + + $squidclass->squidhost = $iface; + $squidclass->squidport = $iport; + + $squidclass->group_by = "host"; + $squidclass->resolveip = true; + $squidclass->hosts_file = ''; // hosts file not used + $squidclass->autorefresh = 3; // refresh 3 secs by default + $squidclass->cachemgr_passwd = ''; + + // Load hosts file if defined + if (!empty($squidclass->hosts_file)) { + $squidclass->load_hosts(); + } + + return $squidclass->errno; } -function sqstat_get_real_interface_address($iface) -{ +function sqstat_get_real_interface_address($iface) { global $config; $iface = convert_friendly_interface_to_real_interface_name($iface); -- cgit v1.2.3 From 11c7e2d8d87b15145a2975976efcd8c698fb34f6 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 12:48:06 +0200 Subject: Fix JS syntax and code style --- config/lightsquid/zhabascript.js | 190 ++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 101 deletions(-) diff --git a/config/lightsquid/zhabascript.js b/config/lightsquid/zhabascript.js index 311e5fe9..7cdd898a 100644 --- a/config/lightsquid/zhabascript.js +++ b/config/lightsquid/zhabascript.js @@ -1,118 +1,106 @@ /*********************************************** -* Cool DHTML tooltip script- © Dynamic Drive DHTML code library (www.dynamicdrive.com) -* This notice MUST stay intact for legal use -* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code -***********************************************/ + * Cool DHTML tooltip script II- © Dynamic Drive DHTML code library (www.dynamicdrive.com) + * This notice MUST stay intact for legal use + * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code + ***********************************************/ +var offsetxpoint = -60; //Customize x offset of tooltip +var offsetypoint = 20; //Customize y offset of tooltip +var ie = document.all; +var ns6 = document.getElementById && !document.all; +var enabletip = false; +var tipobj = false; -var offsetxpoint=-60 //Customize x offset of tooltip -var offsetypoint=20 //Customize y offset of tooltip -var ie=document.all -var ns6=document.getElementById && !document.all -var enabletip=false -var tipobj=false; - -function jsInit(){ - - if (ie||ns6) - tipobj=document.all? document.all["dhtmltooltip"] : document.getElementById? document.getElementById("dhtmltooltip") : "" - //alert(tipobj); +function jsInit() { + if (ie || ns6) { + tipobj = document.all ? document.all.dhtmltooltip : document.getElementById ? document.getElementById("dhtmltooltip") : ""; + //alert(tipobj); + } } -/*********************************************** -* Cool DHTML tooltip script II- © Dynamic Drive DHTML code library (www.dynamicdrive.com) -* This notice MUST stay intact for legal use -* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code -***********************************************/ - -var offsetfromcursorX=12 //Customize x offset of tooltip -var offsetfromcursorY=10 //Customize y offset of tooltip +var offsetfromcursorX = 12; //Customize x offset of tooltip +var offsetfromcursorY = 10; //Customize y offset of tooltip -var offsetdivfrompointerX=10 //Customize x offset of tooltip DIV relative to pointer image -var offsetdivfrompointerY=14 //Customize y offset of tooltip DIV relative to pointer image. Tip: Set it to (height_of_pointer_image-1). +var offsetdivfrompointerX = 10; //Customize x offset of tooltip DIV relative to pointer image +var offsetdivfrompointerY = 14; //Customize y offset of tooltip DIV relative to pointer image. Tip: Set it to (height_of_pointer_image-1). -//document.write('

') //write out tooltip DIV -document.write('

') //write out pointer image +document.write('

'); //write out tooltip DIV +document.write('

'); //write out pointer image -var ie=document.all -var ns6=document.getElementById && !document.all -var enabletip=false -if (ie||ns6) - var tipobj=document.all? document.all["dhtmltooltip"] : document.getElementById? document.getElementById("dhtmltooltip") : "" +if (ie || ns6) { + var tipobj = document.all ? document.all.dhtmltooltip : document.getElementById ? document.getElementById("dhtmltooltip") : ""; +} -var pointerobj=document.all? document.all["dhtmlpointer"] : document.getElementById? document.getElementById("dhtmlpointer") : "" +var pointerobj = document.all ? document.all.dhtmlpointer : document.getElementById ? document.getElementById("dhtmlpointer") : ""; -function ietruebody(){ - return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body +function ietruebody() { + return (document.compatMode && document.compatMode !== "BackCompat") ? document.documentElement : document.body; } -function ddrivetip(thetext, thewidth, thecolor){ - if(!tipobj) return false; - if (ns6||ie){ - if (typeof thewidth!="undefined") tipobj.style.width=thewidth+"px" - if (typeof thecolor!="undefined" && thecolor!="") tipobj.style.backgroundColor=thecolor - tipobj.innerHTML=thetext - enabletip=true - return false - } +function ddrivetip(thetext, thewidth, thecolor) { + if (!tipobj) { + return false; + } + if (ns6 || ie) { + if (thewidth !== undefined) { + tipobj.style.width = thewidth + "px"; + } + if (thecolor !== undefined && thecolor !== "") { + tipobj.style.backgroundColor = thecolor; + } + tipobj.innerHTML = thetext; + enabletip = true; + return false; + } } -function positiontip(e){ - if (enabletip){ - var nondefaultpos=false - var curX=(ns6)?e.pageX : event.clientX+ietruebody().scrollLeft; - var curY=(ns6)?e.pageY : event.clientY+ietruebody().scrollTop; - //Find out how close the mouse is to the corner of the window - var winwidth=ie&&!window.opera? ietruebody().clientWidth : window.innerWidth-20 - var winheight=ie&&!window.opera? ietruebody().clientHeight : window.innerHeight-20 - - var rightedge=ie&&!window.opera? winwidth-event.clientX-offsetfromcursorX : winwidth-e.clientX-offsetfromcursorX - var bottomedge=ie&&!window.opera? winheight-event.clientY-offsetfromcursorY : winheight-e.clientY-offsetfromcursorY - - var leftedge=(offsetfromcursorX<0)? offsetfromcursorX*(-1) : -1000 - - //if the horizontal distance isn't enough to accomodate the width of the context menu -/* if (rightedge Date: Sun, 18 Oct 2015 14:56:51 +0200 Subject: Symlink themes dir to sqstat directory and clean up on uninstall --- config/lightsquid/lightsquid.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc index 892d5d60..6bc4df4b 100644 --- a/config/lightsquid/lightsquid.inc +++ b/config/lightsquid/lightsquid.inc @@ -137,6 +137,7 @@ function lightsquid_install() { } symlink('/usr/local/share/lightsquid/tpl/' . $tpl, LS_TEMPLATEPATH . '/' . $tpl); } + symlink("/usr/local/www/themes", "/usr/local/www/sqstat/themes"); } function lightsquid_deinstall() { @@ -144,6 +145,9 @@ function lightsquid_deinstall() { lightsquid_setup_cron(false); // undo PBI hacks lightsquid_unfix_perl(); + if (is_dir("/usr/local/www/sqstat/")) { + mwexec("/bin/rm -rf /usr/local/www/sqstat/"); + } } /* -- cgit v1.2.3 From 48e796057efe8aff4e40ab400f0b123815936406 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 17:28:59 +0200 Subject: Code style cleanups --- config/lightsquid/sqstat.class.php | 811 +++++++++++++++++++------------------ 1 file changed, 421 insertions(+), 390 deletions(-) diff --git a/config/lightsquid/sqstat.class.php b/config/lightsquid/sqstat.class.php index 88a5cfce..dda0f501 100644 --- a/config/lightsquid/sqstat.class.php +++ b/config/lightsquid/sqstat.class.php @@ -1,131 +1,127 @@ + Copyright (C) 2011 Sergey Dvoriancev + Copyright (C) 2015 ESF, LLC + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ - -// sqstat class +/* Squid Proxy Server realtime stats */ DEFINE('SQSTAT_VERSION', '1.20'); DEFINE('SQSTAT_SHOWLEN', 60); -class squidstat{ - var $fp; +class squidstat { + var $fp; - # conection - var $squidhost; - var $squidport; + // conection + var $squidhost; + var $squidport; - # hosts - var $hosts_file; + // hosts + var $hosts_file; var $hosts; - # versions + // versions var $server_version; var $sqstat_version; - # other - var $group_by; + // other + var $group_by; var $resolveip; var $autorefresh; var $use_sessions = false; - # cache manager + // cache manager var $cachemgr_passwd; - # errors + // errors var $errno; var $errstr; - function squidstat(){ - $this->sqstat_version = SQSTAT_VERSION; + function squidstat() { + $this->sqstat_version = SQSTAT_VERSION; - $this->squidhost = '127.0.0.1'; - $this->squidport = '3128'; + $this->squidhost = '127.0.0.1'; + $this->squidport = '3128'; - $this->group_by = 'host'; - $this->resolveip = true; - $this->hosts_file = ''; - $this->autorefresh = 0; - $this->cachemgr_passwd = ''; + $this->group_by = 'host'; + $this->resolveip = true; + $this->hosts_file = ''; + $this->autorefresh = 0; + $this->cachemgr_passwd = ''; - $errno = 0; - $errstr = ''; + $errno = 0; + $errstr = ''; - if (!function_exists("preg_match")) { $this->errorMsg(5, 'You need to install PHP pcre extension to run this script'); + if (!function_exists("preg_match")) { + $this->errorMsg(5, 'You need to install PHP pcre extension to run this script'); $this->showError(); exit(5); } // we need session support to gather avg. speed - if (function_exists("session_start")){ - $this->use_sessions=true; + if (function_exists("session_start")) { + $this->use_sessions = true; } - } - function formatXHTML($body, $refresh, $use_js = false){ - $text=''."\n". - ''."\n" - .'' - .'' - .''; - if($refresh) $text.=''; - $text.='SqStat '.SQSTAT_VERSION.'' - .($use_js?'':'').'' - .($use_js?'

':'') - .$body.''; + function formatXHTML($body, $refresh, $use_js = false) { + $text = '' . "\n" + .'' . "\n" + . '' + . '' + . ''; + if ($refresh) { + $text .= ''; + } + $text .= 'SqStat ' . SQSTAT_VERSION . '' . ($use_js ? '' : '') . '' + . ($use_js ? '

' : '') + . $body . ''; return $text; } function showError(){ - $text='

SqStat error

'. - '

Error ('.$this->errno.'): '.$this->errstr.''; - echo $this->formatXHTML($text,0); + $text = '

SqStat error

' . '

Error (' . $this->errno . ') : ' . $this->errstr . '

'; + echo $this->formatXHTML($text, 0); } - function connect($squidhost, $squidport){ + function connect($squidhost, $squidport) { $this->fp = false; - # connecting to the squidhost + // connecting to the squidhost $this->fp = @fsockopen($squidhost, $squidport, $this->errno, $this->errstr, 10); if (!$this->fp) { - # failed to connect + // failed to connect return false; } return true; } - # based @ (c) moritz at barafranca dot com + // based @ (c) moritz at barafranca dot com function duration ($seconds) { - $takes_time = array(604800,86400,3600,60,0); - $suffixes = array("w","d","h","m","s"); + $takes_time = array(604800, 86400, 3600, 60, 0); + $suffixes = array("w", "d", "h", "m", "s"); $output = ""; foreach ($takes_time as $key=>$val) { ${$suffixes[$key]} = ($val == 0) ? $seconds : floor(($seconds/$val)); @@ -145,31 +141,34 @@ class squidstat{ * @param int $bytes The number of bytes to format. Must be positive * @param string $format Optional. The output format for the string * @param string $force Optional. Force a certain unit. B|KB|MB|GB|TB - * @return string The formatted file size + * @return string The formatted file size */ - function filesize_format($bytes, $format = '', $force = '') - { + function filesize_format($bytes, $format = '', $force = '') { $force = strtoupper($force); $defaultFormat = '%01d %s'; - if (strlen($format) == 0) - $format = $defaultFormat; + if (strlen($format) == 0) { + $format = $defaultFormat; + } $bytes = max(0, (int) $bytes); $units = array('b', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb'); $power = array_search($force, $units); - if ($power === false) - $power = $bytes > 0 ? floor(log($bytes)/log(1024)) : 0; + if ($power === false) { + $power = $bytes > 0 ? floor(log($bytes)/log(1024)) : 0; + } return sprintf($format, $bytes / pow(1024, $power), $units[$power]); } - function makeQuery($pass = ""){ + function makeQuery($pass = "") { $raw = array(); - # sending request - if(!$this->fp) - die("Please connect to server"); + // sending request + if (!$this->fp) { + die("Please connect to server"); + } $out = "GET cache_object://localhost/active_requests HTTP/1.0\r\n"; - if ($pass != "") - $out .= "Authorization: Basic ".base64_encode("cachemgr:$pass")."\r\n"; + if ($pass != "") { + $out .= "Authorization: Basic ". base64_encode("cachemgr:$pass") . "\r\n"; + } $out .= "\r\n"; fwrite($this->fp, $out); @@ -184,33 +183,51 @@ class squidstat{ return false; } - # parsing output; + // parsing output; $header = 1; $connection = 0; $parsed["server_version"] = "Unknown"; - foreach($raw as $key=>$v){ - # cutoff http header - if ($header==1 && $v=="") $header=0; + foreach ($raw as $key=>$v) { + // cutoff http header + if ($header == 1 && $v == "") { + $header = 0; + } if ($header) { - if(substr(strtolower($v),0,7) == "server:") { # parsing server version - $parsed["server_version"] = substr($v,8); + if (substr(strtolower($v), 0, 7) == "server:") { + // parsing server version + $parsed["server_version"] = substr($v, 8); } - } - else { - if(substr($v,0,11) == "Connection:") { # parsing connection - $connection = substr($v,12); + } else { + if (substr($v, 0, 11) == "Connection:") { + // parsing connection + $connection = substr($v, 12); } if ($connection) { - # username field is avaible in Squid 2.6 stable - # peer changed to remote in Squid 3.2 or later - # me changed to local in Squid 3.2 or later - if(substr($v,0,9) == "username ") $parsed["con"][$connection]["username"] = substr($v, 9); - if(substr($v,0,7) == "remote:") $parsed["con"][$connection]["peer"] = substr($v, 8); - if(substr($v,0,5) == "peer:") $parsed["con"][$connection]["peer"] = substr($v, 6); - if(substr($v,0,6) == "local:") $parsed["con"][$connection]["me"] = substr($v, 7); - if(substr($v,0,3) == "me:") $parsed["con"][$connection]["me"] = substr($v, 4); - if(substr($v,0,4) == "uri ") $parsed["con"][$connection]["uri"] = substr($v, 4); - if(substr($v,0,10) == "delay_pool") $parsed["con"][$connection]["delay_pool"] = substr($v, 11); + /* username field is avaible in Squid 2.6+ + * peer changed to remote in Squid 3.2+ + * me changed to local in Squid 3.2+ + */ + if (substr($v, 0, 9) == "username ") { + $parsed["con"][$connection]["username"] = substr($v, 9); + } + if (substr($v, 0, 7) == "remote:") { + $parsed["con"][$connection]["peer"] = substr($v, 8); + } + if (substr($v, 0, 5) == "peer:") { + $parsed["con"][$connection]["peer"] = substr($v, 6); + } + if (substr($v, 0, 6) == "local:") { + $parsed["con"][$connection]["me"] = substr($v, 7); + } + if (substr($v, 0, 3) == "me:") { + $parsed["con"][$connection]["me"] = substr($v, 4); + } + if (substr($v, 0, 4) == "uri ") { + $parsed["con"][$connection]["uri"] = substr($v, 4); + } + if (substr($v, 0, 10) == "delay_pool") { + $parsed["con"][$connection]["delay_pool"] = substr($v, 11); + } if (preg_match('/out.offset \d+, out.size (\d+)/', $v, $matches)) { $parsed["con"][$connection]["bytes"] = $matches[1]; @@ -225,7 +242,7 @@ class squidstat{ } function implode_with_keys($array, $glue) { - foreach ($array as $key => $v){ + foreach ($array as $key => $v) { $ret[] = $key . '=' . htmlspecialchars($v); } return implode($glue, $ret); @@ -233,96 +250,107 @@ class squidstat{ function makeHtmlReport($data, $resolveip = false, $hosts_array = array(), $use_js = true) { global $group_by; - if($this->use_sessions){ + if ($this->use_sessions) { session_name('SQDATA'); session_start(); } $total_avg = $total_curr = 0; // resort data array - $users=array(); - switch($group_by){ + $users = array(); + switch ($group_by) { case "host": - $group_by_name="Host"; - $group_by_key='return $ip;'; - break; + $group_by_name="Host"; + $group_by_key='return $ip;'; + break; case "username": - $group_by_name="User"; - $group_by_key='return $v["username"];'; - break; + $group_by_name="User"; + $group_by_key='return $v["username"];'; + break; default: - die("wrong group_by!"); + die("wrong group_by!"); } - foreach($data["con"] as $key => $v){ - if(substr($v["uri"],0,13)=="cache_object:") continue; // skip myself - $ip=substr($v["peer"],0,strpos($v["peer"],":")); - if(isset($hosts_array[$ip])){ - $ip=$hosts_array[$ip]; - } - // i use ip2long() to make ip sorting work correctly - elseif($resolveip){ - $hostname=gethostbyaddr($ip); - if($hostname==$ip) $ip=ip2long($ip);// resolve failed - else $ip=$hostname; + foreach ($data["con"] as $key => $v) { + if (substr($v["uri"], 0, 13) == "cache_object:") { + continue; // skip myself } - else{ - $ip=ip2long(substr($v["peer"],0,strpos($v["peer"],":"))); + $ip = substr($v["peer"], 0, strpos($v["peer"], ":")); + if (isset($hosts_array[$ip])) { + $ip = $hosts_array[$ip]; + // use ip2long() to make ip sorting work correctly + } elseif ($resolveip) { + $hostname = gethostbyaddr($ip); + if ($hostname == $ip) { + $ip = ip2long($ip); // resolve failed + } else { + $ip = $hostname; + } + } else { + $ip = ip2long(substr($v["peer"], 0, strpos($v["peer"],":"))); } $v['connection'] = $key; - if(!isset($v["username"])) $v["username"]="N/A"; - $users[eval($group_by_key)][]=$v; + if (!isset($v["username"])) { + $v["username"] = "N/A"; + } + $users[eval($group_by_key)][] = $v; } ksort($users); - $refresh=0; - if(isset($_GET["refresh"]) && !isset($_GET["stop"])) $refresh=(int)$_GET["refresh"]; - $text=''; - if(count($GLOBALS["configs"])==1) $servers=$GLOBALS["squidhost"].':'.$GLOBALS["squidport"]; - else{ - $servers=''; + foreach ($GLOBALS["configs"] as $key => $v) { + $servers .= ''; } - $servers.=''; + $servers .= ''; } - $text.=''. - ''. - ''. - ''. - ($this->use_sessions?'':''). - ''. - ''; - $ausers=$acon=0; + $text .= '' + . '

'.$group_by_name.'	URI	Curr. Speed	Avg. Speed	Size	Time

' + . '' + . '' + . ($this->use_sessions ? '' : '') + . '' + . ''; + $ausers = $acon = 0; unset($session_data); if (isset($_SESSION['time']) && ((time() - $_SESSION['time']) < 3*60) && isset($_SESSION['sqdata']) && is_array($_SESSION['sqdata'])) { - //only if the latest data was less than 3 minutes ago + // only if the latest data was less than 3 minutes ago $session_data = $_SESSION['sqdata']; } - $table=''; - foreach($users as $key=>$v){ + $table = ''; + foreach ($users as $key=>$v) { $ausers++; - $table.=''. - ''; - $user_avg = $user_curr = $con_color = 0; - foreach ($v as $con){ - if(substr($con["uri"],0,7)=="http://" || substr($con["uri"],0,6)=="ftp://"){ - if(strlen($con["uri"])>SQSTAT_SHOWLEN) $uritext=htmlspecialchars(substr($con["uri"],0,SQSTAT_SHOWLEN)).' ....'; - else $uritext=htmlspecialchars($con["uri"]).''; - $uri=''.$uritext; + $table .= '' + . ''; + $user_avg = $user_curr = $con_color = 0; + foreach ($v as $con) { + if (substr($con["uri"], 0, 7) == "http://" || substr($con["uri"], 0, 6) == "ftp://") { + if (strlen($con["uri"]) > SQSTAT_SHOWLEN) { + $uritext = htmlspecialchars(substr($con["uri"], 0, SQSTAT_SHOWLEN)) . ' ....'; + } else { + $uritext = htmlspecialchars($con["uri"]) . ''; + } + $uri = '' . $uritext; + } else { + $uri = htmlspecialchars($con["uri"]); } - else $uri=htmlspecialchars($con["uri"]); $acon++; - //speed stuff + // speed stuff $con_id = $con['connection']; $is_time = time(); - $curr_speed=0; - $avg_speed=0; - if (isset($session_data[$con_id]) && $con_data = $session_data[$con_id] ) { - // if we have info about current connection, we do analyze its data - // current speed + $curr_speed = 0; + $avg_speed = 0; + if (isset($session_data[$con_id]) && $con_data == $session_data[$con_id]) { + // if we have info about current connection, we do analyze its data current speed $was_time = $con_data['time']; $was_size = $con_data['size']; if ($was_time && $was_size) { @@ -337,7 +365,7 @@ class squidstat{ $curr_speed = $con['bytes'] / 1024; } - //avg speed + // avg speed $avg_speed = $con['bytes'] / 1024; if ($con['seconds'] > 0) { $avg_speed /= $con['seconds']; @@ -353,235 +381,238 @@ class squidstat{ $total_curr += $curr_speed; $user_curr += $curr_speed; - if($use_js) $js='onMouseout="hideddrivetip()" onMouseover="ddrivetip(\''.$this->implode_with_keys($con,'
').'\')"'; - else $js=''; - $table.=''. - ''; - if($this->use_sessions){ - $table .= ''. - ''; + if ($use_js) { + $js = 'onMouseout="hideddrivetip()" onMouseover="ddrivetip(\'' . $this->implode_with_keys($con, '
') . '\')"'; + } else { + $js = ''; + } + $table .= '' + . ''; + if ($this->use_sessions) { + $table .= '' + . ''; } - $table .= ''. - ''. - ''; + $table .= '' + . '' + . ''; } - if($this->use_sessions){ - $table.=sprintf("", - $user_curr, $user_avg); + if ($this->use_sessions) { + $table .= sprintf("", $user_curr, $user_avg); } } $_SESSION['time'] = time(); - if(isset($new_data)) $_SESSION['sqdata'] = $new_data; - $stat_row=''; - if($this->use_sessions){ - $stat_row.=sprintf("", - $ausers, $acon, $total_curr, $total_avg); + if (isset($new_data)) { + $_SESSION['sqdata'] = $new_data; } - else { - $stat_row.=sprintf("", - $ausers, $acon); + $stat_row = ''; + if ($this->use_sessions) { + $stat_row .= sprintf("", $ausers, $acon, $total_curr, $total_avg); + } else { + $stat_row .= sprintf("", $ausers, $acon); } - if($ausers==0){ - $text.=''; + if ($ausers == 0) { + $text .= ''; + } else { + $text .= $stat_row . $table . $stat_row; + } + $text .= '

' . $group_by_name . '	URI	Curr. Speed	Avg. Speed	Time
'.(is_int($key)?long2ip($key):$key).'
' . (is_int($key) ? long2ip($key) : $key) . '
	'.$uri.'	'.( (round($curr_speed, 2) > 0) ? sprintf("%01.2f KB/s", $curr_speed) : '' ).'	'.( (round($avg_speed, 2) > 0) ? sprintf("%01.2f KB/s", $avg_speed) : '' ). '	' . $uri . '	' . ( (round($curr_speed, 2) > 0) ? sprintf("%01.2f KB/s", $curr_speed) : '' ) . '	' . ( (round($avg_speed, 2) > 0) ? sprintf("%01.2f KB/s", $avg_speed) : '' ) . '	'.$this->filesize_format($con["bytes"]).'	'.$this->duration($con["seconds"],"short").'
' . $this->filesize_format($con["bytes"]) . '	' . $this->duration($con["seconds"], "short") . '
	%01.2f KB/s	%01.2f KB/s
	%01.2f KB/s	%01.2f KB/s
Total:	%d users and %d connections @ %01.2f/%01.2f KB/s (CURR/AVG)
Total:	%d users and %d connections
Total:	%d users and %d connections @ %01.2f/%01.2f KB/s (CURR/AVG)
Total:	%d users and %d connections
No active connections
No active connections

' . '

'; + return $this->formatXHTML($text, $refresh, $use_js); + } + + function parseRequest($data, $group_by = 'host', $resolveip = false) { + $parsed = array(); + if ($this->use_sessions) { + session_name('SQDATA'); + session_start(); + } + + // resort data array + $users = array(); + switch ($group_by) { + case "username": + $group_by_name = "User"; + $group_by_key = "username"; + break; + case "host": + default: + $group_by_name = "Host"; + $group_by_key = "peer"; + break; + } + + // resolve IP & group + foreach ($data["con"] as $key => $v) { + // skip myself + if (substr($v["uri"], 0, 13) == "cache_object:") { + continue; + } + + $ip = substr($v["peer"], 0, strpos($v["peer"], ":")); + $v["peer"] = $ip; + + // name from hosts + if (isset($this->hosts[$ip])) { + $ip = $this->hosts[$ip]; + } elseif ($resolveip) { + // use ip2long() to make ip sorting work correctly + $hostname = gethostbyaddr($ip); + if ($hostname == $ip) { + $ip = ip2long($ip); // resolve failed. use (ip2long) key + } else { + $ip = $hostname; + } + } else { + $ip = ip2long(substr($v["peer"], 0, strpos($v["peer"], ":"))); + } + $v['con_id'] = $key; + $v["username"] = isset($v["username"]) ? $v["username"] : "N/A"; + + // users [key => conn_array] + $users[$v[$group_by_key]][] = $v; + } + ksort($users); + + unset($session_data); + if (isset($_SESSION['time']) && ((time() - $_SESSION['time']) < 3*60) && isset($_SESSION['sqdata']) && is_array($_SESSION['sqdata'])) { + // only if the latest data was less than 3 minutes ago + $session_data = $_SESSION['sqdata']; + } + + // users count & con cont + $ausers = $acon = 0; + $total_avg = $total_curr = 0; + foreach ($users as $key => $v) { + $ausers++; + + $user_avg = $user_curr = $con_color = 0; + foreach ($v as $con_key => $con) { + $cres = array(); + $acon++; + + $uritext = $con["uri"]; + if (substr($con["uri"], 0, 7) == "http://" || substr($con["uri"], 0, 6) == "ftp://") { + if (strlen($uritext) > SQSTAT_SHOWLEN) { + $uritext = htmlspecialchars(substr($uritext, 0, SQSTAT_SHOWLEN)) . ' ....'; + } + } else { + $uritext = htmlspecialchars($uritext); + } + $cres['uritext'] = $uritext; + $cres['uri'] = $con["uri"]; + + // speed stuff + $con_id = $con['connection']; + $is_time = time(); + $curr_speed = $avg_speed = 0; + if (isset($session_data[$con_id]) && $con_data == $session_data[$con_id]) { + // if we have info about current connection, we do analyze its data current speed + $was_time = $con_data['time']; + $was_size = $con_data['size']; + if ($was_time && $was_size) { + $delta = $is_time - $was_time; + if ($delta == 0) { + $delta = 1; + } + if ($con['bytes'] >= $was_size) { + $curr_speed = ($con['bytes'] - $was_size) / 1024 / $delta; + } + } else { + $curr_speed = $con['bytes'] / 1024; + } + + // avg speed + $avg_speed = $con['bytes'] / 1024; + if ($con['seconds'] > 0) { + $avg_speed /= $con['seconds']; + } + } + $cres['cur_speed'] = $curr_speed; + $cres['avg_speed'] = $avg_speed; + $cres['seconds'] = $con["seconds"]; + $cres['bytes'] = $con["bytes"]; + + // grouped parsed[key => conn_key] + $parsed['users'][$key]['con'][$con_key] = $cres; + + // for sessions + $new_data[$con_id]['time'] = $is_time; + $new_data[$con_id]['size'] = $con['bytes']; + + // sum speeds + $total_avg += $avg_speed; + $user_avg += $avg_speed; + $total_curr += $curr_speed; + $user_curr += $curr_speed; + } + + // total per user + $parsed['users'][$key]['user_curr'] = $user_curr; + $parsed['users'][$key]['user_avg'] = $user_avg; } - else { - $text.=$stat_row.$table.$stat_row; + + // total info + $parsed['ausers'] = $ausers; + $parsed['acon'] = $acon; + $parsed['total_avg'] = $total_avg; + $parsed['total_curr'] = $total_curr; + + // update session info + $_SESSION['time'] = time(); + if (isset($new_data)) { + $_SESSION['sqdata'] = $new_data; } - $text .= ''. - '

'; - return $this->formatXHTML($text,$refresh,$use_js); + + return $parsed; } - function parseRequest($data, $group_by = 'host', $resolveip = false) { $parsed = array(); - if ($this->use_sessions) { - session_name('SQDATA'); - session_start(); - } - - # resort data array - $users = array(); - switch ($group_by) { - case "username": - $group_by_name = "User"; - $group_by_key = "username"; - break; - case "host": - default: - $group_by_name = "Host"; - $group_by_key = "peer"; - break; - } - - # resolve IP & group - foreach ($data["con"] as $key => $v) { # skip myself - if (substr($v["uri"], 0, 13) == "cache_object:") continue; - - $ip = substr($v["peer"], 0, strpos($v["peer"], ":")); - $v["peer"] = $ip; - - # name from hosts - if (isset($this->hosts[$ip])) { - $ip = $this->hosts[$ip]; - } - else - # i use ip2long() to make ip sorting work correctly - if ($resolveip) { - $hostname = gethostbyaddr($ip); - if ($hostname == $ip) - $ip = ip2long($ip); # resolve failed. use (ip2long) key - else $ip = $hostname; - } - else { - $ip = ip2long(substr($v["peer"], 0, strpos($v["peer"], ":"))); - } - $v['con_id'] = $key; - $v["username"] = isset($v["username"]) ? $v["username"] : "N/A"; - - # users [key => conn_array] - $users[$v[$group_by_key]][] = $v; - } - ksort($users); - - unset($session_data); - if (isset($_SESSION['time']) && ((time() - $_SESSION['time']) < 3*60) && - isset($_SESSION['sqdata']) && is_array($_SESSION['sqdata'])) { - # only if the latest data was less than 3 minutes ago - $session_data = $_SESSION['sqdata']; - } - - # users count & con cont - $ausers = $acon = 0; - $total_avg = $total_curr = 0; - foreach ($users as $key => $v) { $ausers++; - - $user_avg = $user_curr = $con_color = 0; - foreach ($v as $con_key => $con){ $cres = array(); - $acon++; - - $uritext = $con["uri"]; - if (substr($con["uri"], 0, 7) == "http://" || substr($con["uri"], 0, 6) == "ftp://") { - if (strlen($uritext) > SQSTAT_SHOWLEN) - $uritext = htmlspecialchars(substr($uritext, 0, SQSTAT_SHOWLEN)) . ' ....'; - } - else $uritext = htmlspecialchars($uritext); - $cres['uritext'] = $uritext; - $cres['uri'] = $con["uri"]; - - # speed stuff - $con_id = $con['connection']; - $is_time = time(); - $curr_speed = $avg_speed = 0; - if (isset($session_data[$con_id]) && $con_data = $session_data[$con_id] ) { - # if we have info about current connection, we do analyze its data - # current speed - $was_time = $con_data['time']; - $was_size = $con_data['size']; - if ($was_time && $was_size) { - $delta = $is_time - $was_time; - if ($delta == 0) { - $delta = 1; - } - if ($con['bytes'] >= $was_size) { - $curr_speed = ($con['bytes'] - $was_size) / 1024 / $delta; - } - } else { - $curr_speed = $con['bytes'] / 1024; - } - - # avg speed - $avg_speed = $con['bytes'] / 1024; - if ($con['seconds'] > 0) { - $avg_speed /= $con['seconds']; - } - } - $cres['cur_speed'] = $curr_speed; - $cres['avg_speed'] = $avg_speed; - $cres['seconds'] = $con["seconds"]; - $cres['bytes'] = $con["bytes"]; - - # groupped parsed[key => conn_key] - $parsed['users'][$key]['con'][$con_key] = $cres; - - # for sessions - $new_data[$con_id]['time'] = $is_time; - $new_data[$con_id]['size'] = $con['bytes']; - - # sum speeds - $total_avg += $avg_speed; - $user_avg += $avg_speed; - $total_curr += $curr_speed; - $user_curr += $curr_speed; - } - - # total per user - $parsed['users'][$key]['user_curr'] = $user_curr; - $parsed['users'][$key]['user_avg'] = $user_avg; - } - - # total info - $parsed['ausers'] = $ausers; - $parsed['acon'] = $acon; - $parsed['total_avg'] = $total_avg; - $parsed['total_curr'] = $total_curr; - - # update session info - $_SESSION['time'] = time(); - if (isset($new_data)) $_SESSION['sqdata'] = $new_data; - - return $parsed; + function errorMsg($errno, $errstr) { + $this->errno = $errno; + $this->errstr = $errstr; } - function errorMsg($errno, $errstr) - { $this->errno = $errno; - $this->errstr = $errstr; + function load_hosts() { + // loading hosts file + $hosts_array = array(); + + if (!empty($this->hosts_file)) { + if (is_file($this->hosts_file)) { + $handle = @fopen($this->hosts_file, "r"); + if ($handle) { + while (!feof($handle)) { + $buffer = fgets($handle, 4096); + unset($matches); + if (preg_match('/^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})[ \t]+(.+)$/i', $buffer, $matches)) { + $hosts_array[$matches[1]]=$matches[2]; + } + } + fclose($handle); + } + $this->hosts = $hosts_array; + } else { + // error + $this->errorMsg(4, "Hosts file not found. Cant read '{$this->hosts_file}'."); + return $this->errno; + } + } + + return 0; } - function load_hosts() - { - # loading hosts file - $hosts_array = array(); - - if (!empty($this->hosts_file)) { - if (is_file($this->hosts_file)) { - $handle = @fopen($this->hosts_file, "r"); - if ($handle) { - while (!feof($handle)) { - $buffer = fgets($handle, 4096); - unset($matches); - if (preg_match('/^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})[ \t]+(.+)$/i', $buffer, $matches)) { - $hosts_array[$matches[1]]=$matches[2]; - } - } - fclose($handle); - } - $this->hosts = $hosts_array; - } - else { - #error - $this->errorMsg(4, "Hosts file not found. Cant read '{$this->hosts_file}'."); - return $this->errno; - } - } - - return 0; - } - - function query_exec() - { - $data = ""; - - $this->server_version = '(unknown)'; - if ($this->connect($this->squidhost, $this->squidport)) { - $data = $this->makeQuery($this->cachemgr_passwd); - if ($this->errno == 0) { - $this->server_version = $data['server_version']; - $data = $this->parseRequest($data, 'host', true); - } - } - - return $data; - } + function query_exec() { + $data = ""; + + $this->server_version = '(unknown)'; + if ($this->connect($this->squidhost, $this->squidport)) { + $data = $this->makeQuery($this->cachemgr_passwd); + if ($this->errno == 0) { + $this->server_version = $data['server_version']; + $data = $this->parseRequest($data, 'host', true); + } + } + + return $data; + } } ?> -- cgit v1.2.3 From 9de38c866d41542c7b30c8f83f804e2328d201bc Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 17:53:11 +0200 Subject: Code style cleanups leftovers --- config/lightsquid/sqstat.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/lightsquid/sqstat.class.php b/config/lightsquid/sqstat.class.php index dda0f501..2f1dc9ba 100644 --- a/config/lightsquid/sqstat.class.php +++ b/config/lightsquid/sqstat.class.php @@ -102,7 +102,7 @@ class squidstat { return $text; } - function showError(){ + function showError() { $text = '

SqStat error

' . '

Error (' . $this->errno . ') : ' . $this->errstr . '

'; echo $this->formatXHTML($text, 0); } @@ -123,7 +123,7 @@ class squidstat { $takes_time = array(604800, 86400, 3600, 60, 0); $suffixes = array("w", "d", "h", "m", "s"); $output = ""; - foreach ($takes_time as $key=>$val) { + foreach ($takes_time as $key => $val) { ${$suffixes[$key]} = ($val == 0) ? $seconds : floor(($seconds/$val)); $seconds -= ${$suffixes[$key]} * $val; if (${$suffixes[$key]} > 0) { @@ -187,7 +187,7 @@ class squidstat { $header = 1; $connection = 0; $parsed["server_version"] = "Unknown"; - foreach ($raw as $key=>$v) { + foreach ($raw as $key => $v) { // cutoff http header if ($header == 1 && $v == "") { $header = 0; @@ -232,7 +232,7 @@ class squidstat { if (preg_match('/out.offset \d+, out.size (\d+)/', $v, $matches)) { $parsed["con"][$connection]["bytes"] = $matches[1]; } - if (preg_match('/start \d+\.\d+ $(\d+).\d+ seconds ago$/', $v, $matches)){ + if (preg_match('/start \d+\.\d+ $(\d+).\d+ seconds ago$/', $v, $matches)) { $parsed["con"][$connection]["seconds"] = $matches[1]; } } @@ -327,7 +327,7 @@ class squidstat { $session_data = $_SESSION['sqdata']; } $table = ''; - foreach ($users as $key=>$v) { + foreach ($users as $key => $v) { $ausers++; $table .= '' . (is_int($key) ? long2ip($key) : $key) . '' . ' '; @@ -375,7 +375,7 @@ class squidstat { $new_data[$con_id]['time'] = $is_time; $new_data[$con_id]['size'] = $con['bytes']; - //sum speeds + // sum speeds $total_avg += $avg_speed; $user_avg += $avg_speed; $total_curr += $curr_speed; @@ -479,7 +479,7 @@ class squidstat { $session_data = $_SESSION['sqdata']; } - // users count & con cont + // users count & con count $ausers = $acon = 0; $total_avg = $total_curr = 0; foreach ($users as $key => $v) { -- cgit v1.2.3 From d5d923c4d79c1cc7987249e0917ae7c8081c55e3 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 18:02:11 +0200 Subject: Bump lightsquid package version --- pkg_config.10.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 42c76ef9..abc8fa95 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -578,7 +578,7 @@ LightSquid is a high performance web proxy reporting tool. Proxy realtime statistics (SQStat). Requires Squid HTTP proxy. http://lightsquid.sf.net/ Network Report - 2.41 + 2.42 dv_serg@mail.ru www libexec/lightsquid/ip2name.list:www/lightsquid @@ -593,6 +593,7 @@ https://packages.pfsense.org/packages/config/lightsquid/lightsquid.xml lightsquid.xml true + Please visit Status - Squid Proxy Reports - Settings and read the configuration and usage instructions. Sarg -- cgit v1.2.3 From b5f62cb9b4f5f2f183622f1d89ef0a0f9c901eed Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 18:03:57 +0200 Subject: Bump lightsquid package version --- pkg_config.8.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 1ad19c55..b0999759 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -624,7 +624,7 @@ High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy. http://lightsquid.sf.net/ Network Report - 2.41 + 2.42 dv_serg@mail.ru https://files.pfsense.org/packages/8/All/ lightsquid-1.8_2.tbz @@ -642,6 +642,7 @@ lightsquid.xml true + Please visit Status - Squid Proxy Reports - Settings and read the configuration and usage instructions. Sarg -- cgit v1.2.3 From 48f874a35747e0ed7528463c2882a453eb391c6c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 18:05:48 +0200 Subject: Bump lightsquid package version --- pkg_config.8.xml.amd64 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 760838a6..06660716 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -611,7 +611,7 @@ High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy. http://lightsquid.sf.net/ Network Report - 2.41 + 2.42 dv_serg@mail.ru https://files.pfsense.org/packages/amd64/8/All/ lightsquid-1.8_2.tbz @@ -629,6 +629,7 @@ lightsquid.xml true + Please visit Status - Squid Proxy Reports - Settings and read the configuration and usage instructions. Sarg -- cgit v1.2.3 From 7a289c0e10b6c47c4646e04e9bceae8b3f808f49 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 18 Oct 2015 19:01:50 +0200 Subject: Typo fix --- config/lightsquid/lightsquid.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml index 9dd8d820..a7d68530 100644 --- a/config/lightsquid/lightsquid.xml +++ b/config/lightsquid/lightsquid.xml @@ -262,7 +262,7 @@ Note: If using Squid 2.7 package, also do not forget to add '127.0.0.1' to Squid - Access Control - External Cache-Managers. (This is not needed for Squid 3.x.)

3/ Configure 'Report Template Settings' and 'Reporting Settings and Scheduler' below and Save when finished.

4/ Use the Refresh buttons in the 'Manual Refresh' section below to create initial LightSquid reports; otherwise you will get an error diagnostic page.
- - "Refresh now" will (re)parse today's entires only in Squid's current access.log.
+ - "Refresh now" will (re)parse today's entries only in Squid's current access.log.
- "Refresh full" will (re)parse all entries in all Squid's access logs, including the rotated ones. Note: This may take long time to finish!
]]> @@ -399,7 +399,7 @@ Manual Refresh will (re)parse today's entires only in Squid's current access.log.

+ will (re)parse today's entries only in Squid's current access.log.

will (re)parse all entries in all Squid's access logs, including the rotated ones. Note: This may take long time to finish!

Press a button above to start background refresh (this will take some time).
-- cgit v1.2.3 From 722bf12382aea5e49d49c01b61ac7f830fe86c93 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 20 Oct 2015 10:41:22 +0200 Subject: Remove broken IP detection code and force localhost --- config/lightsquid/sqstat.php | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/config/lightsquid/sqstat.php b/config/lightsquid/sqstat.php index 18fa2d25..5d3a0e83 100644 --- a/config/lightsquid/sqstat.php +++ b/config/lightsquid/sqstat.php @@ -355,23 +355,14 @@ function sqstat_loadconfig() { $squidclass->sqstat_version = SQSTAT_VERSION; - /* Load config from pfSense */ $iface = '127.0.0.1'; + /* Load config from pfSense and find proxy port */ $iport = 3128; if (is_array($config['installedpackages']['squid']['config'][0])) { $squid_settings = $config['installedpackages']['squid']['config'][0]; } else { $squid_settings = array(); } - - // Squid interface IP & port - $realif = array(); - $iface = ($squid_settings['active_interface'] ? $squid_settings['active_interface'] : 'lan'); - $iface = explode(",", $iface); - foreach ($iface as $i => $if) { - $realif[] = sqstat_get_real_interface_address($if); - $iface = $realif[$i][0] ? $realif[$i][0] : '127.0.0.1'; - } $iport = $squid_settings['proxy_port'] ? $squid_settings['proxy_port'] : 3128; $squidclass->squidhost = $iface; @@ -391,14 +382,4 @@ function sqstat_loadconfig() { return $squidclass->errno; } -function sqstat_get_real_interface_address($iface) { - global $config; - - $iface = convert_friendly_interface_to_real_interface_name($iface); - $line = trim(shell_exec("ifconfig $iface | grep inet | grep -v inet6")); - list($dummy, $ip, $dummy2, $netmask) = explode(" ", $line); - - return array($ip, long2ip(hexdec($netmask))); -} - ?> -- cgit v1.2.3 From db072559dc851c7d85cf78c0b4b449f3262dd7d9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 20 Oct 2015 11:00:28 +0200 Subject: No need to check for loopback with transparent proxy --- config/lightsquid/lightsquid.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc index 6bc4df4b..7decc050 100644 --- a/config/lightsquid/lightsquid.inc +++ b/config/lightsquid/lightsquid.inc @@ -456,18 +456,22 @@ function lightsquid_validate_input($post, &$input_errors) { } else { $ext_cachemanager = ""; } - if (strpos($ext_cachemanager, $ifmgr) === FALSE) { + if (strpos($ext_cachemanager, $ifmgr) === false) { $input_errors[] = "Please, add '{$ifmgr}' to Squid - Access Control - External Cache-Managers first."; } } - /* SqStat - check that Squid listens on loopback */ + /* SqStat - check that Squid listens on loopback unless the proxy is set as transparent (which makes it listen on localhost automatically) */ if (is_array($config['installedpackages']['squid']['config'])) { $active_interfaces = ($config['installedpackages']['squid']['config'][0]['active_interface'] ?: ""); + $transparent = ($config['installedpackages']['squid']['config'][0]['transparent_proxy'] == "on" ? true : false); } else { $active_interfaces = ""; + $transparent = false; } - if (strpos($active_interfaces, "lo0") === FALSE) { - $input_errors[] = "Please, configure Squid - General - Proxy Interface(s) to include 'loopback' interface."; + if (!$transparent) { + if (strpos($active_interfaces, "lo0") === false) { + $input_errors[] = "Please, configure Squid - General - Proxy Interface(s) to include 'loopback' interface."; + } } /* 'Skip URL(s)' validation */ -- cgit v1.2.3 From 434b6aad60b37ae68f5e81fa1526ce242e07c9e3 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 20 Oct 2015 11:10:24 +0200 Subject: Update instructions to account for transparent proxy setup --- config/lightsquid/lightsquid.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml index a7d68530..834efd46 100644 --- a/config/lightsquid/lightsquid.xml +++ b/config/lightsquid/lightsquid.xml @@ -258,8 +258,10 @@ Enable 'Access Logging' in the Squid package! It is strongly suggested to leave the 'Log Store Directory' in Squid package at default '/var/squid/logs' value.

- 2/ Configure Squid - General - Proxy Interface(s) to include 'loopback' interface (in addition to any other interfaces you want Squid to bind on).
- Note: If using Squid 2.7 package, also do not forget to add '127.0.0.1' to Squid - Access Control - External Cache-Managers. (This is not needed for Squid 3.x.)

+ 2a/ ONLY if Squid is NOT set up as transparent proxy:
+ - Configure Squid - General - Proxy Interface(s) to include 'loopback' interface (in addition to any other interfaces you want Squid to bind on).
+ 2b/ ONLY if using Squid 2.7 package (this is not needed for Squid 3.x.):
+ - Add '127.0.0.1' to Squid - Access Control - External Cache-Managers.

3/ Configure 'Report Template Settings' and 'Reporting Settings and Scheduler' below and Save when finished.

4/ Use the Refresh buttons in the 'Manual Refresh' section below to create initial LightSquid reports; otherwise you will get an error diagnostic page.
- "Refresh now" will (re)parse today's entries only in Squid's current access.log.
-- cgit v1.2.3