version 1.32, 2009/08/17 03:52:09
|
version 1.35, 2011/10/24 22:02:38
|
Line 604 sub display_three {
|
Line 604 sub display_three {
|
} else { |
} else { |
$r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,bulletin board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n"); |
$r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,bulletin board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n"); |
} |
} |
$r->print('<br /><br />'.$lt{'plsv'}.' '.$lt{'tseq'}.'<br /><br />'.$lt{'tfin'}.'<br /><br /><a href="/priv/'.$uname.'/'.$newdir.'">'.$lt{'disp'}.'</a>'); |
$r->print('<br /><br />'.$lt{'plsv'}.' '.$lt{'tseq'}.'<br /><br />'.$lt{'tfin'}.'<br /><br /><a href="/priv/'.$udom.'/'.$uname.'/'.$newdir.'">'.$lt{'disp'}.'</a>'); |
if ($destdir =~ m-^/home/$uname/public_html/-) { |
if ($destdir =~ m-^/home/httpd/html/priv/$udom/$uname/-) { |
system (" rm -r -f $destdir/temp"); |
system (" rm -r -f $destdir/temp"); |
} |
} |
} elsif ($manifest_result eq 'nomanifest') { |
} elsif ($manifest_result eq 'nomanifest') { |
Line 616 sub display_three {
|
Line 616 sub display_three {
|
# ---------------------------------------------------------------- Get LON-CAPA Course Coordinator roles for this user |
# ---------------------------------------------------------------- Get LON-CAPA Course Coordinator roles for this user |
sub get_ccroles { |
sub get_ccroles { |
my ($user,$dom,$crsentry,$crslist) = @_; |
my ($user,$dom,$crsentry,$crslist) = @_; |
my %roles = (); |
my %roles; |
unless ($user eq '') { |
unless ($user eq '') { |
%roles = &Apache::lonnet::dump('roles',$dom,$user); |
my $ccrole = 'cc'; |
|
%roles = &Apache::lonnet::get_my_roles($user,$dom,'userroles',undef,[$ccrole]); |
} |
} |
my $iter = 0; |
my $iter = 0; |
my @codes = (); |
my @codes = (); |
my %courses = (); |
my %courses = (); |
my @crslist = (); |
my @crslist = (); |
my %descrip =(); |
my %descrip =(); |
foreach my $key (keys %roles ) { |
foreach my $key (keys(%roles)) { |
if ($key =~ m{^/($LONCAPA::domain_re)/($LONCAPA::username_re)_cc$}) { |
if ($key =~ m{^/($LONCAPA::domain_re)/($LONCAPA::username_re)_cc$}) { |
my $cdom = $1; |
my $cdom = $1; |
my $crs = $2; |
my $crs = $2; |
my $role_end = 0; |
my $currcode = ''; |
my $role_start = 0; |
my %settings = &Apache::lonnet::get('environment',['internal.coursecode','description'],$cdom,$crs); |
my $active_chk = 1; |
if (defined($settings{'description'}) ) { |
if ( $roles{$key} =~ m/^cc_(\d+)/ ) { |
$descrip{$crs} = $settings{'description'}; |
$role_end = $1; |
} else { |
if ( $roles{$key} =~ m/^cc_($role_end)_(\d+)$/ ) |
$descrip{$crs} = 'Unknown'; |
{ |
|
$role_start = $2; |
|
} |
|
} |
|
if ($role_start > 0) { |
|
if (time < $role_start) { |
|
$active_chk = 0; |
|
} |
|
} |
|
if ($role_end > 0) { |
|
if (time > $role_end) { |
|
$active_chk = 0; |
|
} |
|
} |
} |
if ($active_chk) { |
if (defined($settings{'internal.coursecode'}) ) { |
my $currcode = ''; |
$currcode = $settings{'internal.coursecode'}; |
my %settings = &Apache::lonnet::get('environment',['internal.coursecode','description'],$cdom,$crs); |
if ($currcode eq '') { |
if (defined($settings{'description'}) ) { |
|
$descrip{$crs} = $settings{'description'}; |
|
} else { |
|
$descrip{$crs} = 'Unknown'; |
|
} |
|
if (defined($settings{'internal.coursecode'}) ) { |
|
$currcode = $settings{'internal.coursecode'}; |
|
if ($currcode eq '') { |
|
$currcode = "____".$iter; |
|
$iter ++; |
|
} |
|
} else { |
|
$currcode = "____".$iter; |
$currcode = "____".$iter; |
$iter ++; |
$iter ++; |
} |
} |
unless (grep/^$currcode$/,@codes) { |
} else { |
push @codes,$currcode; |
$currcode = "____".$iter; |
@{$courses{$currcode}} = (); |
$iter ++; |
} |
} |
push @{$courses{$currcode}}, $cdom.'/'.$crs; |
unless (grep/^$currcode$/,@codes) { |
|
push @codes,$currcode; |
|
@{$courses{$currcode}} = (); |
} |
} |
|
push @{$courses{$currcode}}, $cdom.'/'.$crs; |
} |
} |
} |
} |
foreach my $code (sort @codes) { |
foreach my $code (sort @codes) { |
Line 705 sub handler {
|
Line 684 sub handler {
|
# 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/'.$dom.'/'.$env{'form.uploaduname'}.'/'. |
$env{'form.filename'}; |
$env{'form.filename'}; |
} |
} |
($uname,$udom)= |
($uname,$udom)= |
Line 724 sub handler {
|
Line 703 sub handler {
|
$fn=$env{'form.filename'}; |
$fn=$env{'form.filename'}; |
$fn=~s/^https?\:\/\/[^\/]+\///; |
$fn=~s/^https?\:\/\/[^\/]+\///; |
$fn=~s/^\///; |
$fn=~s/^\///; |
$fn=~s/(\~|priv\/)($LONCAPA::username_re)//; |
$fn=~s/(priv\/)($LONCAPA::domain_re)\/($LONCAPA::username_re)//; |
$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; |
} |
} |
my $zipupload = '/home/'.$uname.'/public_html'.$fn; |
my $zipupload = '/home/httpd/html/priv/'.$udom.'/'.$uname.$fn; |
my $pathname = &File::Basename::dirname($fn); |
my $pathname = &File::Basename::dirname($fn); |
my $fullpath = '/priv/'.$uname.$pathname; |
my $fullpath = '/priv/'.$udom.'/'.$uname.$pathname; |
unless ($pathname eq '/') { |
unless ($pathname eq '/') { |
$fullpath .= '/'; |
$fullpath .= '/'; |
} |
} |
Line 775 sub handler {
|
Line 754 sub handler {
|
} 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|/(.+)$|) { |
$newdir = $1; |
$newdir = $1; |
} |
} |
if ($env{'form.phase'} eq 'three') { |
if ($env{'form.phase'} eq 'three') { |