[Scoop-checkins] cvs commit in scoop/lib/Scoop

[cvs at versionhost.com]

Commit info for scoop/lib/Scoop:

Modified Files:
	Subscription.pm 
Log Message:
Quoted the db calls in Scoop::Admin::Subscription, and trying to make paypal
subscriptions work.



Index: Subscription.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Subscription.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -r1.16 -r1.17
255c255
< 		$S->sub_email_manual_change($months, $type);
---
> 		$S->sub_email_manual_change($months, $type, $S->{UID});
258c258
< 		$S->sub_email_success($months, $type);
---
> 		$S->sub_email_success($months, $type, $S->{UID});
274c274
< 	
---
> 
276c276
< 	
---
> 
279c279
< 	
---
> 
538c538
< 	
---
> 
540,542c540,542
< 	my $url = $S->{UI}->{VARS}->{site_url}.$S->{UI}->{VARS}->{rootdir}."/user/uid:$S->{UID}";
< 	
< 	$message = $S->sub_escape_mail($message, {months=>$months, type=>$type, url=>$url, nick=>$S->{NICK}});
---
> 	my $url = $S->{UI}->{VARS}->{site_url}.$S->{UI}->{VARS}->{rootdir}."/user/uid:$uid";
> 
> 	$message = $S->sub_escape_mail($message, {months=>$months, type=>$type, url=>$url, nick=>$user->{nickname}});
544c544
< 	
---
> 
548c548
< 	
---
>