version 1.595, 2007/10/26 00:22:36
|
version 1.609, 2007/11/06 04:39:19
|
Line 367 sub selectstudent_link {
|
Line 367 sub selectstudent_link {
|
return ''; |
return ''; |
} |
} |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
'","'.$udomele.'","","1");'."'>".&mt('Select User')."</a>"; |
'","'.$udomele.'");'."'>".&mt('Select User')."</a>"; |
} |
} |
if ($env{'request.role'}=~/^(au|dc|su)/) { |
if ($env{'request.role'}=~/^(au|dc|su)/) { |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
Line 544 linked_select_forms returns a string con
|
Line 544 linked_select_forms returns a string con
|
and html for two <select> menus. The select menus will be linked in that |
and html for two <select> menus. The select menus will be linked in that |
changing the value of the first menu will result in new values being placed |
changing the value of the first menu will result in new values being placed |
in the second menu. The values in the select menu will appear in alphabetical |
in the second menu. The values in the select menu will appear in alphabetical |
order. |
order unless a defined order is provided. |
|
|
linked_select_forms takes the following ordered inputs: |
linked_select_forms takes the following ordered inputs: |
|
|
Line 562 linked_select_forms takes the following
|
Line 562 linked_select_forms takes the following
|
|
|
=item * $hashref, a reference to a hash containing the data for the menus. |
=item * $hashref, a reference to a hash containing the data for the menus. |
|
|
|
=item * $menuorder, the order of values in the first menu |
|
|
=back |
=back |
|
|
Below is an example of such a hash. Only the 'text', 'default', and |
Below is an example of such a hash. Only the 'text', 'default', and |
Line 578 $menu{$choice1}->{'select2'}.
|
Line 580 $menu{$choice1}->{'select2'}.
|
B2 => "Choice B2", |
B2 => "Choice B2", |
B3 => "Choice B3", |
B3 => "Choice B3", |
B4 => "Choice B4" |
B4 => "Choice B4" |
} |
}, |
|
order => ['B4','B3','B1','B2'], |
}, |
}, |
A2 => { text =>"Choice A2" , |
A2 => { text =>"Choice A2" , |
default => "C2", |
default => "C2", |
Line 586 $menu{$choice1}->{'select2'}.
|
Line 589 $menu{$choice1}->{'select2'}.
|
C1 => "Choice C1", |
C1 => "Choice C1", |
C2 => "Choice C2", |
C2 => "Choice C2", |
C3 => "Choice C3" |
C3 => "Choice C3" |
} |
}, |
|
order => ['C2','C1','C3'], |
}, |
}, |
A3 => { text =>"Choice A3" , |
A3 => { text =>"Choice A3" , |
default => "D6", |
default => "D6", |
Line 598 $menu{$choice1}->{'select2'}.
|
Line 602 $menu{$choice1}->{'select2'}.
|
D5 => "Choice D5", |
D5 => "Choice D5", |
D6 => "Choice D6", |
D6 => "Choice D6", |
D7 => "Choice D7" |
D7 => "Choice D7" |
} |
}, |
|
order => ['D4','D3','D2','D1','D7','D6','D5'], |
} |
} |
); |
); |
|
|
Line 610 sub linked_select_forms {
|
Line 615 sub linked_select_forms {
|
$firstdefault, |
$firstdefault, |
$firstselectname, |
$firstselectname, |
$secondselectname, |
$secondselectname, |
$hashref |
$hashref, |
|
$menuorder, |
) = @_; |
) = @_; |
my $second = "document.$formname.$secondselectname"; |
my $second = "document.$formname.$secondselectname"; |
my $first = "document.$formname.$firstselectname"; |
my $first = "document.$formname.$firstselectname"; |
Line 624 sub linked_select_forms {
|
Line 630 sub linked_select_forms {
|
$result.="select2data.d_$s1 = new Object();\n"; |
$result.="select2data.d_$s1 = new Object();\n"; |
$result.="select2data.d_$s1.def = new String('". |
$result.="select2data.d_$s1.def = new String('". |
$hashref->{$s1}->{'default'}."');\n"; |
$hashref->{$s1}->{'default'}."');\n"; |
$result.="select2data.d_$s1.values = new Array("; |
$result.="select2data.d_$s1.values = new Array("; |
my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } )); |
my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } )); |
|
if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') { |
|
@s2values = @{$hashref->{$s1}->{'order'}}; |
|
} |
$result.="\"@s2values\");\n"; |
$result.="\"@s2values\");\n"; |
$result.="select2data.d_$s1.texts = new Array("; |
$result.="select2data.d_$s1.texts = new Array("; |
my @s2texts; |
my @s2texts; |
Line 663 function select1_changed() {
|
Line 672 function select1_changed() {
|
END |
END |
# output the initial values for the selection lists |
# output the initial values for the selection lists |
$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n"; |
$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n"; |
foreach my $value (sort(keys(%$hashref))) { |
my @order = sort(keys(%{$hashref})); |
|
if (ref($menuorder) eq 'ARRAY') { |
|
@order = @{$menuorder}; |
|
} |
|
foreach my $value (@order) { |
$result.=" <option value=\"$value\" "; |
$result.=" <option value=\"$value\" "; |
$result.=" selected=\"selected\" " if ($value eq $firstdefault); |
$result.=" selected=\"selected\" " if ($value eq $firstdefault); |
$result.=">".&mt($hashref->{$value}->{'text'})."</option>\n"; |
$result.=">".&mt($hashref->{$value}->{'text'})."</option>\n"; |
Line 673 END
|
Line 686 END
|
$result .= $middletext; |
$result .= $middletext; |
$result .= "<select size=\"1\" name=\"$secondselectname\">\n"; |
$result .= "<select size=\"1\" name=\"$secondselectname\">\n"; |
my $seconddefault = $hashref->{$firstdefault}->{'default'}; |
my $seconddefault = $hashref->{$firstdefault}->{'default'}; |
foreach my $value (sort(keys(%select2))) { |
|
|
my @secondorder = sort(keys(%select2)); |
|
if (ref($hashref->{$firstdefault}->{'order'}) eq 'ARRAY') { |
|
@secondorder = @{$hashref->{$firstdefault}->{'order'}}; |
|
} |
|
foreach my $value (@secondorder) { |
$result.=" <option value=\"$value\" "; |
$result.=" <option value=\"$value\" "; |
$result.=" selected=\"selected\" " if ($value eq $seconddefault); |
$result.=" selected=\"selected\" " if ($value eq $seconddefault); |
$result.=">".&mt($select2{$value})."</option>\n"; |
$result.=">".&mt($select2{$value})."</option>\n"; |
Line 2049 sub authform_internal{
|
Line 2067 sub authform_internal{
|
$authtype = '<input type="radio" name="login" value="int" '.$intcheck. |
$authtype = '<input type="radio" name="login" value="int" '.$intcheck. |
' onchange="'.$jscall.'" onclick="'.$jscall.'" />'; |
' onchange="'.$jscall.'" onclick="'.$jscall.'" />'; |
} |
} |
$autharg = '<input type="text" size="10" name="intarg" value="'. |
$autharg = '<input type="password" size="10" name="intarg" value="'. |
$intarg.'" onchange="'.$jscall.'" />'; |
$intarg.'" onchange="'.$jscall.'" />'; |
$result = &mt |
$result = &mt |
('[_1] Internally authenticated (with initial password [_2])', |
('[_1] Internally authenticated (with initial password [_2])', |
Line 2151 sub authform_filesystem{
|
Line 2169 sub authform_filesystem{
|
('[_1] Filesystem Authenticated (with initial password [_2])', |
('[_1] Filesystem Authenticated (with initial password [_2])', |
'<label><input type="radio" name="login" value="fsys" '. |
'<label><input type="radio" name="login" value="fsys" '. |
$fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
$fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
'</label><input type="text" size="10" name="fsysarg" value="" '. |
'</label><input type="password" size="10" name="fsysarg" value="" '. |
'onchange="'.$jscall.'" />'); |
'onchange="'.$jscall.'" />'); |
return $result; |
return $result; |
} |
} |
Line 2948 sub get_previous_attempt {
|
Line 2966 sub get_previous_attempt {
|
$lasthash{$key}=$returnhash{$version.':'.$key}; |
$lasthash{$key}=$returnhash{$version.':'.$key}; |
} |
} |
} |
} |
$prevattempts='<table border="0" width="100%"><tr><td bgcolor="#777777">'; |
$prevattempts=&start_data_table().&start_data_table_header_row(); |
$prevattempts.='<table border="0" width="100%"><tr bgcolor="#e6ffff"><td>History</td>'; |
$prevattempts.='<th>'.&mt('History').'</th>'; |
foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
my ($ign,@parts) = split(/\./,$key); |
my ($ign,@parts) = split(/\./,$key); |
if ($#parts > 0) { |
if ($#parts > 0) { |
my $data=$parts[-1]; |
my $data=$parts[-1]; |
pop(@parts); |
pop(@parts); |
$prevattempts.='<td>Part '.join('.',@parts).'<br />'.$data.' </td>'; |
$prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.' </th>'; |
} else { |
} else { |
if ($#parts == 0) { |
if ($#parts == 0) { |
$prevattempts.='<th>'.$parts[0].'</th>'; |
$prevattempts.='<th>'.$parts[0].'</th>'; |
Line 2964 sub get_previous_attempt {
|
Line 2982 sub get_previous_attempt {
|
} |
} |
} |
} |
} |
} |
|
$prevattempts.=&end_data_table_header_row(); |
if ($getattempt eq '') { |
if ($getattempt eq '') { |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>'; |
$prevattempts.=&start_data_table_row(). |
|
'<td>'.&mt('Transaction [_1]',$version).'</td>'; |
foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
my $value = &format_previous_attempt_value($key, |
my $value = &format_previous_attempt_value($key, |
$returnhash{$version.':'.$key}); |
$returnhash{$version.':'.$key}); |
$prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'.$value.' </td>'; |
} |
} |
|
$prevattempts.=&end_data_table_row(); |
} |
} |
} |
} |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>'; |
$prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>'; |
foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
my $value = &format_previous_attempt_value($key,$lasthash{$key}); |
my $value = &format_previous_attempt_value($key,$lasthash{$key}); |
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
$prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'.$value.' </td>'; |
} |
} |
$prevattempts.='</tr></table></td></tr></table>'; |
$prevattempts.= &end_data_table_row().&end_data_table(); |
} else { |
} else { |
$prevattempts='Nothing submitted - no attempts.'; |
$prevattempts= |
|
&start_data_table().&start_data_table_row(). |
|
'<td>'.&mt('Nothing submitted - no attempts.').'</td>'. |
|
&end_data_table_row().&end_data_table(); |
} |
} |
} else { |
} else { |
$prevattempts='No data.'; |
$prevattempts= |
|
&start_data_table().&start_data_table_row(). |
|
'<td>'.&mt('No data.').'</td>'. |
|
&end_data_table_row().&end_data_table(); |
} |
} |
} |
} |
|
|
Line 4090 sub standard_css {
|
Line 4117 sub standard_css {
|
my $vlink = &designparm($function.'.vlink', $domain); |
my $vlink = &designparm($function.'.vlink', $domain); |
my $link = &designparm($function.'.link', $domain); |
my $link = &designparm($function.'.link', $domain); |
|
|
my $sans = 'Arial,Helvetica,sans-serif'; |
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $mono = 'monospace'; |
my $mono = 'monospace'; |
my $data_table_head = $tabbg; |
my $data_table_head = $tabbg; |
my $data_table_light = '#EEEEEE'; |
my $data_table_light = '#EEEEEE'; |
Line 4108 sub standard_css {
|
Line 4135 sub standard_css {
|
my $table_header = '#DDDDDD'; |
my $table_header = '#DDDDDD'; |
my $feedback_link_bg = '#BBBBBB'; |
my $feedback_link_bg = '#BBBBBB'; |
|
|
my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px' |
my $border = ($env{'browser.type'} eq 'explorer' || |
: '0px 3px 0px 4px'; |
$env{'browser.type'} eq 'safari' ) ? '0px 2px 0px 2px' |
|
: '0px 3px 0px 4px'; |
|
|
|
|
return <<END; |
return <<END; |
Line 4170 table.LC_pastsubmission {
|
Line 4198 table.LC_pastsubmission {
|
margin: 2px; |
margin: 2px; |
} |
} |
|
|
table#LC_top_nav, table#LC_menubuttons { |
table#LC_top_nav, table#LC_menubuttons,table#LC_nav_location { |
width: 100%; |
width: 100%; |
background: $pgbg; |
background: $pgbg; |
border: 2px; |
border: 2px; |
Line 4178 table#LC_top_nav, table#LC_menubuttons {
|
Line 4206 table#LC_top_nav, table#LC_menubuttons {
|
padding: 0px; |
padding: 0px; |
} |
} |
|
|
table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location, |
table#LC_title_bar, table.LC_breadcrumbs, |
table#LC_title_bar.LC_with_remote { |
table#LC_title_bar.LC_with_remote { |
width: 100%; |
width: 100%; |
border-color: $pgbg; |
border-color: $pgbg; |
Line 4803 table.LC_descriptive_input td.LC_descrip
|
Line 4831 table.LC_descriptive_input td.LC_descrip
|
text-align: right; |
text-align: right; |
font-weight: bold; |
font-weight: bold; |
} |
} |
table.LC_feedback_link { |
div.LC_feedback_link { |
background: $feedback_link_bg; |
background: white; |
|
width: 100%; |
} |
} |
span.LC_feedback_link { |
span.LC_feedback_link { |
background: $feedback_link_bg; |
background: $feedback_link_bg; |
font-size: larger; |
font-size: larger; |
|
} |
|
span.LC_message_link { |
|
background: $feedback_link_bg; |
|
font-size: larger; |
|
position: absolute; |
|
right: 1em; |
} |
} |
|
|
table.LC_prior_tries { |
table.LC_prior_tries { |
Line 4986 span.LC_role_level {
|
Line 5021 span.LC_role_level {
|
div.LC_left_float { |
div.LC_left_float { |
float: left; |
float: left; |
padding-right: 5%; |
padding-right: 5%; |
padding:bottom: 4px; |
padding-bottom: 4px; |
} |
} |
|
|
div.LC_clear_float_header { |
div.LC_clear_float_header { |
padding:bottom: 2px; |
padding-bottom: 2px; |
} |
} |
|
|
div.LC_clear_float_footer { |
div.LC_clear_float_footer { |
padding:top: 10px; |
padding-top: 10px; |
clear: both; |
clear: both; |
} |
} |
|
|
|
|
|
div.LC_grade_select_mode { |
|
float: left; |
|
font-family: $sans; |
|
} |
|
div.LC_grade_select_mode div div { |
|
margin: 5px; |
|
} |
|
div.LC_grade_select_mode_selector { |
|
margin: 5px; |
|
float: left; |
|
} |
|
div.LC_grade_select_mode_selector_header { |
|
font: bold medium $sans; |
|
} |
|
div.LC_grade_select_mode_type { |
|
clear: left; |
|
} |
|
|
|
div.LC_grade_show_user { |
|
margin-top: 20px; |
|
border: 1px solid black; |
|
} |
|
div.LC_grade_user_name { |
|
background: #DDDDEE; |
|
border-bottom: 1px solid black; |
|
font: bold large $sans; |
|
} |
|
div.LC_grade_show_user_odd_row div.LC_grade_user_name { |
|
background: #DDEEDD; |
|
} |
|
|
|
div.LC_grade_show_problem, |
|
div.LC_grade_submissions, |
|
div.LC_grade_message_center, |
|
div.LC_grade_info_links, |
|
div.LC_grade_assign { |
|
margin: 5px; |
|
width: 99%; |
|
background: #FFFFFF; |
|
} |
|
div.LC_grade_show_problem_header, |
|
div.LC_grade_submissions_header, |
|
div.LC_grade_message_center_header, |
|
div.LC_grade_assign_header { |
|
font: bold large $sans; |
|
} |
|
div.LC_grade_show_problem_problem, |
|
div.LC_grade_submissions_body, |
|
div.LC_grade_message_center_body, |
|
div.LC_grade_assign_body { |
|
border: 1px solid black; |
|
width: 99%; |
|
background: #FFFFFF; |
|
} |
|
span.LC_grade_check_note { |
|
font: normal medium $sans; |
|
display: inline; |
|
position: absolute; |
|
right: 1em; |
|
} |
|
|
|
|
|
div.LC_edit_problem_header { |
|
font: normal medium $sans; |
|
margin: 2px; |
|
} |
|
div.LC_edit_problem_header, |
|
div.LC_edit_problem_header div, |
|
div.LC_edit_problem_editxml_header, |
|
div.LC_edit_problem_editxml_header div { |
|
margin-top: 5px; |
|
} |
|
div.LC_edit_problem_header_edit_row { |
|
background: $tabbg; |
|
padding: 3px; |
|
margin-bottom: 5px; |
|
} |
|
div.LC_edit_problem_header_title { |
|
font: larger bold $sans; |
|
background: $tabbg; |
|
padding: 3px; |
|
} |
|
table.LC_edit_problem_header_title { |
|
font: larger bold $sans; |
|
width: 100%; |
|
border-color: $pgbg; |
|
border-style: solid; |
|
border-width: $border; |
|
|
|
background: $tabbg; |
|
border-collapse: collapse; |
|
padding: 0px |
|
} |
|
|
|
div.LC_edit_problem_discards { |
|
float: left; |
|
padding-bottom: 5px; |
|
} |
|
div.LC_edit_problem_saves { |
|
float: right; |
|
padding-bottom: 5px; |
|
} |
|
hr.LC_edit_problem_divide { |
|
clear: both; |
|
color: $tabbg; |
|
background-color: $tabbg; |
|
height: 3px; |
|
border: 0px; |
|
} |
END |
END |
} |
} |
|
|
Line 5670 previous, future, or all.
|
Line 5815 previous, future, or all.
|
5. reference to array of section restrictions (optional) |
5. reference to array of section restrictions (optional) |
6. reference to results object (hash of hashes). |
6. reference to results object (hash of hashes). |
7. reference to optional userdata hash |
7. reference to optional userdata hash |
Keys of top level hash are roles. |
8. reference to optional statushash |
|
Keys of top level results hash are roles. |
Keys of inner hashes are username:domain, with |
Keys of inner hashes are username:domain, with |
values set to access type. |
values set to access type. |
Optional userdata hash returns an array with arguments in the |
Optional userdata hash returns an array with arguments in the |
same order as loncoursedata::get_classlist() for student data. |
same order as loncoursedata::get_classlist() for student data. |
|
|
|
Optional statushash returns |
|
|
Entries for end, start, section and status are blank because |
Entries for end, start, section and status are blank because |
of the possibility of multiple values for non-student roles. |
of the possibility of multiple values for non-student roles. |
|
|
Line 5684 of the possibility of multiple values fo
|
Line 5832 of the possibility of multiple values fo
|
############################################### |
############################################### |
|
|
sub get_course_users { |
sub get_course_users { |
my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_; |
my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata,$statushash) = @_; |
my %idx = (); |
my %idx = (); |
my %seclists; |
my %seclists; |
|
|
Line 5701 sub get_course_users {
|
Line 5849 sub get_course_users {
|
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum); |
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum); |
my $now = time; |
my $now = time; |
foreach my $student (keys(%{$classlist})) { |
foreach my $student (keys(%{$classlist})) { |
|
my $status; |
my $match = 0; |
my $match = 0; |
my $secmatch = 0; |
my $secmatch = 0; |
my $section = $$classlist{$student}[$idx{section}]; |
my $section = $$classlist{$student}[$idx{section}]; |
|
my $status = $$classlist{$student}[$idx{status}]; |
if ($section eq '') { |
if ($section eq '') { |
$section = 'none'; |
$section = 'none'; |
} |
} |
Line 5723 sub get_course_users {
|
Line 5873 sub get_course_users {
|
next; |
next; |
} |
} |
} |
} |
push(@{$seclists{$student}},$section); |
|
if (defined($$types{'active'})) { |
if (defined($$types{'active'})) { |
if ($$classlist{$student}[$idx{status}] eq 'Active') { |
if ($$classlist{$student}[$idx{status}] eq 'Active') { |
push(@{$$users{st}{$student}},'active'); |
push(@{$$users{st}{$student}},'active'); |
Line 5731 sub get_course_users {
|
Line 5880 sub get_course_users {
|
} |
} |
} |
} |
if (defined($$types{'previous'})) { |
if (defined($$types{'previous'})) { |
if ($$classlist{$student}[$idx{end}] <= $now) { |
if ($$classlist{$student}[$idx{status}] eq 'Expired') { |
push(@{$$users{st}{$student}},'previous'); |
push(@{$$users{st}{$student}},'previous'); |
$match = 1; |
$match = 1; |
} |
} |
} |
} |
if (defined($$types{'future'})) { |
if (defined($$types{'future'})) { |
if (($$classlist{$student}[$idx{start}] > $now) && ($$classlist{$student}[$idx{end}] > $now) || ($$classlist{$student}[$idx{end}] == 0) || ($$classlist{$student}[$idx{end}] eq '')) { |
if ($$classlist{$student}[$idx{status}] eq 'Future') { |
push(@{$$users{st}{$student}},'future'); |
push(@{$$users{st}{$student}},'future'); |
$match = 1; |
$match = 1; |
} |
} |
} |
} |
if ($match && ref($userdata) eq 'HASH') { |
if ($match) { |
$$userdata{$student} = $$classlist{$student}; |
push(@{$seclists{$student}},$section); |
|
if (ref($userdata) eq 'HASH') { |
|
$$userdata{$student} = $$classlist{$student}; |
|
} |
|
if (ref($statushash) eq 'HASH') { |
|
$statushash->{$student}{'st'}{$section} = $status; |
|
} |
} |
} |
} |
} |
} |
} |
if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) { |
if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) { |
my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); |
my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); |
my $now = time; |
my $now = time; |
|
my %displaystatus = ( previous => 'Expired', |
|
active => 'Active', |
|
future => 'Future', |
|
); |
foreach my $person (sort(keys(%coursepersonnel))) { |
foreach my $person (sort(keys(%coursepersonnel))) { |
my $match = 0; |
my $match = 0; |
my $secmatch = 0; |
my $secmatch = 0; |
Line 5805 sub get_course_users {
|
Line 5964 sub get_course_users {
|
if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) { |
if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) { |
push(@{$seclists{$uname.':'.$udom}},$usec); |
push(@{$seclists{$uname.':'.$udom}},$usec); |
} |
} |
|
if (ref($statushash) eq 'HASH') { |
|
$statushash->{$uname.':'.$udom}{$role}{$usec} = $displaystatus{$status}; |
|
} |
} |
} |
} |
} |
} |
} |
Line 5814 sub get_course_users {
|
Line 5976 sub get_course_users {
|
my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum); |
my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum); |
if ( defined($csettings{'internal.courseowner'}) ) { |
if ( defined($csettings{'internal.courseowner'}) ) { |
my $owner = $csettings{'internal.courseowner'}; |
my $owner = $csettings{'internal.courseowner'}; |
if ($owner !~ /^[^:]+:[^:]+$/) { |
next if ($owner eq ''); |
$owner = $owner.':'.$cdom; |
my ($ownername,$ownerdom); |
|
if ($owner =~ /^([^:]+):([^:]+)$/) { |
|
$ownername = $1; |
|
$ownerdom = $2; |
|
} else { |
|
$ownername = $owner; |
|
$ownerdom = $cdom; |
|
$owner = $ownername.':'.$ownerdom; |
} |
} |
@{$$users{'ow'}{$owner}} = 'any'; |
@{$$users{'ow'}{$owner}} = 'any'; |
if (defined($userdata) && |
if (defined($userdata) && |
!exists($$userdata{$owner.':'.$cdom})) { |
!exists($$userdata{$owner})) { |
&get_user_info($cdom,$owner,\%idx,$userdata); |
&get_user_info($ownerdom,$ownername,\%idx,$userdata); |
if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) { |
if (!grep(/^none$/,@{$seclists{$owner}})) { |
push(@{$seclists{$owner.':'.$cdom}},'none'); |
push(@{$seclists{$owner}},'none'); |
|
} |
|
if (ref($statushash) eq 'HASH') { |
|
$statushash->{$owner}{'ow'}{'none'} = 'Any'; |
} |
} |
} |
} |
} |
} |
Line 5842 sub get_user_info {
|
Line 6014 sub get_user_info {
|
&plainname($uname,$udom,'lastname'); |
&plainname($uname,$udom,'lastname'); |
$$userdata{$uname.':'.$udom}[$$idx{uname}] = $uname; |
$$userdata{$uname.':'.$udom}[$$idx{uname}] = $uname; |
$$userdata{$uname.':'.$udom}[$$idx{udom}] = $udom; |
$$userdata{$uname.':'.$udom}[$$idx{udom}] = $udom; |
|
my %idhash = &Apache::lonnet::idrget($udom,($uname)); |
|
$$userdata{$uname.':'.$udom}[$$idx{id}] = $idhash{$uname}; |
return; |
return; |
} |
} |
|
|