--- googlecode.com/svn/trunk/Meteor/Channel.pm	2006/11/20 17:59:30	3
+++ googlecode.com/svn/trunk/Meteor/Channel.pm	2008/03/06 08:29:39	58
@@ -99,6 +99,11 @@
 	map { $_->clearBuffer() } (values %Channels);
 }
 
+sub numChannels {
+	
+	return scalar(keys %Channels);
+}
+
 ###############################################################################
 # Factory methods
 ###############################################################################
@@ -132,7 +137,7 @@
 	my $self=shift;
 	
 	my @subscribers=@{$self->{'subscribers'}};
-	map { $_->close() } @subscribers;
+	map { $_->closeChannel($self->{'name'}) } @subscribers;
 }
 
 ###############################################################################
@@ -147,12 +152,25 @@
 	my $subscriber=shift;
 	my $startId=shift;
 	my $persist=shift;
+	my $mode=shift || '';
+	my $userAgent=shift || '';
 	
 	# Note: negative $startId means go back that many messages
+	my $startIndex=$self->indexForMessageID($startId);
+	my $logStartIndex = $startIndex || $self->lastMsgID() || 0;
 	
 	push(@{$self->{'subscribers'}},$subscriber) if($persist);
 	
-	my $startIndex=$self->indexForMessageID($startId);
+	&::syslog('info','',
+		'joinchannel',
+		$subscriber->{'ip'},
+		$subscriber->{'subscriberID'},
+		$self->{'name'},
+		$mode,
+		$logStartIndex,
+		$userAgent
+	);
+	
 	return unless(defined($startIndex));
 	
 	my $msgCount=scalar(@{$self->{'messages'}});
@@ -160,25 +178,21 @@
 	
 	$startIndex=0 if($startIndex<0);
 	
-	while($startIndex<$msgCount)
-	{
-		my $message=$self->{'messages'}->[$startIndex++];
-		
-		$txt.=$message->message();
+	if($startIndex<$msgCount) {
+		$subscriber->sendMessages(@{$self->{'messages'}}[$startIndex..$msgCount-1]);
 	}
-	
-	$subscriber->sendMessage($txt);
 }
 
 sub removeSubscriber {
 	my $self=shift;
 	my $subscriber=shift;
+	my $reason=shift ||'unknown';
 	
 	my $idx=undef;
-	for(my $i=0;$i<scalar(@{$self->{'subscribers'}});$i++)
-	{
-		if($self->{'subscribers'}->[$i]==$subscriber)
-		{
+	my $numsubs = scalar(@{$self->{'subscribers'}});
+
+	for (my $i=0; $i<$numsubs; $i++) {
+		if($self->{'subscribers'}->[$i]==$subscriber) {
 			$idx=$i;
 			last;
 		}
@@ -187,6 +201,18 @@
 	if(defined($idx))
 	{
 		splice(@{$self->{'subscribers'}},$idx,1);
+		
+		my $timeConnected = time - $subscriber->{'ConnectionStart'};
+		&::syslog('info','',
+			'leavechannel',
+			$subscriber->{'ip'},
+			$subscriber->{'subscriberID'},
+			$self->{'name'},
+			$timeConnected,
+			$subscriber->{'MessageCount'},
+			$subscriber->{'bytesWritten'},
+			$reason
+		);
 	}
 	
 	$self->checkExpiration();
@@ -203,13 +229,16 @@
 	my $messageText=shift;
 	
 	my $message=Meteor::Message->newWithID($MessageID++);
-	$message->setText($messageText);	
+	$message->setText($messageText);
+	$message->setChannelName($self->{'name'});
 	push(@{$self->{'messages'}},$message);
+	&::syslog('debug',"New message ".$message->{"id"}." on channel ".$self->{'name'});
 	
 	$self->trimMessageStoreBySize();
 	
-	my $text=$message->message();
-	map { $_->sendMessage($text) } @{$self->{'subscribers'}};
+	map { $_->sendMessages($message) } @{$self->{'subscribers'}};
+	
+	$message;
 }
 
 sub messageCount {
@@ -274,7 +303,7 @@
 	#
 	return undef unless(defined($id));
 	
-	my $numMessages=scalar(scalar(@{$self->{'messages'}}));
+	my $numMessages=scalar(@{$self->{'messages'}});
 	
 	return undef unless($numMessages);
 	return -1 unless($id ne '');
@@ -309,5 +338,37 @@
 	return $low;
 }
 
+sub lastMsgID {
+	my $self=shift;
+	my $numMessages=scalar(@{$self->{'messages'}});
+	return undef unless($numMessages>0);
+	@{$self->{'messages'}}[-1]->id();
+}
+
+sub descriptionWithTemplate {
+	my $self=shift;
+	my $template=shift;
+	
+	return '' unless(defined($template) && $template ne '');
+	
+	$template=~s/~([a-zA-Z0-9_]*)~/
+		if(!defined($1) || $1 eq '') {
+			'~';
+		} elsif($1 eq 'messageCount') {
+			$self->messageCount();
+		} elsif($1 eq 'subscriberCount') {
+			$self->subscriberCount();
+		} elsif($1 eq 'lastMsgID') {
+			$self->lastMsgID() || 1;
+		} elsif($1 eq 'name') {
+			$self->{'name'};
+		} else {
+			'';
+		}
+	/gex;
+	
+	$template;
+}
+
 1;
 ############################################################################EOF
\ No newline at end of file