[livejournal] r18405: LJSUP-7758: AntiSpam S2

U   trunk/bin/upgrading/s2layers/magazine/layout.s2

Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-02-24 11:40:50 UTC (rev 18404)
+++ trunk/bin/upgrading/s2layers/magazine/layout.s2	2011-02-24 11:50:17 UTC (rev 18405)
@@ -210,6 +210,8 @@
   property string datetime_comments_format {
     des = "Date and time format for comments";
   }
+  property use text_showspam;
+  property use text_hidespam;
 }
 set text_left_comments = "(";
 set text_btwn_comments = " | ";
@@ -648,10 +650,23 @@
 
 
 function CommentInfo::print() {
+    var Page p = get_page();
     if ($.show_readlink or $.show_postlink) {
         print safe "<div class='Comment'>$*text_left_comments";
         if ($.show_readlink) {
             $this->print_readlink();
+            if ($p.view == "entry") {
+                if (clean_url($*img_btwn_comments) != "") {
+                    """ <img src="$*img_btwn_comments" alt="" /> """;
+                } else {
+                    print safe "$*text_btwn_comments";
+                }
+                if ($p.showspam) {
+                    print safe """<a href=\"$.read_spam_url\">$*text_hidespam</a>""";
+                } else {
+                    print safe """<a href=\"$.read_spam_url\">$*text_showspam</a>""";
+                }
+            }
         }
         if ($.show_postlink and $.show_readlink) {
             if (clean_url($*img_btwn_comments) != "") {