version 1.301, 2004/05/10 14:25:02
|
version 1.303, 2004/05/27 14:08:58
|
Line 421 sub page_format {
|
Line 421 sub page_format {
|
} elsif($papersize eq '6') { |
} elsif($papersize eq '6') { |
if ($layout eq 'book') { |
if ($layout eq 'book') { |
if ($numberofcolumns == 1) { |
if ($numberofcolumns == 1) { |
$textwidth = '18 cm'; |
$textwidth = '176 mm'; |
$textheight = '28 cm'; |
$textheight = '254 mm'; |
$oddoffset = '-0.57 in'; |
$oddoffset = '-0.57 in'; |
$evenoffset = '-0.57 in'; |
$evenoffset = '-0.57 in'; |
} elsif ($numberofcolumns == 2) { |
} elsif ($numberofcolumns == 2) { |
$textwidth = '96 mm'; |
$textwidth = '91 mm'; |
$textheight = '2 cm'; |
$textheight = '254 mm'; |
$oddoffset = '-0.57 in'; |
$oddoffset = '-0.57 in'; |
$evenoffset = '-0.57 in'; |
$evenoffset = '-0.57 in'; |
} |
} |
Line 1103 ENDPART
|
Line 1103 ENDPART
|
if ($urlp =~ m|/home/([^/]+)/public_html|) { |
if ($urlp =~ m|/home/([^/]+)/public_html|) { |
$urlp =~ s|/home/([^/]*)/public_html|/~$1|; |
$urlp =~ s|/home/([^/]*)/public_html|/~$1|; |
} else { |
} else { |
$urlp =~ s|^/home/httpd/html||; |
$urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||; |
} |
} |
my $texversion=&Apache::lonnet::ssi($urlp,%form); |
my $texversion=&Apache::lonnet::ssi($urlp,%form); |
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || |
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || |
Line 1231 ENDPART
|
Line 1231 ENDPART
|
&Apache::lonnet::appenv('cgi.'.$identifier.'.file' => $filename, |
&Apache::lonnet::appenv('cgi.'.$identifier.'.file' => $filename, |
'cgi.'.$identifier.'.layout' => $laystyle, |
'cgi.'.$identifier.'.layout' => $laystyle, |
'cgi.'.$identifier.'.numcol' => $numberofcolumns, |
'cgi.'.$identifier.'.numcol' => $numberofcolumns, |
|
'cgi.'.$identifier.'.paper' => $papersize, |
'cgi.'.$identifier.'.selection' => $selectionmade, |
'cgi.'.$identifier.'.selection' => $selectionmade, |
'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'}, |
'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'}, |
'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'}, |
'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'}, |
Line 1494 sub printHelper {
|
Line 1495 sub printHelper {
|
# "Delete everything after the last slash." |
# "Delete everything after the last slash." |
$subdir =~ s|/[^/]+$||; |
$subdir =~ s|/[^/]+$||; |
if (not $helper->{VARS}->{'construction'}) { |
if (not $helper->{VARS}->{'construction'}) { |
$subdir='/home/httpd/html/res/'.$subdir; |
$subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir; |
} |
} |
# "Remove all duplicate slashes." |
# "Remove all duplicate slashes." |
$subdir =~ s|/+|/|g; |
$subdir =~ s|/+|/|g; |
Line 1693 CHOOSE_ANON2
|
Line 1694 CHOOSE_ANON2
|
} |
} |
|
|
# FIXME: That RE should come from a library somewhere. |
# FIXME: That RE should come from a library somewhere. |
if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne '/home/httpd/html/res/') { |
if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') { |
push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; |
push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; |
|
|
my $f = '$filename'; |
my $f = '$filename'; |