Rework the show mode to add user details only once

1 files changed, 5 insertions, 2 deletions

diff --git a/json.php b/json.php
index 0782afe..83d5268 100644
--- a/json.php
+++ b/json.php
@@ -39,11 +39,11 @@ $retval = array();
 $retval['maxdate'] = valid_date('today');
 $retval['channel'] = $channel;
 $retval['date'] = $date;
-$retval['data'] = array();
 
 switch ($_GET['mode']) {
 	case '':
 	case 'watch':
+		$retval['data'] = array();
 
 		// Determine which users will be watched
 		if (isset($_GET['users'])) {
@@ -102,6 +102,8 @@ switch ($_GET['mode']) {
 		}
 		break;
 	case 'show':
+		$retval['users'] = array();
+		$retval['data'] = array();
 		foreach ($lines as $line_num => $line) {
 			if (is_from_selected_channel($line, $channel)) {
 				if (!filter_join($line)) {
@@ -126,7 +128,8 @@ switch ($_GET['mode']) {
 					if ($image != null) {
 						$userdata['image'] = $image;
 					}
-					$elem['user'] = $userdata;
+					$retval['users'][$user] = $userdata;
+					$elem['user'] = $user;
 					
 					array_push($retval['data'], $elem);
 				}