diff options
| author | Ermal <eri@pfsense.org> | 2013-11-23 19:32:49 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-11-23 19:32:49 +0000 |
| commit | fcaf17090a6ef2beb85f1220048b3e7ea53b105d (patch) | |
| tree | c09f90957e58479666f1e545feb5c053e8d64dca /usr | |
| parent | e5f2cf3a94efd552a3e19fb2ea7dcee36a00df79 (diff) | |
| download | pfsense-fcaf17090a6ef2beb85f1220048b3e7ea53b105d.zip pfsense-fcaf17090a6ef2beb85f1220048b3e7ea53b105d.tar.gz | |
Catch up with mac needed for all operations in the table nowdays.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/captiveportal/radius_accounting.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/status_captiveportal.php | 2 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/captive_portal_status.widget.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc index d2b4d50..3d0bc0a 100644 --- a/usr/local/captiveportal/radius_accounting.inc +++ b/usr/local/captiveportal/radius_accounting.inc @@ -176,7 +176,7 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; $stop_time = (empty($stop_time)) ? time() : $stop_time; $session_time = $stop_time - $start_time; - $volume = getVolume($clientip); + $volume = getVolume($clientip, $clientmac); $volume['input_bytes_radius'] = remainder($volume['input_bytes']); $volume['input_gigawords'] = gigawords($volume['input_bytes']); $volume['output_bytes_radius'] = remainder($volume['output_bytes']); diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php index 2325b3c..d84e9b2 100755 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -172,7 +172,7 @@ $mac_man = load_mac_manufacturer_table(); <td class="listr"><?=$cpent[4];?> </td> <td class="listr"><?=htmlspecialchars(date("m/d/Y H:i:s", $cpent[0]));?></td> <?php if ($_GET['showact']): - $last_act = captiveportal_get_last_activity($cpent[2]); ?> + $last_act = captiveportal_get_last_activity($cpent[2], $cpent[3]); ?> <td class="listr"><?php if ($last_act != 0) echo htmlspecialchars(date("m/d/Y H:i:s", $last_act));?></td> <?php endif; ?> <td valign="middle" class="list" nowrap> diff --git a/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/usr/local/www/widgets/widgets/captive_portal_status.widget.php index 245b65b..d773877 100644 --- a/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -67,7 +67,7 @@ foreach ($a_cp as $cpzone => $cp) { foreach ($cpdb as $cpent) { $cpent[10] = $cpzone; if ($_GET['showact']) - $cpent[11] = captiveportal_get_last_activity($cpent[2]); + $cpent[11] = captiveportal_get_last_activity($cpent[2], $cpentry[3]); $cpdb_all[] = $cpent; } } @@ -111,4 +111,4 @@ if ($_GET['order']) { <a href="?order=<?=$_GET['order'];?>&showact=<?=$_GET['showact'];?>&act=del&zone=<?=$cpent[10];?>&id=<?=$cpent[5];?>" onclick="return confirm('Do you really want to disconnect this client?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="x" /></a></td> </tr> <?php endforeach; ?> -</table>
\ No newline at end of file +</table> |
