[Scoop-checkins] scoop/lib/Scoop/Admin Ads.pm

[scoop at lithium.sabren.com]

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

Modified Files:
	Ads.pm 
Log Message:
Janra's bug fix for bug #134 --hulver


Index: Ads.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/Ads.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Ads.pm	4 Mar 2004 09:44:14 -0000	1.32
--- Ads.pm	26 May 2005 10:38:15 -0000	1.33
***************
*** 726,729 ****
--- 726,730 ----
  	if( $required{ad_url} ) {
  		$vals{ad_url} = $S->cgi->param('ad_url') if( $source eq 'fromcgi' );
+ 		$vals{ad_url} = $S->filter_url($vals{ad_url});
  		if( $hidden ) {
  			$edit_form .= qq|
***************
*** 739,742 ****
--- 740,744 ----
  	if( $required{ad_title} ) {
  		$vals{ad_title} = $S->cgi->param('ad_title') if( $source eq 'fromcgi' );
+ 		$vals{ad_title} = $S->filter_subject($vals{ad_title});
  		if( $hidden ) {
  			$edit_form .= qq|
***************
*** 753,756 ****
--- 755,759 ----
  	if( $required{ad_text1} ) {
  		$vals{ad_text1} = $S->cgi->param('ad_text1') if( $source eq 'fromcgi' );
+ 		$vals{ad_text1} = $S->filter_subject($vals{ad_text1});
  		if( $hidden ) {
  			$edit_form .= qq|
***************
*** 767,770 ****
--- 770,774 ----
  	if( $required{ad_text2} ) {
  		$vals{ad_text2} = $S->cgi->param('ad_text2') if( $source eq 'fromcgi' );
+ 		$vals{ad_text2} = $S->filter_subject($vals{ad_text2});
  		if( $hidden ) {
  			$edit_form .= qq|
***************
*** 1401,1404 ****
--- 1405,1412 ----
  		(!defined( $S->cgi->param('ad_url')) || $S->cgi->param('ad_url') eq '') ) {
  		$err .= "Error: Please fill in a value for the ad url field.<br />";
+ 	}
+ 	if( $required{ad_url}		&&
+ 		!($S->cgi->param('ad_url') =~ /^http:\/\//) ) {
+ 		$err .= "Error: Link must start with http://<br />";
  	}