Index: openacs-4/packages/news/news.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/news.info,v
diff -u -N -r1.34.2.2 -r1.34.2.3
--- openacs-4/packages/news/news.info	4 Dec 2020 10:15:11 -0000	1.34.2.2
+++ openacs-4/packages/news/news.info	4 Dec 2020 10:27:56 -0000	1.34.2.3
@@ -6,7 +6,7 @@
     <pretty-plural>News</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
-    
+
     <version name="5.10.0d3" url="http://openacs.org/repository/download/apm/news-5.10.0d3.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Used for announcements and news items.</summary>
Index: openacs-4/packages/news/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.adp,v
diff -u -N -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/news/www/index.adp	4 Dec 2020 10:15:11 -0000	1.20.2.1
+++ openacs-4/packages/news/www/index.adp	4 Dec 2020 10:27:56 -0000	1.20.2.2
@@ -5,9 +5,9 @@
 <listtemplate name="news"></listtemplate>
 
 <p><include src="/packages/notifications/lib/notification-widget" type="one_news_item_notif"
-	 object_id="@package_id;literal@"
-	 pretty_name="News"
-	 url="@news_url;literal@" >
+    object_id="@package_id;literal@"
+    pretty_name="News"
+    url="@news_url;literal@" >
 
 <if @rss_exists_p;literal@ true>
   <p>
Index: openacs-4/packages/news/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.tcl,v
diff -u -N -r1.22.2.1 -r1.22.2.2
--- openacs-4/packages/news/www/index.tcl	4 Dec 2020 10:15:11 -0000	1.22.2.1
+++ openacs-4/packages/news/www/index.tcl	4 Dec 2020 10:27:56 -0000	1.22.2.2
@@ -3,7 +3,7 @@
 ad_page_contract {
 
     Displays a hyperlinked list of published news titles either 'live' or 'archived'
-    
+
     @author Stefan Deusch (stefan@arsdigita.com)
     @creation-date 2000-12-20
     @cvs-id $Id$
@@ -15,11 +15,11 @@
 
 } -properties {
 
-   
+
     title:onevalue
     context:onevalue
     news_admin_p:onevalue
-    news_create_p:onevalue 
+    news_create_p:onevalue
     news_items:multirow
 }
 
@@ -28,7 +28,7 @@
 permission::require_permission -object_id $package_id -privilege news_read
 
 
-set context {} 
+set context {}
 
 set actions_list [list]
 
@@ -43,9 +43,9 @@
             [export_vars -base [ad_conn url] {{view archive}}] \
             [_ news.Show_archived_news]
     }
-    
+
 } else {
-    
+
     set title [apm_instance_name_from_id $package_id]
     set view_clause [db_map view_clause_archived]
 
Index: openacs-4/packages/news/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v
diff -u -N -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/news/www/admin/index.adp	4 Dec 2020 10:15:11 -0000	1.21.2.1
+++ openacs-4/packages/news/www/admin/index.adp	4 Dec 2020 10:27:56 -0000	1.21.2.2
@@ -21,7 +21,7 @@
  <em>#news.lt_There_are_no_items_av#</em><p>
 </if>
 <else>
-<p>	
+<p>
  <table border="0">
    <tr><td>
     <form method=post action=process>
@@ -52,26 +52,17 @@
          </tr>
          </multiple>
        </table>
- 
+
      <if @view@ ne "all">
      <p>
       #news.lt_Do_the_following_to_t#
       <select name=action>
-	@select_actions;noquote@
-       <option value=delete>#news.Delete#</option>	
+        @select_actions;noquote@
+       <option value=delete>#news.Delete#</option>
        </select>
        <input type="submit" value="#news.Go#">
        </p>
      </if>
        </form>
        </td></tr></table>
 </else>
-
-
-
-
-
-
-
-
-
Index: openacs-4/packages/news/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.tcl,v
diff -u -N -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/news/www/admin/index.tcl	4 Dec 2020 10:15:11 -0000	1.11.2.1
+++ openacs-4/packages/news/www/admin/index.tcl	4 Dec 2020 10:27:56 -0000	1.11.2.2
@@ -28,10 +28,10 @@
 
 set view_slider [list \
     [list view "[_ news.News_Items]" published [list \
-	[list published "[_ news.Published]" {where "status like 'published%'"}] \
-	[list unapproved "[_ news.Unapproved]" {where "status = 'unapproved'"}] \
-	[list approved "[_ news.Approved]" {where "status like 'going_live%'"}] \
-	[list archived "[_ news.Archived]"     {where "status = 'archived'"}] \
+        [list published "[_ news.Published]" {where "status like 'published%'"}] \
+        [list unapproved "[_ news.Unapproved]" {where "status = 'unapproved'"}] \
+        [list approved "[_ news.Approved]" {where "status like 'going_live%'"}] \
+        [list archived "[_ news.Archived]"     {where "status = 'archived'"}] \
         [list all "[_ news.All]"               {} ] \
     ]]
 ]
@@ -40,25 +40,25 @@
 
 # define action on selected views, unapproved, archived, approved need restriction
 switch -- $view {
-    "unapproved" { 
-        set select_actions "<option value=\"publish\">[_ news.Publish]" 
+    "unapproved" {
+        set select_actions "<option value=\"publish\">[_ news.Publish]"
     }
-    "archived"   { 
-        set select_actions "<option value=\"publish\">[_ news.Publish]" 
+    "archived"   {
+        set select_actions "<option value=\"publish\">[_ news.Publish]"
     }
-    "approved"   { 
-        set select_actions "<option value=\"make permanent\">[_ news.Make_Permanent]" 
+    "approved"   {
+        set select_actions "<option value=\"make permanent\">[_ news.Make_Permanent]"
     }
     default      {
-	set select_actions "
-	<option value=\"archive now\" selected>[_ news.Archive_Now]</option>
-	<option value=\"archive next week\">[_ news.lt_Archive_as_of_Next_We]</option>
-	<option value=\"archive next month\">[_ news.lt_Archive_as_of_Next_Mo]</option>
-	<option value=\"make permanent\">[_ news.Make_Permanent]"
+        set select_actions "
+            <option value=\"archive now\" selected>[_ news.Archive_Now]</option>
+            <option value=\"archive next week\">[_ news.lt_Archive_as_of_Next_We]</option>
+            <option value=\"archive next month\">[_ news.lt_Archive_as_of_Next_Mo]</option>
+            <option value=\"make permanent\">[_ news.Make_Permanent]"
     }
 }
 
-set title "[_ news.Administration]" 
+set title "[_ news.Administration]"
 set context {}
 
 
Index: openacs-4/packages/news-portlet/news-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/news-portlet.info,v
diff -u -N -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/news-portlet/news-portlet.info	4 Dec 2020 10:15:11 -0000	1.30.2.2
+++ openacs-4/packages/news-portlet/news-portlet.info	4 Dec 2020 10:27:56 -0000	1.30.2.3
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
-    
+
     <version name="2.10.0d1" url="http://openacs.org/repository/download/apm/news-portlet-2.10.0d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Portlet for the &quot;new-portal&quot; system for the news package</summary>
Index: openacs-4/packages/news-portlet/www/news-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v
diff -u -N -r1.25.2.4 -r1.25.2.5
--- openacs-4/packages/news-portlet/www/news-portlet.tcl	4 Dec 2020 10:15:11 -0000	1.25.2.4
+++ openacs-4/packages/news-portlet/www/news-portlet.tcl	4 Dec 2020 10:27:56 -0000	1.25.2.5
@@ -82,17 +82,26 @@
     if { $display_subgroup_items_p } {
         set subgroup_package_ids [db_list select_subgroup_package_ids {
             select package_id
-            from apm_packages p right outer join
-               ( WITH RECURSIVE site_node_tree AS (
-                    select node_id, parent_id, object_id from site_nodes where node_id = :root_id
-                 UNION ALL
-                    select c.node_id, c.parent_id, c.object_id from site_node_tree tree, site_nodes as c
-                    where  c.parent_id = tree.node_id
-                 )
-		 select * from site_node_tree n) site_map
-            on site_map.object_id = p.package_id
-            where package_key = 'news'
-	    and (site_map.object_id is null or acs_permission.permission_p(site_map.object_id, :user_id, 'read') = 't')
+              from apm_packages p right outer join
+                    ( WITH RECURSIVE site_node_tree AS (
+                        select node_id,
+                               parent_id,
+                               object_id
+                          from site_nodes
+                         where node_id = :root_id
+                     UNION ALL
+                         select c.node_id,
+                                c.parent_id,
+                                c.object_id
+                           from site_node_tree tree,
+                                site_nodes as c
+                          where c.parent_id = tree.node_id
+                    )
+                    select * from site_node_tree n) site_map
+                        on site_map.object_id = p.package_id
+                     where package_key = 'news'
+                       and (site_map.object_id is null
+                            or acs_permission.permission_p(site_map.object_id, :user_id, 'read') = 't')
         }]
         if {[llength $subgroup_package_ids] > 0} {
             set one_instance_p 0