[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[bowersj2]

bowersj2		Tue Sep 16 16:03:12 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Refactor a permission check (turned out to be useless but might as well 
  name it), change the emPHAsis of the bolded text, change 
  "/home/$user/public_html/$stuff" to "~$user/$stuff".
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.234 loncom/interface/lonprintout.pm:1.235
--- loncom/interface/lonprintout.pm:1.234	Wed Sep 10 15:38:34 2003
+++ loncom/interface/lonprintout.pm	Tue Sep 16 16:03:12 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.234 2003/09/10 19:38:34 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.235 2003/09/16 20:03:12 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1080,7 +1080,7 @@
     # very first screen.
     # Detect whether we're coming from construction space
     if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
-        $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+        $helper->{VARS}->{'filename'} = "~$1/$2";
         $helper->{VARS}->{'construction'} = 1;
     } else {
         if ($ENV{'form.postdata'}) {
@@ -1132,6 +1132,9 @@
     }
 
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
+    my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
+			   $ENV{'request.role'}=~m/^in\./ or
+			   $ENV{'request.role'}=~m/^ta\./);
 
     Apache::lonhelper::registerHelperTags();
 
@@ -1157,18 +1160,19 @@
     my $printChoices = [];
     my $paramHash;
 
-    if ($resourceTitle) {
-        push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+    if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
+        push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
     }
 
 #    $r->print($helper->{VARS}->{'postdata'});
 
     # If we're in a sequence...
-    if ($helper->{'VARS'}->{'construction'} ne '1') {
+    if (($helper->{'VARS'}->{'construction'} ne '1') &&
+	$helper->{VARS}->{'postdata'}) {
         # Allow problems from sequence
-        push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, ["<b>Selected problems</b> in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, ["<b>Selected resources</b> in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
         my $isProblem = '$res->is_problem()';
 	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
@@ -1203,9 +1207,9 @@
 
     # If the user is priviledged, allow them to print all 
     # problems in the course, optionally for selected students
-    if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
-        push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
-        push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
+    if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
+        push @{$printChoices}, ['Selected problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+        push @{$printChoices}, ["Selected problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
 
         my $isProblem = '$res->is_problem()';
 	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;