Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2588 → Rev 2589

/alcasar.sh
1497,11 → 1497,12
vnstat ()
{
[ -e /etc/vnstat.conf.default ] || cp /etc/vnstat.conf /etc/vnstat.conf.default
$SED "s?Interface.*?Interface \"$EXTIF\"?g" /etc/vnstat.conf
$SED "s?^Interface.*?Interface \"$EXTIF\"?g" /etc/vnstat.conf
$SED "s?^DatabaseDir.*?DatabaseDir /var/log/vnstat?g" /etc/vnstat.conf
[ -e $DIR_ACC/manager/stats/config.php.default ] || cp $DIR_ACC/manager/stats/config.php $DIR_ACC/manager/stats/config.php.default
$SED "s?\$iface_list =.*?\$iface_list = array('$EXTIF');?" $DIR_ACC/manager/stats/config.php
$SED "s?\$iface_title\['.*?\$iface_title\['$EXTIF'\] = \$title;?" $DIR_ACC/manager/stats/config.php
/usr/bin/vnstat -u -i $EXTIF
/usr/bin/vnstat -i $EXTIF -u --force
} # End of vnstat
 
##################################################################
/web/acc/manager/stats/vnstat.php
95,6 → 95,7
global $iface, $vnstat_bin, $data_dir;
global $hour,$day,$month,$top,$summary;
 
$vnstat_data = array();
if (!isset($vnstat_bin) || $vnstat_bin == '')
{
if (file_exists("$data_dir/vnstat_dump_$iface"))
101,20 → 102,19
{
$vnstat_data = file("$data_dir/vnstat_dump_$iface");
}
else
{
$vnstat_data = array();
}
}
else
{
$fd = popen("$vnstat_bin --dumpdb -i $iface", "r");
$buffer = '';
while (!feof($fd)) {
$buffer .= fgets($fd);
if (is_resource($fd))
{
$buffer = '';
while (!feof($fd)) {
$buffer .= fgets($fd);
}
$vnstat_data = explode("\n", $buffer);
pclose($fd);
}
$vnstat_data = explode("\n", $buffer);
pclose($fd);
}
 
 
123,7 → 123,7
$month = array();
$top = array();
 
if (strpos($vnstat_data[0], 'Error') !== false) {
if (isset($vnstat_data[0]) && strpos($vnstat_data[0], 'Error') !== false) {
return;
}