--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/11/21 18:18:04	1.30
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2004/02/24 21:03:09	1.31.2.1
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.30 2003/11/21 18:18:04 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.31.2.1 2004/02/24 21:03:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,10 +256,12 @@ sub handler {
     $symb = $ENV{'form.usymb'} if (exists($ENV{'form.usymb'}));
     my $name   = $ENV{'user.name'};
     my $domain = $ENV{'user.domain'};
-    if (exists($ENV{'form.sname'})) {
+    if (exists($ENV{'form.sname'}) && $ENV{'form.sname'} ne '') {
         $name   = $ENV{'form.sname'};
         $domain = $ENV{'form.sdomain'};
     }
+    $ENV{'form.sname'} = $name;
+    $ENV{'form.sdomain'} = $domain;
     ##
     ## Check permissions
     my $allowed_to_edit = &Apache::lonnet::allowed('mgr',
@@ -470,11 +472,9 @@ END
     $r->rflush();
     #
     $r->print("<table><tr>");
-    if ($sheettype eq 'classcalc') {
-        $r->print('<td><input type="submit" value="'.
-		  &mt('Generate Spreadsheet').'" />'.
-                  '</td>');
-    }
+    $r->print('<td><input type="submit" value="'.
+              &mt('Generate Spreadsheet').'" />'.
+              '</td>');
     if ($allowed_to_view) {
         $r->print('<td>'.
                   &Apache::loncommon::help_open_topic("Spreadsheet_About",