Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/install.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.9.2.9 -r1.9.2.10
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	20 Mar 2003 14:46:55 -0000	1.9.2.9
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	6 Apr 2003 00:32:29 -0000	1.9.2.10
@@ -63,6 +63,7 @@
 set header_font_color "black"
 set header_logo_item_id ""
 set header_img_url "$dotlrn_url/graphics/logo" 
+set header_img_file "[acs_root_dir]/packages/dotlrn/www/graphics/logo"
 set header_img_alt_text "Header Logo"
 
 set extra_spaces "<img src=$dotlrn_url/graphics/spacer.gif border=0 width=15>"
@@ -234,9 +235,16 @@
 	}
     }
   
-    set header_img_url "$header_img_url-$scope_name.gif"
+    # DRB: default logo for dotlrn is a JPEG provided by Collaboraid.  This can
+    # be replaced by custom gifs if prefered (as is done by SloanSpace)
 
-    # font hack
+    if { [file exists "$header_img_file-$scope_name.jpg"] } {
+        set header_img_url "$header_img_url-$scope_name.jpg"
+    } elseif { [file exists "$header_img_file-$scope_name.gif"] } {
+        set header_img_url "$header_img_url-$scope_name.gif"
+    }
+
+   # font hack
    set community_header_font [dotlrn_community::get_attribute \
         -community_id $community_id \
         -attribute_name header_font
@@ -288,10 +296,21 @@
             [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
 } else {
     # under /dotlrn
-    set header_img_url "$header_img_url-$scope_name.gif" 
+
+    # DRB: default logo for dotlrn is a JPEG provided by Collaboraid.  This can
+    # be replaced by custom gifs if prefered (as is done by SloanSpace)
+
+    if { [file exists "$header_img_file-$scope_name.jpg"] } {
+        set header_img_url "$header_img_url-$scope_name.jpg"
+    } elseif { [file exists "$header_img_file-$scope_name.gif"] } {
+        set header_img_url "$header_img_url-$scope_name.gif"
+    }
+
     set text $full_name    
 }
 
+ns_log Notice "Huh? header_img_url: $header_img_url scope_name: $scope_name file: [ns_url2file $header_img_url-$scope_name.jpg]"
+
 if { ![info exists header_stuff] } {
     set header_stuff ""
 }
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v
diff -u -r1.7.2.3 -r1.7.2.4
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	11 Mar 2003 02:41:11 -0000	1.7.2.3
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	6 Apr 2003 00:32:30 -0000	1.7.2.4
@@ -106,7 +106,6 @@
             acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value $inverse_row_guest
             
             doc_body_append "creation succeeded...."
-            lappend list_of_addresses_and_passwords $row(email) $password
         }
 
         doc_body_append "<br>"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logo-comm.jpg'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logo-course.jpg'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logo-user.jpg'.
Fisheye: No comparison available.  Pass `N' to diff?