From 966c061b3c032ead2441e906d59ac7985223a405 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 21 Dec 2014 17:38:38 +0100 Subject: Fix listUsers function See https://github.com/FreshRSS/FreshRSS/issues/729 --- lib/lib_rss.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lib/lib_rss.php') diff --git a/lib/lib_rss.php b/lib/lib_rss.php index cfd31b2c8..2c2682041 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -216,14 +216,21 @@ function uSecString() { function invalidateHttpCache() { Minz_Session::_param('touch', uTimeString()); - return touch(LOG_PATH . '/' . Minz_Session::param('currentUser', '_') . '.log'); + return touch(join_path(DATA_PATH, 'users', Minz_Session::param('currentUser', '_'), 'log.txt')); } function listUsers() { - return array_values(array_diff( - scandir(join_path(DATA_PATH, 'users')), - array('..', '.') - )); + $final_list = array(); + $base_path = join_path(DATA_PATH, 'users'); + $dir_list = array_values(array_diff(scandir($base_path), array('..', '.'))); + + foreach ($dir_list as $file) { + if (is_dir(join_path($base_path, $file))) { + $final_list[] = $file; + } + } + + return $final_list; } function httpAuthUser() { -- cgit v1.2.3