bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 07:00:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

online users fix

Browse Source
This commit is contained in:
SJ 2013-07-25 11:56:52 +02:00
parent 3664b775bb
commit 3d8d08f2bd
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/db-mysql.sql
View File

@ -371,9 +371,10 @@ create table if not exists `customer_settings` (
create table if not exists `online` ( create table if not exists `online` (
`username` varchar(255) not null unique, `username` varchar(255) not null,
`ts` int default 0, `ts` int default 0,
`last_activity` int default 0, `last_activity` int default 0,
`ipaddr` varchar(255) default null `ipaddr` varchar(255) default null,
unique(`username`,`ipaddr`)
) Engine=InnoDB; ) Engine=InnoDB;

2
webui/index.php
View File

@ -75,7 +75,7 @@ if(Registry::get('username')) {
} }
if(ENABLE_SAAS == 1) { if(ENABLE_SAAS == 1) {
$query = $db->query("UPDATE " . TABLE_ONLINE . " SET last_activity=? WHERE username=?", array(NOW, Registry::get('username'))); $query = $db->query("UPDATE " . TABLE_ONLINE . " SET last_activity=? WHERE username=? AND ipaddr=?", array(NOW, Registry::get('username'), $_SERVER['REMOTE_ADDR']));
if($db->countAffected() == 0) { if($db->countAffected() == 0) {
$query = $db->query("INSERT INTO " . TABLE_ONLINE . " (username, ts, last_activity, ipaddr) VALUES(?,?,?,?)", array(Registry::get('username'), NOW, NOW, $_SERVER['REMOTE_ADDR'])); $query = $db->query("INSERT INTO " . TABLE_ONLINE . " (username, ts, last_activity, ipaddr) VALUES(?,?,?,?)", array(Registry::get('username'), NOW, NOW, $_SERVER['REMOTE_ADDR']));

4
webui/model/saas/customer.php
View File

@ -118,7 +118,7 @@ class ModelSaasCustomer extends Model
$query = $this->db->query("INSERT INTO " . TABLE_ONLINE . " (username, ts, last_activity, ipaddr) VALUES(?,?,?,?)", array($username, NOW, NOW, $_SERVER['REMOTE_ADDR'])); $query = $this->db->query("INSERT INTO " . TABLE_ONLINE . " (username, ts, last_activity, ipaddr) VALUES(?,?,?,?)", array($username, NOW, NOW, $_SERVER['REMOTE_ADDR']));
if($this->db->countAffected() == 0) { if($this->db->countAffected() == 0) {
$query = $this->db->query("UPDATE " . TABLE_ONLINE . " SET ts=?, last_activity=?, ipaddr=? WHERE username=?", array(NOW, $_SERVER['REMOTE_ADDR'], $username)); $query = $this->db->query("UPDATE " . TABLE_ONLINE . " SET ts=?, last_activity=? WHERE username=? AND ipaddr=?", array(NOW, $username, $_SERVER['REMOTE_ADDR']));
} }
return 1; return 1;
@ -128,7 +128,7 @@ class ModelSaasCustomer extends Model
public function offline($username = '') { public function offline($username = '') {
if($username == '') { return 0; } if($username == '') { return 0; }
$query = $this->db->query("DELETE FROM " . TABLE_ONLINE . " WHERE username=?", array($username)); $query = $this->db->query("DELETE FROM " . TABLE_ONLINE . " WHERE username=? AND ipaddr=?", array($username, $_SERVER['REMOTE_ADDR']));
return 1; return 1;
} }

7
webui/view/javascript/piler-in.js
View File

@ -921,9 +921,14 @@ var Piler =
clear_ldap_test: function() clear_ldap_test: function()
{ {
$('#LDAPTEST').html(''); $('#LDAPTEST').html('');
} },
reload_page: function()
{
location.reload(true);
}
} }

9
webui/view/theme/default/templates/common/layout.tpl
View File

@ -32,7 +32,14 @@
<link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png"> <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png">
</head> </head>
<body<?php if(isset($this->request->get['route']) && $this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health(); setInterval('Piler.load_health()', Piler.health_refresh * 1000);"<?php } ?>> <body<?php
if(isset($this->request->get['route'])) {
if($this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health(); setInterval('Piler.load_health()', Piler.health_refresh * 1000);"<?php }
if($this->request->get['route'] == 'stat/online') { ?> onload="setInterval('Piler.reload_page()', Piler.health_refresh * 1000);"<?php }
} ?>>
<div id="piler1" class="container"> <div id="piler1" class="container">