[Scoop-checkins] scoop/lib/Scoop/Comments Format.pm

[scoop at lithium.sabren.com]

Update of /cvs/scoop/scoop/lib/Scoop/Comments
In directory lithium.sabren.com:/tmp/cvs-serv16309/lib/Scoop/Comments

Modified Files:
	Format.pm 
Log Message:
Omnibus AZ patch:

* Adds new signup method where user chooses their own password. This has worked a lot better than the old way for us, and is much easier 
for inexperienced users. For people upgrading, you'll need to edit a bunch of user-related blocks, most notably changing new_user_email 
and adding a box call to new_user_html. Some instructions are with the control var "signup_with_password"

* Adds flexible date formatting with the vars date_format_default, date_format_short, and date_format_wmd

* Adds user signup IP tracking. Very handy for tracking down dupe accounts and persistent trolls. 



Index: Format.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Comments/Format.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Format.pm	4 Aug 2004 21:49:48 -0000	1.53
--- Format.pm	25 Jan 2005 17:15:24 -0000	1.54
***************
*** 102,106 ****
  		
  		
! 	my ($user_info, $edit_user);
  	if ($comment->{uid} != -1) {
  		my $nick = $S->urlify($S->get_nick_from_uid($comment->{uid}));
--- 102,106 ----
  		
  		
! 	my ($user_info, $edit_user, $comment_ip);
  	if ($comment->{uid} != -1) {
  		my $nick = $S->urlify($S->get_nick_from_uid($comment->{uid}));
***************
*** 115,120 ****
  			&& $S->{UI}->{VARS}->{view_ip_log}
  			&& $S->{UI}->{VARS}->{comment_ip_log} ){
! 		$user_info .= " Poster's IP: ";
! 		$user_info .= $comment->{commentip} || 'unknown';
  	}
  	
--- 115,123 ----
  			&& $S->{UI}->{VARS}->{view_ip_log}
  			&& $S->{UI}->{VARS}->{comment_ip_log} ){
! 		#$user_info .= " Poster's IP: ";
! 		#$user_info .= $comment->{commentip} || 'unknown';
! 		$comment_ip = " From: ";
! 		$comment_ip .= qq|<a href="/iplookup/$comment->{commentip}">$comment->{commentip}</a>| || 'unknown';
! 		
  	}
  	
***************
*** 210,213 ****
--- 213,217 ----
  	$this_comment =~ s/%%actions%%/$action/g;
  	$this_comment =~ s/%%user_info%%/$user_info/g;
+         $this_comment =~ s/%%commentip%%/$comment_ip/g;
  	$this_comment =~ s/%%sid%%/$comment->{sid}/g;
  	$this_comment =~ s/%%score%%/$comment->{points}/g unless $rate eq 'hide';