summaryrefslogtreecommitdiffstats
path: root/lib/class/user.class.php
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-02-12 16:41:23 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-03-28 16:56:22 -0400
commit42ac1b0d197a5b1b0ad50ff9a6bd43fbe7c07822 (patch)
tree55fe33c959bbffb18af6f651c9075783e4f80743 /lib/class/user.class.php
parent1197b3a03ec9abbbfb67714f4a34d5f9a9e47eb1 (diff)
downloadampache-42ac1b0d197a5b1b0ad50ff9a6bd43fbe7c07822.tar.gz
ampache-42ac1b0d197a5b1b0ad50ff9a6bd43fbe7c07822.tar.bz2
ampache-42ac1b0d197a5b1b0ad50ff9a6bd43fbe7c07822.zip
Fix User::count()
Diffstat (limited to 'lib/class/user.class.php')
-rw-r--r--lib/class/user.class.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index a9d96506..99b04be2 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -73,7 +73,7 @@ class User extends database_object {
*
* This returns the number of user accounts that exist.
*/
- public function count() {
+ public static function count() {
$sql = 'SELECT COUNT(`id`) FROM `user`';
$db_results = Dba::read($sql);
$data = Dba::fetch_row($db_results);
@@ -81,12 +81,13 @@ class User extends database_object {
$time = time();
$last_seen = $time - 1200;
- $sql = 'SELECT COUNT(DISTINCT `session`.`username) FROM `session` ' .
+ $sql = 'SELECT COUNT(DISTINCT `session`.`username`) FROM `session` ' .
'INNER JOIN `user` ON `session`.`username` = `user`.`username` ' .
'WHERE `session`.`expire` > ? and `user`.`last_seen` > ?';
$db_results = Dba::read($sql, array($time, $last_seen));
$data = Dba::fetch_row($db_results);
$results['connected'] = $data[0];
+ return $results;
}
/**