Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl	29 Sep 2013 13:49:45 -0000	1.6
+++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl	1 Nov 2013 21:08:31 -0000	1.7
@@ -69,7 +69,7 @@
 set td_align "align=\"center\" valign=\"top\""
 
 
-if {![empty_string_p $community_id]} {
+if {$community_id ne ""} {
     set have_comm_id_p 1
 } else {
     set have_comm_id_p 0
@@ -79,7 +79,7 @@
 
 # navbar vars
 set show_navbar_p 1
-if {[exists_and_not_null no_navbar_p] && $no_navbar_p} {
+if {([info exists no_navbar_p] && $no_navbar_p ne "") && $no_navbar_p} {
     set show_navbar_p 0
 } 
 
@@ -97,7 +97,7 @@
     set link_control_panel 1
 }
 
-if { ![string equal [ad_conn package_key] [dotlrn::package_key]] } {
+if { [ad_conn package_key] ne [dotlrn::package_key] } {
     # Peter M: We are in a package (an application) that may or may not be under a dotlrn instance 
     # (i.e. in a news instance of a class)
     # and we want all links in the navbar to be active so the user can return easily to the class homepage
@@ -157,7 +157,7 @@
     set user_name [acs_user::get_element -user_id [ad_conn untrusted_user_id] -element name]
 }
 
-if {![exists_and_not_null title]} {
+if {(![info exists title] || $title eq "")} {
     set title [ad_system_name]
 }
 
@@ -171,7 +171,7 @@
 
 set control_panel_text [_ "dotlrn.control_panel"]
 
-if {![empty_string_p $community_id]} {
+if {$community_id ne ""} {
     # in a community or just under one in a mounted package like /calendar 
     set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
     set control_panel_text [_ acs-subsite.Admin]
@@ -181,7 +181,7 @@
 	set comm_type [dotlrn_community::get_community_type_from_community_id [dotlrn_community::get_parent_id -community_id $community_id]]
     }
 
-    if {$comm_type == "dotlrn_club"} {
+    if {$comm_type eq "dotlrn_club"} {
 	    #community colors
 	    set scope_name "comm"
 	    set scope_main_color "#"
@@ -223,7 +223,7 @@
         -attribute_name header_font
     ]
 
-    if {![empty_string_p $community_header_font]} {
+    if {$community_header_font ne ""} {
 	set header_font "$community_header_font,$header_font"
     }
 
@@ -244,7 +244,7 @@
         -attribute_name header_logo_item_id
     ]
 
-    if {![empty_string_p $header_logo_item_id]} {
+    if {$header_logo_item_id ne ""} {
         # Need filename
         set item_id [content::revision::item_id -revision_id $header_logo_item_id]
         set header_img_url "[subsite::get_url]image/$item_id"
@@ -256,13 +256,13 @@
         -attribute_name header_logo_alt_text
     ]
 
-    if {![empty_string_p $header_logo_alt_text]} {
+    if {$header_logo_alt_text ne ""} {
         set header_img_alt_text $header_logo_alt_text
     } 
 
     set text [dotlrn::user_context_bar -community_id $community_id]
 
-    if { [string equal [ad_conn package_key] [dotlrn::package_key]] } {
+    if {[ad_conn package_key] eq [dotlrn::package_key]} {
         set text "<span class=\"header-text\">$text</span>"
     }