version 1.10, 2005/02/21 23:47:46
|
version 1.11, 2005/04/07 06:56:22
|
Line 365 END_OF_ONE
|
Line 365 END_OF_ONE
|
sub display_two { |
sub display_two { |
my ($r,$zipupload,$areas,$areaname,$cmsmap,$uname,$newdir,$numcrs,$fullpath) = @_; |
my ($r,$zipupload,$areas,$areaname,$cmsmap,$uname,$newdir,$numcrs,$fullpath) = @_; |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']); |
my $cms = $ENV{'form.source'}; |
my $cms = $env{'form.source'}; |
my $dirname = $ENV{'form.newdir'}; |
my $dirname = $env{'form.newdir'}; |
my $tempdir = &Apache::imsprocessor::create_tempdir('CSTR',$dirname,''); |
my $tempdir = &Apache::imsprocessor::create_tempdir('CSTR',$dirname,''); |
my $fname = &Apache::imsprocessor::uploadzip('CSTR',$tempdir,$zipupload); |
my $fname = &Apache::imsprocessor::uploadzip('CSTR',$tempdir,$zipupload); |
my $unzip_result = ''; |
my $unzip_result = ''; |
Line 557 Choose course:
|
Line 557 Choose course:
|
</tr> |
</tr> |
<tr> |
<tr> |
<td colspan='2'> |
<td colspan='2'> |
<input type="hidden" name="newdir" value="$ENV{'form.newdir'}" /> |
<input type="hidden" name="newdir" value="$env{'form.newdir'}" /> |
<input type="hidden" name="conditions" value="$conditions" /> |
<input type="hidden" name="conditions" value="$conditions" /> |
<input type="hidden" name="source" value="$cms" /> |
<input type="hidden" name="source" value="$cms" /> |
<input type="hidden" name="tempdir" value="$tempdir" /> |
<input type="hidden" name="tempdir" value="$tempdir" /> |
Line 610 sub display_three {
|
Line 610 sub display_three {
|
my $db_handling = ''; |
my $db_handling = ''; |
my $timenow = time; |
my $timenow = time; |
my $announce_handling = 'ok'; |
my $announce_handling = 'ok'; |
my $cms = $ENV{'form.source'}; |
my $cms = $env{'form.source'}; |
if ( defined($ENV{'form.bb_crs'}) ) { |
if ( defined($env{'form.bb_crs'}) ) { |
($cdom,$crs) = split/\//,$ENV{'form.bb_crs'}; |
($cdom,$crs) = split/\//,$env{'form.bb_crs'}; |
$chome = &Apache::lonnet::homeserver($crs,$cdom); |
$chome = &Apache::lonnet::homeserver($crs,$cdom); |
} |
} |
my $user_crs = ''; |
my $user_crs = ''; |
my $user_cdom = ''; |
my $user_cdom = ''; |
my $user_handling = ''; |
my $user_handling = ''; |
if ( defined($ENV{'form.user_crs'}) ) { |
if ( defined($env{'form.user_crs'}) ) { |
($user_cdom,$user_crs) = split/\//,$ENV{'form.user_crs'}; |
($user_cdom,$user_crs) = split/\//,$env{'form.user_crs'}; |
} |
} |
my $seqstem = "/res/$udom/$uname/$newdir"; |
my $seqstem = "/res/$udom/$uname/$newdir"; |
my %importareas = (); |
my %importareas = (); |
Line 645 sub display_three {
|
Line 645 sub display_three {
|
my @sequences = (); |
my @sequences = (); |
my @resrcfiles = (); |
my @resrcfiles = (); |
|
|
my $tempdir = $ENV{'form.tempdir'}; |
my $tempdir = $env{'form.tempdir'}; |
|
|
foreach my $area (@{$areas}) { |
foreach my $area (@{$areas}) { |
if (defined($ENV{"form.$area"}) ) { |
if (defined($env{"form.$area"}) ) { |
if ($cms eq 'angel' && $area eq 'doc') { |
if ($cms eq 'angel' && $area eq 'doc') { |
foreach (@{$$cmsmap{$cms}{$area}}) { |
foreach (@{$$cmsmap{$cms}{$area}}) { |
$importareas{$_} = 1; |
$importareas{$_} = 1; |
Line 657 sub display_three {
|
Line 657 sub display_three {
|
$importareas{$$cmsmap{$cms}{$area}} = 1; |
$importareas{$$cmsmap{$cms}{$area}} = 1; |
} |
} |
if ($area eq 'board') { |
if ($area eq 'board') { |
$db_handling = $ENV{'form.db_handling'}; |
$db_handling = $env{'form.db_handling'}; |
} elsif ($area eq 'users') { |
} elsif ($area eq 'users') { |
$user_handling = $ENV{'form.user_handling'}; |
$user_handling = $env{'form.user_handling'}; |
} |
} |
} |
} |
} |
} |
Line 805 sub handler {
|
Line 805 sub handler {
|
my $qcount = ''; |
my $qcount = ''; |
|
|
# get personal information for this user |
# get personal information for this user |
my $user=$ENV{'user.name'}; |
my $user=$env{'user.name'}; |
my $dom=$ENV{'user.domain'}; |
my $dom=$env{'user.domain'}; |
|
|
# |
# |
# re-attach user |
# re-attach user |
# |
# |
if ($ENV{'form.uploaduname'}) { |
if ($env{'form.uploaduname'}) { |
$ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'. |
$env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'. |
$ENV{'form.filename'}; |
$env{'form.filename'}; |
} |
} |
($uname,$udom)= |
($uname,$udom)= |
&Apache::loncacc::constructaccess($ENV{'form.filename'}, |
&Apache::loncacc::constructaccess($env{'form.filename'}, |
$r->dir_config('lonDefDomain')); |
$r->dir_config('lonDefDomain')); |
unless (($uname) && ($udom)) { |
unless (($uname) && ($udom)) { |
$r->log_reason($uname.' at '.$udom. |
$r->log_reason($uname.' at '.$udom. |
' trying to publish file '.$ENV{'form.filename'}. |
' trying to publish file '.$env{'form.filename'}. |
' - not authorized', |
' - not authorized', |
$r->filename); |
$r->filename); |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
my $fn; |
my $fn; |
if ($ENV{'form.filename'}) { |
if ($env{'form.filename'}) { |
$fn=$ENV{'form.filename'}; |
$fn=$env{'form.filename'}; |
$fn=~s/^http\:\/\/[^\/]+\///; |
$fn=~s/^http\:\/\/[^\/]+\///; |
$fn=~s/^\///; |
$fn=~s/^\///; |
$fn=~s/(\~|priv\/)(\w+)//; |
$fn=~s/(\~|priv\/)(\w+)//; |
$fn=~s/\/+/\//g; |
$fn=~s/\/+/\//g; |
} else { |
} else { |
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
' unspecified filename for upload', $r->filename); |
' unspecified filename for upload', $r->filename); |
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
Line 856 sub handler {
|
Line 856 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
if ($ENV{'form.phase'} eq 'two') { |
if ($env{'form.phase'} eq 'two') { |
&jscript_one($fullpath,\$javascript,$uname,$udom); |
&jscript_one($fullpath,\$javascript,$uname,$udom); |
} elsif ($ENV{'form.phase'} eq 'three') { |
} elsif ($env{'form.phase'} eq 'three') { |
&jscript_two(\$javascript,$user,$dom,\$numcrs); |
&jscript_two(\$javascript,$user,$dom,\$numcrs); |
} elsif ($ENV{'form.phase'} eq 'four') { |
} elsif ($env{'form.phase'} eq 'four') { |
&jscript_three(\$javascript); |
&jscript_three(\$javascript); |
} |
} |
$r->print("<html><head><title>LON-CAPA Construction Space</title><script type=\"text/javascript\">\n//<!--\n$javascript\n// --></script>\n</head>"); |
$r->print("<html><head><title>LON-CAPA Construction Space</title><script type=\"text/javascript\">\n//<!--\n$javascript\n// --></script>\n</head>"); |
|
|
$r->print(&Apache::loncommon::bodytag('Upload IMS package to Construction Space',undef,$loadentries)); |
$r->print(&Apache::loncommon::bodytag('Upload IMS package to Construction Space',undef,$loadentries)); |
|
|
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
$r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname. |
$r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname. |
&mt(' at ').$udom.'</font></h3>'); |
&mt(' at ').$udom.'</font></h3>'); |
} |
} |
if ($ENV{'form.phase'} eq 'two') { |
if ($env{'form.phase'} eq 'two') { |
my $flag = &Apache::lonupload::phasetwo($r,$fn,$uname,$udom,'imsimport'); |
my $flag = &Apache::lonupload::phasetwo($r,$fn,$uname,$udom,'imsimport'); |
if ($flag eq 'ok') { |
if ($flag eq 'ok') { |
&display_one($r,$uname,$fn,$fullpath); |
&display_one($r,$uname,$fn,$fullpath); |
} |
} |
} elsif ( ($ENV{'form.phase'} eq 'three') || ($ENV{'form.phase'} eq 'four') ) { |
} elsif ( ($env{'form.phase'} eq 'three') || ($env{'form.phase'} eq 'four') ) { |
my $docroot = $ENV{'form.newdir'}; |
my $docroot = $env{'form.newdir'}; |
my $newdir = ''; |
my $newdir = ''; |
if ($docroot =~ m|public_html/(.+)$|) { |
if ($docroot =~ m|public_html/(.+)$|) { |
$newdir = $1; |
$newdir = $1; |
} |
} |
if ($ENV{'form.phase'} eq 'three') { |
if ($env{'form.phase'} eq 'three') { |
&display_two ($r,$zipupload,\@areas,\%areaname,\%cmsmap,$uname,$newdir,\$numcrs,$fullpath); |
&display_two ($r,$zipupload,\@areas,\%areaname,\%cmsmap,$uname,$newdir,\$numcrs,$fullpath); |
} elsif ($ENV{'form.phase'} eq 'four') { |
} elsif ($env{'form.phase'} eq 'four') { |
&display_three ($r,$uname,$udom,\@areas,\%areaname,\%cmsmap,$docroot,$newdir); |
&display_three ($r,$uname,$udom,\@areas,\%areaname,\%cmsmap,$docroot,$newdir); |
} |
} |
} else { |
} else { |