Add a 'mode' to show all log lines for a day and a channel

1 files changed, 95 insertions, 47 deletions

diff --git a/json.php b/json.php
index 7705332..63125d9 100644
--- a/json.php
+++ b/json.php
@@ -21,13 +21,7 @@ if (!isset($_GET['date'])) {
 
 require_once('common.inc.php');
 
-if (isset($_GET['users'])) {
-	$users = explode(',', $_GET['users']);
-} else {
-	$users = array();
-}
-
-
+// Read all lines of the log into an array
 $filename = 'dri-devel-'.$date.'.log';
 if (file_exists(LOG_DIR.$filename)) {
 	$lines = file(LOG_DIR.$filename);
@@ -35,52 +29,106 @@ if (file_exists(LOG_DIR.$filename)) {
 	$lines = array();
 }
 
-foreach ($users as $user) {
-	$$user = array();
-}
-
-foreach ($lines as $line_num => $line) {
-	if (is_from_selected_channel($line, $channel)) {
-		if (!filter_join($line)) {
-			$user = substr(get_user($line), 2, -1);
-			if (in_array($user, $users)) {
-				$elem = array();
-				$time = get_time($line);
-				$userx = get_user($line);
-				$elem['anchor'] = 't-'.str_replace(':', '', $time);
-				$elem['time'] = $time; 
-				$line = str_replace($time.' ', '', $line);
-				$line = str_replace('#'.$channel.': ', '', $line);
-				$line = str_replace($userx, '', $line);
-				$elem['content'] = trim($line);
-				array_push($$user, $elem);
-			}
-		}
-	}
-}
-
 header("Content-type: application/json;");
 
 $retval = array();
-
 $retval['maxdate'] = valid_date('today');
 $retval['channel'] = $channel;
 $retval['date'] = $date;
 $retval['data'] = array();
 
-foreach ($users as $user) {
-	if (empty($$user)) {
-		continue;
-	}
-	$row = array();
-	$row['name'] = $user;
-	if (isset($realname[$user])) {
-		$row['realname'] = $realname[$user];
-	}
-	if (isset($gravatars[$user])) {
-		$row['image'] = 'http://www.gravatar.com/avatar/'.$gravatars[$user];
-	}
-	$row['data'] = $$user;
-	array_push($retval['data'], $row);
+switch ($_GET['mode']) {
+	case '':
+	case 'watch':
+
+		// Determine which users will be watched
+		if (isset($_GET['users'])) {
+			$users = explode(',', $_GET['users']);
+		} else {
+			$users = array();
+		}
+
+		// No users given, this will return a empty result
+		if (count($users) == 0) {
+			break;
+		}
+
+		// Create an array for every user to hold his/her lines
+		foreach ($users as $user) {
+			$$user = array();
+		}
+
+		// Assign all lines to a user
+		foreach ($lines as $line_num => $line) {
+			if (is_from_selected_channel($line, $channel)) {
+				if (!filter_join($line)) {
+					$user = substr(get_user($line), 2, -1);
+					if (in_array($user, $users)) {
+						$elem = array();
+						$time = get_time($line);
+						$userx = get_user($line);
+						$elem['anchor'] = 't-'.str_replace(':', '', $time);
+						$elem['time'] = $time; 
+						$line = str_replace($time.' ', '', $line);
+						$line = str_replace('#'.$channel.': ', '', $line);
+						$line = str_replace($userx, '', $line);
+						$elem['content'] = trim($line);
+						array_push($$user, $elem);
+					}
+				}
+			}
+		}
+
+		// Add all the lines to the return value
+		foreach ($users as $user) {
+			if (empty($$user)) {
+				continue;
+			}
+			$row = array();
+			$row['name'] = $user;
+			if (isset($realname[$user])) {
+				$row['realname'] = $realname[$user];
+			}
+			if (isset($gravatars[$user])) {
+				$row['image'] = 'http://www.gravatar.com/avatar/'.$gravatars[$user];
+			}
+			$row['data'] = $$user;
+			array_push($retval['data'], $row);
+		}
+		break;
+	case 'show':
+		foreach ($lines as $line_num => $line) {
+			if (is_from_selected_channel($line, $channel)) {
+				if (!filter_join($line)) {
+					$user = substr(get_user($line), 2, -1);
+
+					$elem = array();
+					$time = get_time($line);
+					$userx = get_user($line);
+					$elem['anchor'] = 't-'.str_replace(':', '', $time);
+					$elem['time'] = $time; 
+					$line = str_replace($time.' ', '', $line);
+					$line = str_replace('#'.$channel.': ', '', $line);
+					$line = str_replace($userx, '', $line);
+					$elem['content'] = trim($line);
+					
+					$userdata = array();
+					$userdata['name'] = $user;
+					if (isset($realname[$user])) {
+						$userdata['realname'] = $realname[$user];
+					}
+					if (isset($gravatars[$user])) {
+						$userdata['image'] = 'http://www.gravatar.com/avatar/'.$gravatars[$user];
+					}
+					$elem['user'] = $userdata;
+					
+					array_push($retval['data'], $elem);
+				}
+			}
+		}
+		break;
+	default:
+		break;
 }
-echo json_encode($retval);
+		
+echo json_encode($retval);
\ No newline at end of file