version 1.538, 2007/06/22 17:42:46
|
version 1.541, 2007/07/02 03:36:28
|
Line 2666 sub get_student_answers {
|
Line 2666 sub get_student_answers {
|
$moreenv{'grade_target'}='answer'; |
$moreenv{'grade_target'}='answer'; |
%moreenv=(%form,%moreenv); |
%moreenv=(%form,%moreenv); |
$feedurl = &Apache::lonnet::clutter($feedurl); |
$feedurl = &Apache::lonnet::clutter($feedurl); |
&Apache::lonenc::check_encrypt(\$feedurl); |
|
my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); |
my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); |
return $userview; |
return $userview; |
} |
} |
Line 3737 form, .inline { display: inline; }
|
Line 3736 form, .inline { display: inline; }
|
.LC_icon { |
.LC_icon { |
border: 0px; |
border: 0px; |
} |
} |
|
.LC_indexer_icon { |
|
border: 0px; |
|
height: 22px; |
|
} |
|
|
.LC_internal_info { |
.LC_internal_info { |
color: #999; |
color: #999; |
Line 6449 sub commit_customrole {
|
Line 6452 sub commit_customrole {
|
} |
} |
|
|
sub commit_standardrole { |
sub commit_standardrole { |
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; |
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
my $output; |
my ($output,$logmsg,$linefeed); |
my $logmsg; |
if ($context eq 'auto') { |
|
$linefeed = "\n"; |
|
} else { |
|
$linefeed = "<br />\n"; |
|
} |
if ($three eq 'st') { |
if ($three eq 'st') { |
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec); |
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end, |
if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { |
$one,$two,$sec,$context); |
|
if (($result =~ /^error/) || ($result eq 'not_in_class') || |
|
($result eq 'unknown_course')) { |
$output = "Error: $result\n"; |
$output = "Error: $result\n"; |
} else { |
} else { |
$output = &mt('Assigning').' '.$three.' in '.$url. |
$output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url. |
($start?', '.&mt('starting').' '.localtime($start):''). |
($start?', '.&mt('starting').' '.localtime($start):''). |
($end?', '.&mt('ending').' '.localtime($end):''). |
($end?', '.&mt('ending').' '.localtime($end):'').': '; |
': <b>'.$result.'</b><br />'. |
if ($context eq 'auto') { |
&mt('Add to classlist').': <b>ok</b><br />'; |
$output .= $result.$linefeed.&mt('Add to classlist').': ok'; |
|
} else { |
|
$output .= '<b>'.$result.'</b>'.$linefeed. |
|
&mt('Add to classlist').': <b>ok</b>'; |
|
} |
|
$output .= $linefeed; |
} |
} |
} else { |
} else { |
$output = &mt('Assigning').' '.$three.' in '.$url. |
$output = &mt('Assigning').' '.$three.' in '.$url. |
($start?', '.&mt('starting').' '.localtime($start):''). |
($start?', '.&mt('starting').' '.localtime($start):''). |
($end?', '.&mt('ending').' '.localtime($end):'').': <b>'. |
($end?', '.&mt('ending').' '.localtime($end):'').': '; |
&Apache::lonnet::assignrole( |
my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start); |
$udom,$uname,$url,$three,$end,$start). |
if ($context eq 'auto') { |
'</b><br />'; |
$output .= $result.$linefeed; |
|
} else { |
|
$output .= '<b>'.$result.'</b>'.$linefeed; |
|
} |
} |
} |
return $output; |
return $output; |
} |
} |
|
|
sub commit_studentrole { |
sub commit_studentrole { |
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; |
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
my $linefeed = '<br />'."\n"; |
my ($result,$linefeed); |
my $result; |
if ($context eq 'auto') { |
|
$linefeed = "\n"; |
|
} else { |
|
$linefeed = '<br />'."\n"; |
|
} |
if (defined($one) && defined($two)) { |
if (defined($one) && defined($two)) { |
my $cid=$one.'_'.$two; |
my $cid=$one.'_'.$two; |
my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid); |
my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid); |
Line 6524 sub commit_studentrole {
|
Line 6545 sub commit_studentrole {
|
############################################################ |
############################################################ |
|
|
sub construct_course { |
sub construct_course { |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_; |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_; |
my $outcome; |
my $outcome; |
|
my $linefeed = '<br />'."\n"; |
|
if ($context eq 'auto') { |
|
$linefeed = "\n"; |
|
} |
# |
# |
# Open course |
# Open course |
# |
# |
Line 6546 sub construct_course {
|
Line 6570 sub construct_course {
|
# Utils::Course. This needs to at least be output as a comment |
# Utils::Course. This needs to at least be output as a comment |
# if anyone ever decides to not show this, and Utils::Course::new |
# if anyone ever decides to not show this, and Utils::Course::new |
# will need to be suitably modified. |
# will need to be suitably modified. |
$outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid); |
$outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed; |
|
|
# |
# |
# Check if created correctly |
# Check if created correctly |
# |
# |
($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid); |
($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid); |
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
$outcome .= &mt('Created on').': '.$crsuhome.'<br>'; |
$outcome .= &mt('Created on').': '.$crsuhome.$linefeed; |
# |
# |
# Are we cloning? |
# Are we cloning? |
# |
# |
my $cloneid=''; |
my $cloneid=''; |
if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
|
my $can_clone = 0; |
$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid); |
my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid); |
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
|
my $clonemsg; |
if ($clonehome eq 'no_host') { |
if ($clonehome eq 'no_host') { |
$outcome .= |
$clonemsg = &mt('Attempting to clone non-existing [_1]',$crstype); |
'<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>'; |
if ($context eq 'auto') { |
|
$outcome .= $clonemsg; |
|
} else { |
|
$outcome .= '<font color="red">'.$clonemsg.'</font>'; |
|
} |
|
$outcome .= $linefeed; |
} else { |
} else { |
$outcome .= |
my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); |
'<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>'; |
if ($env{'request.role.domain'} eq $args->{'form.clonedomain'}) { |
|
$can_clone = 1; |
|
} else { |
|
my %clonehash = &Apache::lonnet::get('environment',['cloners'], |
|
$args->{'clonedomain'},$args->{'clonecourse'}); |
|
my @cloners = split(/,/,$clonehash{'cloners'}); |
|
my %roleshash = |
|
&Apache::lonnet::get_my_roles($args->{'ccuname'}, |
|
$args->{'ccdomain'},'userroles',['active'],['cc'], |
|
[$args->{'clonedomain'}]); |
|
if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) { |
|
$can_clone = 1; |
|
} else { |
|
$clonemsg = &mt('The new course was not cloned from an existing course because the course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'}); |
|
if ($context eq 'auto') { |
|
$outcome .= $clonemsg; |
|
} else { |
|
$outcome .= '<font color="red">'.$clonemsg.'</font>'; |
|
} |
|
$outcome .= $linefeed; |
|
} |
|
} |
|
} |
|
if ($can_clone) { |
|
$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome); |
|
if ($context eq 'auto') { |
|
$outcome = $clonemsg; |
|
} else { |
|
$outcome .= '<font color="green">'.$clonemsg.'</font>'; |
|
} |
|
$outcome .= $linefeed; |
my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
# Copy all files |
# Copy all files |
&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); |
&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); |
Line 6687 sub construct_course {
|
Line 6749 sub construct_course {
|
'dnhr' => 'does not have rights to access enrollment in these classes', |
'dnhr' => 'does not have rights to access enrollment in these classes', |
'adby' => 'as determined by the policies of your institution on access to official classlists' |
'adby' => 'as determined by the policies of your institution on access to official classlists' |
); |
); |
$outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n"; |
my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}. |
foreach (@badclasses) { |
' ('.$lt{'adby'}.')'; |
$outcome .= "<li>$_</li>\n"; |
if ($context eq 'auto') { |
} |
$outcome .= $badclass_msg.$linefeed; |
$outcome .= "</ul><br /><br /></font>\n"; |
$outcome .= '<font color="red">'.$badclass_msg.$linefeed.'<ul>'."\n"; |
|
foreach my $item (@badclasses) { |
|
if ($context eq 'auto') { |
|
$outcome .= " - $item\n"; |
|
} else { |
|
$outcome .= "<li>$item</li>\n"; |
|
} |
|
} |
|
if ($context eq 'auto') { |
|
$outcome .= $linefeed; |
|
} else { |
|
$outcome .= "</ul><br /><br /></font>\n"; |
|
} |
|
} |
} |
} |
if ($args->{'no_end_date'}) { |
if ($args->{'no_end_date'}) { |
$args->{'endaccess'} = 0; |
$args->{'endaccess'} = 0; |
Line 6707 sub construct_course {
|
Line 6782 sub construct_course {
|
$cenv{'internal.autharg'} = $args->{'autharg'}; |
$cenv{'internal.autharg'} = $args->{'autharg'}; |
if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) { |
if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) { |
if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') { |
if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') { |
$outcome .= '<font color="red" size="+1">'. |
my $krb_msg = &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student'); |
&mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>'; |
if ($context eq 'auto') { |
|
$outcome .= $krb_msg; |
|
} else { |
|
$outcome .= '<font color="red" size="+1">'.$krb_msg.'</font>'; |
|
} |
|
$outcome .= $linefeed; |
} |
} |
} |
} |
if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { |
if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { |
Line 6764 sub construct_course {
|
Line 6844 sub construct_course {
|
# By default, use standard grading |
# By default, use standard grading |
if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } |
if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } |
|
|
$outcome .= ('<br />'.&mt('Setting environment').': '. |
$outcome .= $linefeed.&mt('Setting environment').': '. |
&Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>'); |
&Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).$linefeed; |
# |
# |
# Open all assignments |
# Open all assignments |
# |
# |
Line 6775 sub construct_course {
|
Line 6855 sub construct_course {
|
$storeunder.'.type' => 'date_start'); |
$storeunder.'.type' => 'date_start'); |
|
|
$outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput |
$outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput |
('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>'; |
('resourcedata',\%storecontent,$$crsudom,$$crsunum).$linefeed; |
} |
} |
# |
# |
# Set first page |
# Set first page |
Line 6802 sub construct_course {
|
Line 6882 sub construct_course {
|
(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1); |
(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1); |
|
|
if ($errtext) { $fatal=2; } |
if ($errtext) { $fatal=2; } |
$outcome .= ($fatal?$errtext:'write ok').'<br />'; |
$outcome .= ($fatal?$errtext:'write ok').$linefeed; |
} |
} |
return $outcome; |
return $outcome; |
} |
} |