Permalink
Browse files

Fixed some introtext stuff

  • Loading branch information...
1 parent e6e9941 commit ab7c5eea38b244db51d68453664182ea7ea506eb @pudge pudge committed Jun 6, 2000
Showing with 15 additions and 12 deletions.
  1. +5 −4 plugins/Submit/submit.pl
  2. +5 −4 public_html/submit.pl
  3. +5 −4 themes/slashcode/htdocs/submit.pl
View
9 plugins/Submit/submit.pl
@@ -137,8 +137,9 @@ sub previewForm {
$introtext =~ s/\n\n/\n<P>/gi;
$introtext .= " ";
- $introtext =~ s{(?!"|=)(.|\n|^)(http|ftp|gopher|telnet)://(.*?)(\W\s)?[\s]}
- {<A HREF="$2://$3"> link <\/A> }gi;
+ $introtext =~ s{(?<!"|=|>)(http|ftp|gopher|telnet)://(.*?)(\W\s)?[\s]}
+ {<A HREF="$1://$2">link</A> }gi;
+ $introtext =~ s/\s+$//;
$introtext = qq!<I>"$introtext"</I>! if $name;
if ($email) {
@@ -440,8 +441,8 @@ sub displayForm {
my $formkey_earliest = time() - $I{formkey_timeframe};
if(! checkTimesPosted("submissions",$I{max_submissions_allowed},$id,$formkey_earliest)) {
- my $max_posts_warn =<<EOT;
-<br><b>Warning! you've exceeded max allowed submissions for the day : $I{max_submissions_allowed}</b><br>
+ my $max_posts_warn = <<EOT;
+<P><B>Warning! you've exceeded max allowed submissions for the day : $I{max_submissions_allowed}</B></P>
EOT
errorMessage($max_posts_warn);
}
View
9 public_html/submit.pl
@@ -137,8 +137,9 @@ sub previewForm {
$introtext =~ s/\n\n/\n<P>/gi;
$introtext .= " ";
- $introtext =~ s{(?!"|=)(.|\n|^)(http|ftp|gopher|telnet)://(.*?)(\W\s)?[\s]}
- {<A HREF="$2://$3"> link <\/A> }gi;
+ $introtext =~ s{(?<!"|=|>)(http|ftp|gopher|telnet)://(.*?)(\W\s)?[\s]}
+ {<A HREF="$1://$2">link</A> }gi;
+ $introtext =~ s/\s+$//;
$introtext = qq!<I>"$introtext"</I>! if $name;
if ($email) {
@@ -440,8 +441,8 @@ sub displayForm {
my $formkey_earliest = time() - $I{formkey_timeframe};
if(! checkTimesPosted("submissions",$I{max_submissions_allowed},$id,$formkey_earliest)) {
- my $max_posts_warn =<<EOT;
-<br><b>Warning! you've exceeded max allowed submissions for the day : $I{max_submissions_allowed}</b><br>
+ my $max_posts_warn = <<EOT;
+<P><B>Warning! you've exceeded max allowed submissions for the day : $I{max_submissions_allowed}</B></P>
EOT
errorMessage($max_posts_warn);
}
View
9 themes/slashcode/htdocs/submit.pl
@@ -137,8 +137,9 @@ sub previewForm {
$introtext =~ s/\n\n/\n<P>/gi;
$introtext .= " ";
- $introtext =~ s{(?!"|=)(.|\n|^)(http|ftp|gopher|telnet)://(.*?)(\W\s)?[\s]}
- {<A HREF="$2://$3"> link <\/A> }gi;
+ $introtext =~ s{(?<!"|=|>)(http|ftp|gopher|telnet)://(.*?)(\W\s)?[\s]}
+ {<A HREF="$1://$2">link</A> }gi;
+ $introtext =~ s/\s+$//;
$introtext = qq!<I>"$introtext"</I>! if $name;
if ($email) {
@@ -440,8 +441,8 @@ sub displayForm {
my $formkey_earliest = time() - $I{formkey_timeframe};
if(! checkTimesPosted("submissions",$I{max_submissions_allowed},$id,$formkey_earliest)) {
- my $max_posts_warn =<<EOT;
-<br><b>Warning! you've exceeded max allowed submissions for the day : $I{max_submissions_allowed}</b><br>
+ my $max_posts_warn = <<EOT;
+<P><B>Warning! you've exceeded max allowed submissions for the day : $I{max_submissions_allowed}</B></P>
EOT
errorMessage($max_posts_warn);
}

0 comments on commit ab7c5ee

Please sign in to comment.