Index: openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	7 Apr 2018 19:25:21 -0000	1.5
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	9 Apr 2018 11:55:35 -0000	1.6
@@ -341,15 +341,15 @@
     @creation-date 2003-06-29
 } {
 
-    if { (![info exists creation_user] || $creation_user eq "") } {
+    if { $creation_ip eq "" } {
         set creation_user [ad_conn user_id]
     }
 
-    if { (![info exists creation_ip] || $creation_ip eq "") } {
+    if { $creation_ip eq "" } {
         set creation_ip [ad_conn peeraddr]
     }
 
-    if { (![info exists package_id] || $package_id eq "") } {
+    if { $package_id eq "" } {
         set package_id [ad_conn package_id]
     }
 
Index: openacs-4/packages/news-aggregator/tcl/opml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/opml-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/news-aggregator/tcl/opml-procs.tcl	7 Apr 2018 16:58:52 -0000	1.2
+++ openacs-4/packages/news-aggregator/tcl/opml-procs.tcl	9 Apr 2018 11:55:35 -0000	1.3
@@ -1,6 +1,6 @@
 ad_library {
     Some random procs to parse (not generate) OPML.
-    
+
     @author Guan Yang (guan@unicast.org)
     @creation-date 2003-07-17
 }
@@ -12,20 +12,20 @@
 } {
     Parse the OPML and return a wonderful special data structure.
     This is Guan's Ultra Liberal OPML Parser (GULOP).
-        
+
     @author Guan Yang (guan@unicast.org)
     @creation-date 2003-07-17
 } {
     if { [catch {
         set doc [dom parse $xml]
-        
+
         set doc_node [$doc documentElement]
         if { [$doc_node nodeName] ne "opml" } {
             error "Document element is not opml"
         }
-        
+
         set opml(status) "success"
-        
+
         set head_nodes [$doc_node selectNodes {/opml/*[local-name()='head']}]
         if { [llength $head_nodes] != 1 } {
             error "There is not exactly one head element"
@@ -39,23 +39,23 @@
         if { $title_text ne "mySubscriptions" } {
             error "OPML title is not 'mySubscriptions'. This does not appear to be an OPML file in mySubscriptions format."
         }
-        
+
         set body_nodes [$doc_node selectNodes {/opml/*[local-name()='body']}]
         if { [llength $body_nodes] == 0 } {
             # No body node
             error "Document element has no body child"
         }
         # If there is more than one body child, we take the first one
         set body_node [lindex $body_nodes 0]
-        
+
         set elements [list]
-        
+
         foreach node [$body_node getElementsByTagName "outline"] {
             set title [$node getAttribute title ""]
             set url [$node getAttribute xmlUrl ""]
             set html_url [$node getAttribute htmlUrl ""]
-            
-            if { $title ne "" && ![string equal url ""] &&
+
+            if { $title ne "" && $url ne "" &&
                  $html_url ne "" &&
                  [util_url_valid_p $url] } {
                 set feed(title) $title
@@ -64,14 +64,14 @@
                 lappend elements [array get feed]
             }
         }
-        
+
         set opml(elements) $elements
     } errmsg] } {
         set error(status) "failure"
         set error(errmsg) $errmsg
-        
+
         return [array get error]
     }
-    
+
     return [array get opml]
 }
Index: openacs-4/packages/news-aggregator/tcl/source-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/source-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/news-aggregator/tcl/source-procs.tcl	7 Apr 2018 19:25:21 -0000	1.9
+++ openacs-4/packages/news-aggregator/tcl/source-procs.tcl	9 Apr 2018 11:55:35 -0000	1.10
@@ -40,7 +40,7 @@
                 return $source_id
             }
         }
-        
+
         ns_log Debug "news_aggregator::source::new: Source exists but no aggregator provided, returning 0"
         return 0
     } else {
@@ -60,15 +60,15 @@
     set channel_title $title
     set link [string_truncate -len 500 -- $channel(link)]
     set description [string_truncate -len 500 -- $channel(description)]
-    
+
     set source_id [db_nextval "acs_object_id_seq"]
     set creation_ip [ad_conn peeraddr]
     set last_modified $f(modified)
-    
+
     db_exec_plsql add_source {}
 
     update -source_id $source_id -feed_url $feed_url -modified ""
-    
+
     if { $aggregator_id ne "" } {
         news_aggregator::subscription::new \
             -aggregator_id $aggregator_id \
@@ -273,16 +273,16 @@
     {-feed_url:required}
     {-title:required}
     {-description:required}
-    {-guid}
+    {-guid ""}
 } {
     Generate a private GUID for an entry that is used only
     by news-aggregator.
 } {
-    if { (![info exists guid] || $guid eq "") } {
+    if { $guid eq "" } {
         set message [list $title $link $description]
         set guid [ns_sha1 $message]
     }
-    
+
     return "$guid@$feed_url"
 }
 
@@ -304,7 +304,7 @@
     will only update the 25% of the existing sources.
 } {
     ns_log Notice "Updating news aggregator sources"
-    
+
     ds_comment "test"
     db_transaction {
         set source_count [db_string source_count ""]
@@ -318,19 +318,19 @@
             } else {
                 set limit_sql ""
             }
-            
+
             if { !$all_sources_p } {
                 set time_limit [db_map time_limit]
             } else {
                 set time_limit {}
             }
-            
+
             set sources [db_list_of_lists sources ""]
             foreach source $sources {
                 set source_id [lindex $source 0]
                 set feed_url [lindex $source 1]
                 set last_modified [lindex $source 2]
-                
+
                 news_aggregator::source::update \
                         -source_id $source_id \
                         -feed_url $feed_url \
Index: openacs-4/packages/news-aggregator/www/aggregator-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator-delete.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/news-aggregator/www/aggregator-delete.tcl	7 Apr 2018 19:25:21 -0000	1.3
+++ openacs-4/packages/news-aggregator/www/aggregator-delete.tcl	9 Apr 2018 11:55:35 -0000	1.4
@@ -17,7 +17,7 @@
     # We are deleting the user's default aggregator
     # Set user's oldest aggregator as new default
     set new_default_aggregator [db_string select_oldest_aggregator {} -default ""]
-    if { [info exists $new_default_aggregator] && [set $new_default_aggregator] ne "" } {
+    if { $$new_default_aggregator ne "" } {
         news_aggregator::aggregator::set_user_default \
             -user_id $user_id \
             -aggregator_id $new_default_aggregator
Index: openacs-4/packages/news-aggregator/www/subscriptions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/news-aggregator/www/subscriptions.tcl	7 Apr 2018 19:25:21 -0000	1.10
+++ openacs-4/packages/news-aggregator/www/subscriptions.tcl	9 Apr 2018 11:55:35 -0000	1.11
@@ -144,7 +144,7 @@
     }
 } -validate {
     {feed_url
-	{ [info exists feed_url] && $feed_url ne "" && "http://" ne $feed_url } 
+    { $feed_url ne "" && "http://" ne $feed_url }
         { You must specify a URL }
     }
 } -new_data {