SourceForge has been redesigned. Learn more.
Close

Diff of /branches/2.5.4RC1/cgi-bin/yabb2/Sources/Subs.pm [r1389] .. [r1390]  Maximize  Restore

Switch to side-by-side view

--- a/branches/2.5.4RC1/cgi-bin/yabb2/Sources/Subs.pm
+++ b/branches/2.5.4RC1/cgi-bin/yabb2/Sources/Subs.pm
@@ -19,7 +19,7 @@
 use English qw(-no_match_vars);
 our $VERSION = '2.5.41';
 
-$subspmver = 'YaBB 2.5.4 RC1 $Revision: 1386 $';
+$subspmver = 'YaBB 2.5.4 RC1 $Revision: 1390 $';
 
 if ($debug) { LoadLanguage('Debug'); }
 
@@ -256,24 +256,11 @@
     $yytitle         = "$mbname - $yytitle";
     $yyimages        = $imagesdir;
     $yydefaultimages = $defaultimagesdir;
-    $yyubbc          = q{};
     $yysyntax_js     = q{};
     $yygreyboxstyle  = q{};
     $yygrayscript    = q{};
 
     if (   
-        $action eq 'post'
-        || $action eq 'modify'
-        || $action eq 'imshow'
-        || $action eq 'imsend'
-        || ( $action eq 'eventcal' && $INFO{'addnew'} )
-        || $action eq 'mycenter'
-       )
-    {
-        $yyubbc = qq~<script type="text/javascript" src="$yyhtml_root/ubbc.js" ></script>~;
-    }
-
-    if (
            $INFO{'num'}
         || $action eq 'post'
         || $action eq 'modify'
@@ -1694,12 +1681,11 @@
         $subbody = "?subject=$subject&body=$body";
         $subbody =~ s/(((<.+?>)|&#\d+;)|.)/ enc_eMail_x($1,$2,$3) /egsm;
     }
-
-    $title =~ s/(((<.+?>)|&#\d+;)|.)/ enc_eMail_x($1,$2,$3) /egsm;
-    my $eback = 'SpamInator';
-    if ($src) { $eback = 'SpamInator2';}
-
-    return qq~<script type='text/javascript'>\n$eback("$title","$code1","$code2","&#109;&#97;&#105;&#108;&#92;&#117;&#48;&#48;&#55;&#52;&#111;&#92;&#117;&#48;&#48;&#51;&#97;","$subbody");\n</script><noscript>$maintxt{'noscript'}</noscript>~;
+    $titlesp = $title;
+    $titlesp =~ s/(((<.+?>)|&#\d+;)|.)/ enc_eMail_x($1,$2,$3) /egsm;
+    if ($src) {$titlesp = $title;}
+
+    return qq~<script type='text/javascript'>\nSpamInator("$titlesp","$code1","$code2","&#109;&#97;&#105;&#108;&#92;&#117;&#48;&#48;&#55;&#52;&#111;&#92;&#117;&#48;&#48;&#51;&#97;","$subbody");\n</script>~;
 
 }