version 1.30, 2011/03/05 22:25:09
|
version 1.31, 2011/10/23 01:27:34
|
Line 1853 sub handler {
|
Line 1853 sub handler {
|
$r->send_http_header; |
$r->send_http_header; |
|
|
my ($filename,$pathname) = &File::Basename::fileparse($fn); |
my ($filename,$pathname) = &File::Basename::fileparse($fn); |
my $webpath = '/priv/'.$uname.$pathname; |
my $webpath = '/priv/'.$udom.'/'.$uname.$pathname; |
my $urlpath = '/~'.$uname.$pathname; |
my $dirpath = $r->dir_config('lonDocRoot').$webpath; |
my $dirpath = '/home/'.$uname.'/public_html'.$pathname; |
|
my ($res,$subdir,$badfile,$textref,$header,$css,$js,%loadentries,@pages,%names); |
my ($res,$subdir,$badfile,$textref,$header,$css,$js,%loadentries,@pages,%names); |
|
|
if ($env{'form.phase'} eq 'three') { |
if ($env{'form.phase'} eq 'three') { |
Line 1877 sub handler {
|
Line 1876 sub handler {
|
} |
} |
} |
} |
($res,$badfile,$textref,$header,$css,$js) = |
($res,$badfile,$textref,$header,$css,$js) = |
&parse_datafile($r,$uname,$filename,$pathname,$dirpath,$urlpath, |
&parse_datafile($r,$uname,$filename,$pathname,$dirpath,$webpath, |
$page_name,$subdir,$env{'form.timestamp'}); |
$page_name,$subdir,$env{'form.timestamp'}); |
if ($page_name eq 'Welcome') { |
if ($page_name eq 'Welcome') { |
&jscript_zero($webpath,\$javascript); |
&jscript_zero($webpath,\$javascript); |
Line 1939 sub handler {
|
Line 1938 sub handler {
|
&display_zero ($r,$uname,$fn,$current_page,$webpath) if $page_name eq 'Welcome'; |
&display_zero ($r,$uname,$fn,$current_page,$webpath) if $page_name eq 'Welcome'; |
&display_one ($r,$uname,$fn,$current_page,$textref,$header) if $page_name eq 'Blocks'; |
&display_one ($r,$uname,$fn,$current_page,$textref,$header) if $page_name eq 'Blocks'; |
&display_two ($r,$uname,$fn,$current_page,$textref,$header,$qcount) if $page_name eq 'Format'; |
&display_two ($r,$uname,$fn,$current_page,$textref,$header,$qcount) if $page_name eq 'Format'; |
&display_three ($r,$uname,$fn,$current_page,$textref,$res,$header,$urlpath,$qcount) if $page_name eq 'Target'; |
&display_three ($r,$uname,$fn,$current_page,$textref,$res,$header,$webpath,$qcount) if $page_name eq 'Target'; |
&final_display ($r,$uname,$fn,$current_page,$textref,$res,$header,$css,$js,$webpath,$dirpath,$subdir) if $page_name eq 'Confirmation'; |
&final_display ($r,$uname,$fn,$current_page,$textref,$res,$header,$css,$js,$webpath,$dirpath,$subdir) if $page_name eq 'Confirmation'; |
} |
} |
} elsif ($env{'form.phase'} eq 'two') { |
} elsif ($env{'form.phase'} eq 'two') { |