don't display user e-mail addresses in rss output if user.publishemail is set to false

code/Root/rss.hac

@@ -18,7 +18,9 @@ for (var i=0; i<max; i++) {
       param.title = site.title ? site.title : site.alias;
       param.publisher = systitle;
       param.creator = site.creator.name;
-      param.email = translateToEntities(site.creator.email);
+      param.email = "";
+      if (site.creator.publishemail)
+         param.email = translateToEntities(site.creator.email);
       param.date = site.lastupdate.format("dd.MM.yyyy, HH:mm'h CET'");
       param.isodate = site.lastupdate.format(isoDateFormat);
       param.year = site.lastupdate.getYear();

code/Root/rss.skin

@@ -12,7 +12,7 @@
     <link><% this.url encoding="xml" %></link>
     <description>Recently updated <% param.title %> sites ordered by date</description>
     <dc:publisher><% param.title encoding="xml" %></dc:publisher>
-    <dc:creator><% param.title encoding="xml" %> (mailto:<% param.email %>)</dc:creator>
+    <dc:creator><% param.title encoding="xml" %><% param.email prefix=" (mailto:" suffix=")" %></dc:creator>
     <dc:date><% param.lastupdate %></dc:date>
     <dc:language>en</dc:language>
     <sy:updatePeriod>hourly</sy:updatePeriod>

code/Site/rss.hac

@@ -27,7 +27,9 @@ if (max > 0 && this.online) {
          param.title = "...";
       param.publisher = systitle;
       param.creator = story.creator.name;
-      param.email = translateToEntities(story.creator.email);
+      param.email = "";
+      if (story.creator.publishemail)
+         param.email = translateToEntities(story.creator.email);
       param.date = story.modifytime.format(w3fmt);
       param.subject = story.topic ? story.topic : "";
       param.year = story.modifytime.getYear();
@@ -39,7 +41,8 @@ if (max > 0 && this.online) {
    param.url = this.href();
    param.title = systitle;
    param.creator = this.creator.name
-   param.email = translateToEntities(this.creator.email);
+   if (this.creator.publishemail)
+      param.email = translateToEntities(this.creator.email);
    param.year = now.getYear();
    param.lastupdate = max > 0 ? this.lastUpdate.format(w3fmt): this.createtime.format(w3fmt);
 

code/Site/rss.skin

@@ -12,7 +12,7 @@
     <link><% this.url %></link>
     <description><% this.tagline encoding="xml" %></description>
     <dc:publisher><% param.title encoding="xml" %></dc:publisher>
-    <dc:creator><% param.creator encoding="xml" %> (mailto:<% param.email encoding="xml" %>)</dc:creator>
+    <dc:creator><% param.creator encoding="xml" %><% param.email encoding="xml" prefix=" (mailto:" suffix=")" %></dc:creator>
     <dc:date><% param.lastupdate %></dc:date>
     <dc:language>en</dc:language>
     <sy:updatePeriod>hourly</sy:updatePeriod>

code/Site/rssItem.skin

@@ -3,7 +3,7 @@
     <link><% this.url encoding="xml" %></link>
     <description><% param.date %><% this.tagline encoding="xml" prefix=" &#150; " %></description>
     <dc:publisher><% param.publisher encoding="xml" %></dc:publisher>
-    <dc:creator><% param.creator encoding="xml" %> (mailto:<% param.email encoding="xml" %>)</dc:creator>
+    <dc:creator><% param.creator encoding="xml" %><% param.email prefix=" (mailto:" suffix=")" encoding="xml" %></dc:creator>
     <dc:rights>Copyright &#169; <% param.year %> <% param.creator encoding="xml" %>%></dc:rights>
     <dc:date><% param.isodate %></dc:date>
   </item> 

code/Story/rssItem.skin

@@ -3,7 +3,7 @@
     <link><% param.url %></link>
     <% param.text prefix="<description>" suffix="</description>" encoding="xml" %>
     <dc:publisher><% param.publisher encoding="xml" %></dc:publisher>
-    <dc:creator><% param.creator encoding="xml" %> (mailto:<% param.email encoding="xml" %>)</dc:creator>
+    <dc:creator><% param.creator encoding="xml" %><% param.email prefix=" (mailto:" suffix=")" encoding="xml" %></dc:creator>
     <% param.subject prefix="<dc:subject>" suffix="</dc:subject>" encoding="xml" %>
     <dc:rights>Copyright &#169; <% param.year %> <% param.creator %></dc:rights>
     <dc:date><% param.date %></dc:date>