loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.234 and 1.235

version 1.234, 2003/09/10 19:38:34	version 1.235, 2003/09/16 20:03:12
Line 1080 sub printHelper {	Line 1080 sub printHelper {
# very first screen.	# very first screen.
# Detect whether we're coming from construction space	# Detect whether we're coming from construction space
if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/\|\/\|)\~([^\/]+)\/(.*)$/) {	if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/\|\/\|)\~([^\/]+)\/(.*)$/) {
$helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";	$helper->{VARS}->{'filename'} = "~$1/$2";
$helper->{VARS}->{'construction'} = 1;	$helper->{VARS}->{'construction'} = 1;
} else {	} else {
if ($ENV{'form.postdata'}) {	if ($ENV{'form.postdata'}) {
Line 1132 sub printHelper {	Line 1132 sub printHelper {
}	}

my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();	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();	Apache::lonhelper::registerHelperTags();

Line 1157 sub printHelper {	Line 1160 sub printHelper {
my $printChoices = [];	my $printChoices = [];
my $paramHash;	my $paramHash;

if ($resourceTitle) {	if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];	push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
}	}

# $r->print($helper->{VARS}->{'postdata'});	# $r->print($helper->{VARS}->{'postdata'});

# If we're in a sequence...	# 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	# 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	# 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()';	my $isProblem = '$res->is_problem()';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
Line 1203 HELPERFRAGMENT	Line 1207 HELPERFRAGMENT

# If the user is priviledged, allow them to print all	# If the user is priviledged, allow them to print all
# problems in the course, optionally for selected students	# 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\//)) {	if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];	push @{$printChoices}, ['Selected problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];	push @{$printChoices}, ["Selected problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];

my $isProblem = '$res->is_problem()';	my $isProblem = '$res->is_problem()';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.234
changed lines
	Added in v.1.235