version 1.596, 2007/10/26 00:23:45
|
version 1.622, 2007/12/08 00:03:32
|
Line 257 sub browser_and_searcher_javascript {
|
Line 257 sub browser_and_searcher_javascript {
|
} |
} |
url += 'catalogmode=interactive&'; |
url += 'catalogmode=interactive&'; |
url += 'mode=$mode&'; |
url += 'mode=$mode&'; |
|
url += 'inhibitmenu=yes&'; |
url += 'form=' + formname + '&'; |
url += 'form=' + formname + '&'; |
if (only != null) { |
if (only != null) { |
url += 'only=' + only + '&'; |
url += 'only=' + only + '&'; |
Line 367 sub selectstudent_link {
|
Line 368 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 545 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 563 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 581 $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 590 $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 603 $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 616 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 631 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 673 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 687 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 2068 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])', |
'<label>'.$authtype,'</label>'.$autharg); |
'<label>'.$authtype,'</label>'.$autharg); |
|
$result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>'; |
return $result; |
return $result; |
} |
} |
|
|
Line 2151 sub authform_filesystem{
|
Line 2171 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 4099 sub standard_css {
|
Line 4119 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 4117 sub standard_css {
|
Line 4137 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 4179 table.LC_pastsubmission {
|
Line 4200 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 4187 table#LC_top_nav, table#LC_menubuttons {
|
Line 4208 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 4378 table.LC_data_table, table.LC_mail_list
|
Line 4399 table.LC_data_table, table.LC_mail_list
|
border: 1px solid #000000; |
border: 1px solid #000000; |
border-collapse: separate; |
border-collapse: separate; |
border-spacing: 1px; |
border-spacing: 1px; |
|
background: $pgbg; |
} |
} |
.LC_data_table_dense { |
.LC_data_table_dense { |
font-size: small; |
font-size: small; |
Line 4400 table.LC_prior_tries tr th {
|
Line 4422 table.LC_prior_tries tr th {
|
background-color: $data_table_head; |
background-color: $data_table_head; |
font-size: smaller; |
font-size: smaller; |
} |
} |
table.LC_data_table tr td, |
table.LC_data_table tr.LC_odd_row > td, |
table.LC_aboutme_port tr td { |
table.LC_aboutme_port tr td { |
background-color: $data_table_light; |
background-color: $data_table_light; |
padding: 2px; |
padding: 2px; |
} |
} |
table.LC_data_table tr.LC_even_row td, |
table.LC_data_table tr.LC_even_row > td, |
table.LC_aboutme_port tr.LC_even_row td { |
table.LC_aboutme_port tr.LC_even_row td { |
background-color: $data_table_dark; |
background-color: $data_table_dark; |
} |
} |
Line 4812 table.LC_descriptive_input td.LC_descrip
|
Line 4834 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; |
clear: both; |
|
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 4995 span.LC_role_level {
|
Line 5025 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 { |
|
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; |
|
} |
|
|
|
table.LC_scantron_action { |
|
width: 100%; |
|
} |
|
table.LC_scantron_action tr th { |
|
font: normal bold $sans; |
|
} |
|
|
|
div.LC_edit_problem_header, |
|
div.LC_edit_problem_footer { |
|
font: normal medium $sans; |
|
margin: 2px; |
|
} |
|
div.LC_edit_problem_header, |
|
div.LC_edit_problem_header div, |
|
div.LC_edit_problem_footer, |
|
div.LC_edit_problem_footer 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 5374 sub simple_error_page {
|
Line 5522 sub simple_error_page {
|
} |
} |
|
|
{ |
{ |
my $row_count; |
my @row_count; |
sub start_data_table { |
sub start_data_table { |
my ($add_class) = @_; |
my ($add_class) = @_; |
my $css_class = (join(' ','LC_data_table',$add_class)); |
my $css_class = (join(' ','LC_data_table',$add_class)); |
undef($row_count); |
unshift(@row_count,0); |
return '<table class="'.$css_class.'">'."\n"; |
return '<table class="'.$css_class.'">'."\n"; |
} |
} |
|
|
sub end_data_table { |
sub end_data_table { |
undef($row_count); |
shift(@row_count); |
return '</table>'."\n";; |
return '</table>'."\n";; |
} |
} |
|
|
sub start_data_table_row { |
sub start_data_table_row { |
my ($add_class) = @_; |
my ($add_class) = @_; |
$row_count++; |
$row_count[0]++; |
my $css_class = ($row_count % 2)?'':'LC_even_row'; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
$css_class = (join(' ',$css_class,$add_class)); |
$css_class = (join(' ',$css_class,$add_class)); |
return '<tr class="'.$css_class.'">'."\n";; |
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
|
|
sub continue_data_table_row { |
sub continue_data_table_row { |
my ($add_class) = @_; |
my ($add_class) = @_; |
my $css_class = ($row_count % 2)?'':'LC_even_row'; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
$css_class = (join(' ',$css_class,$add_class)); |
$css_class = (join(' ',$css_class,$add_class)); |
return '<tr class="'.$css_class.'">'."\n";; |
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
Line 5407 sub simple_error_page {
|
Line 5555 sub simple_error_page {
|
} |
} |
|
|
sub start_data_table_empty_row { |
sub start_data_table_empty_row { |
$row_count++; |
$row_count[0]++; |
return '<tr class="LC_empty_row" >'."\n";; |
return '<tr class="LC_empty_row" >'."\n";; |
} |
} |
|
|
Line 5679 previous, future, or all.
|
Line 5827 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 5693 of the possibility of multiple values fo
|
Line 5844 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 5713 sub get_course_users {
|
Line 5864 sub get_course_users {
|
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 5732 sub get_course_users {
|
Line 5884 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 5740 sub get_course_users {
|
Line 5891 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 5814 sub get_course_users {
|
Line 5975 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 5823 sub get_course_users {
|
Line 5987 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 5851 sub get_user_info {
|
Line 6025 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; |
} |
} |
|
|
Line 5971 sub default_quota {
|
Line 6147 sub default_quota {
|
my ($udom,$inststatus) = @_; |
my ($udom,$inststatus) = @_; |
my ($defquota,$settingstatus); |
my ($defquota,$settingstatus); |
my %quotahash = &Apache::lonnet::get_dom('configuration', |
my %quotahash = &Apache::lonnet::get_dom('configuration', |
['quota'],$udom); |
['quotas'],$udom); |
if (ref($quotahash{'quota'}) eq 'HASH') { |
if (ref($quotahash{'quotas'}) eq 'HASH') { |
if ($inststatus ne '') { |
if ($inststatus ne '') { |
my @statuses = split(/:/,$inststatus); |
my @statuses = split(/:/,$inststatus); |
foreach my $item (@statuses) { |
foreach my $item (@statuses) { |
if ($quotahash{'quota'}{$item} ne '') { |
if ($quotahash{'quotas'}{$item} ne '') { |
if ($defquota eq '') { |
if ($defquota eq '') { |
$defquota = $quotahash{'quota'}{$item}; |
$defquota = $quotahash{'quotas'}{$item}; |
$settingstatus = $item; |
$settingstatus = $item; |
} elsif ($quotahash{'quota'}{$item} > $defquota) { |
} elsif ($quotahash{'quotas'}{$item} > $defquota) { |
$defquota = $quotahash{'quota'}{$item}; |
$defquota = $quotahash{'quotas'}{$item}; |
$settingstatus = $item; |
$settingstatus = $item; |
} |
} |
} |
} |
} |
} |
} |
} |
if ($defquota eq '') { |
if ($defquota eq '') { |
$defquota = $quotahash{'quota'}{'default'}; |
$defquota = $quotahash{'quotas'}{'default'}; |
$settingstatus = 'default'; |
$settingstatus = 'default'; |
} |
} |
} else { |
} else { |
Line 6263 END_BLOCK
|
Line 6439 END_BLOCK
|
return $output; |
return $output; |
} |
} |
|
|
sub username_rule_check { |
sub user_rule_check { |
my ($srch,$caller) = @_; |
my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_; |
my ($response,@curr_rules,%inst_results,$rulematch); |
my $response; |
my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($srch->{'srchdomain'}); |
if (ref($usershash) eq 'HASH') { |
if (ref($srch) eq 'HASH') { |
foreach my $user (keys(%{$usershash})) { |
(my $inst_response,%inst_results) = |
my ($uname,$udom) = split(/:/,$user); |
&Apache::lonnet::get_instuser($srch->{'srchdomain'}, |
next if ($udom eq '' || $uname eq ''); |
$srch->{'srchterm'}); |
my ($id,$newuser); |
my %domconfig = &Apache::lonnet::get_dom('configuration', |
if (ref($usershash->{$user}) eq 'HASH') { |
['usercreation'],$srch->{'srchdomain'}); |
$newuser = $usershash->{$user}->{'newuser'}; |
if (ref($domconfig{'usercreation'}) eq 'HASH') { |
$id = $usershash->{$user}->{'id'}; |
if (ref($domconfig{'usercreation'}{'username_rule'}) eq 'ARRAY') { |
} |
@curr_rules = @{$domconfig{'usercreation'}{'username_rule'}}; |
my $inst_response; |
} |
if (ref($checks) eq 'HASH') { |
} |
if (defined($checks->{'username'})) { |
if (@curr_rules > 0) { |
($inst_response,%{$inst_results->{$user}}) = |
my $domdesc = &Apache::lonnet::domain($srch->{'srchdomain'},'description'); |
&Apache::lonnet::get_instuser($udom,$uname); |
my $instuser_reqd; |
} elsif (defined($checks->{'id'})) { |
my %rule_check = &Apache::lonnet::inst_rulecheck($srch->{'srchdomain'},$srch->{'srchterm'},\@curr_rules); |
($inst_response,%{$inst_results->{$user}}) = |
foreach my $rule (@curr_rules) { |
&Apache::lonnet::get_instuser($udom,undef,$id); |
if ($rule_check{$rule}) { |
} |
$rulematch = $rule; |
} else { |
if ($inst_response eq 'ok') { |
($inst_response,%{$inst_results->{$user}}) = |
if (keys(%inst_results) == 0) { |
&Apache::lonnet::get_instuser($udom,$uname); |
if ($caller eq 'new') { |
return; |
$response = &mt('The username you chose matches the format of usernames defined for <span class="LC_cusr_emph">[_1]</span>, but the user does not exist in the institutional directory.',$domdesc).'<br />'.&mt("You must choose a username with a different format -- one that will not conflict with 'official' institutional usernames."); |
} |
} |
if (!$got_rules->{$udom}) { |
|
my %domconfig = &Apache::lonnet::get_dom('configuration', |
|
['usercreation'],$udom); |
|
if (ref($domconfig{'usercreation'}) eq 'HASH') { |
|
foreach my $item ('username','id') { |
|
if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') { |
|
$$curr_rules{$udom}{$item} = |
|
$domconfig{'usercreation'}{$item.'_rule'}; |
} |
} |
} |
} |
last; |
|
} |
} |
|
$got_rules->{$udom} = 1; |
} |
} |
if ($response) { |
foreach my $item (keys(%{$checks})) { |
if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) { |
if (ref($$curr_rules{$udom}) eq 'HASH') { |
if (@{$ruleorder} > 0) { |
if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') { |
$response .= '<br />'.&mt('Usernames with the following format(s) may <span class="LC_cusr_emph">only</span> be used for verified users at [_1]:',$domdesc).' <ul>'; |
if (@{$$curr_rules{$udom}{$item}} > 0) { |
foreach my $rule (@{$ruleorder}) { |
my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item}); |
if (grep(/^\Q$rule\E$/,@curr_rules)) { |
foreach my $rule (@{$$curr_rules{$udom}{$item}}) { |
if (ref($rules->{$rule}) eq 'HASH') { |
if ($rule_check{$rule}) { |
$response .= '<li>'.$rules->{$rule}{'name'}.': '. |
$$rulematch{$user}{$item} = $rule; |
$rules->{$rule}{'desc'}.'</li>'; |
if ($inst_response eq 'ok') { |
|
if (ref($inst_results) eq 'HASH') { |
|
if (ref($inst_results->{$user}) eq 'HASH') { |
|
if (keys(%{$inst_results->{$user}}) == 0) { |
|
$$alerts{$item}{$udom}{$uname} = 1; |
|
} |
|
} |
|
} |
|
} |
|
last; |
} |
} |
} |
} |
} |
} |
} |
} |
$response .= '</ul>'; |
|
} |
} |
} |
} |
} |
} |
} |
} |
return ($response,$rulematch,$rules,%inst_results); |
return; |
|
} |
|
|
|
sub user_rule_formats { |
|
my ($domain,$domdesc,$curr_rules,$check) = @_; |
|
my %text = ( |
|
'username' => 'Usernames', |
|
'id' => 'IDs', |
|
); |
|
my $output; |
|
my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($domain,$check); |
|
if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) { |
|
if (@{$ruleorder} > 0) { |
|
$output = '<br />'.&mt("$text{$check} with the following format(s) may <span class=\"LC_cusr_emph\">only</span> be used for verified users at [_1]:",$domdesc).' <ul>'; |
|
foreach my $rule (@{$ruleorder}) { |
|
if (ref($curr_rules) eq 'ARRAY') { |
|
if (grep(/^\Q$rule\E$/,@{$curr_rules})) { |
|
if (ref($rules->{$rule}) eq 'HASH') { |
|
$output .= '<li>'.$rules->{$rule}{'name'}.': '. |
|
$rules->{$rule}{'desc'}.'</li>'; |
|
} |
|
} |
|
} |
|
} |
|
$output .= '</ul>'; |
|
} |
|
} |
|
return $output; |
|
} |
|
|
|
sub instrule_disallow_msg { |
|
my ($checkitem,$domdesc,$count,$mode) = @_; |
|
my $response; |
|
my %text = ( |
|
item => 'username', |
|
items => 'usernames', |
|
match => 'matches', |
|
do => 'does', |
|
action => 'a username', |
|
one => 'one', |
|
); |
|
if ($count > 1) { |
|
$text{'item'} = 'usernames'; |
|
$text{'match'} ='match'; |
|
$text{'do'} = 'do'; |
|
$text{'action'} = 'usernames', |
|
$text{'one'} = 'ones'; |
|
} |
|
if ($checkitem eq 'id') { |
|
$text{'items'} = 'IDs'; |
|
$text{'item'} = 'ID'; |
|
$text{'action'} = 'an ID'; |
|
if ($count > 1) { |
|
$text{'item'} = 'IDs'; |
|
$text{'action'} = 'IDs'; |
|
} |
|
} |
|
$response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />'; |
|
if ($mode eq 'upload') { |
|
if ($checkitem eq 'username') { |
|
$response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}."); |
|
} elsif ($checkitem eq 'id') { |
|
$response .= &mt("Either upload a file which includes $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field."); |
|
} |
|
} else { |
|
if ($checkitem eq 'username') { |
|
$response .= &mt("You must choose $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}."); |
|
} elsif ($checkitem eq 'id') { |
|
$response .= &mt("You must either choose $text{'action'} with a different format -- $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank."); |
|
} |
|
} |
|
return $response; |
} |
} |
|
|
=pod |
=pod |
Line 7374 sub restore_settings {
|
Line 7636 sub restore_settings {
|
} |
} |
} |
} |
|
|
|
####################################################### |
|
####################################################### |
|
|
|
=pod |
|
|
|
=head1 Domain E-mail Routines |
|
|
|
=over 4 |
|
|
|
=item &build_recipient_list |
|
|
|
Build recipient lists for three types of e-mail: |
|
(a) Error Reports, (b) Package Updates, (c) Help requests, generated by |
|
lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively. |
|
|
|
Inputs: |
|
defmail (scalar - email address of default recipient), |
|
mailing type (scalar - errormail, packagesmail, or helpdeskmail), |
|
defdom (domain for which to retrieve configuration settings), |
|
origmail (scalar - email address of recipient from loncapa.conf, |
|
i.e., predates configuration by DC via domainprefs.pm |
|
|
|
Returns: comma separated list of addresses to which to send e-mail. |
|
|
|
=cut |
|
|
|
############################################################ |
|
############################################################ |
|
sub build_recipient_list { |
|
my ($defmail,$mailing,$defdom,$origmail) = @_; |
|
my @recipients; |
|
my $otheremails; |
|
my %domconfig = |
|
&Apache::lonnet::get_dom('configuration',['contacts'],$defdom); |
|
if (ref($domconfig{'contacts'}) eq 'HASH') { |
|
if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') { |
|
my @contacts = ('adminemail','supportemail'); |
|
foreach my $item (@contacts) { |
|
if ($domconfig{'contacts'}{$mailing}{$item}) { |
|
my $addr = $domconfig{'contacts'}{$item}; |
|
if (!grep(/^\Q$addr\E$/,@recipients)) { |
|
push(@recipients,$addr); |
|
} |
|
} |
|
$otheremails = $domconfig{'contacts'}{$mailing}{'others'}; |
|
} |
|
} |
|
} elsif ($origmail ne '') { |
|
push(@recipients,$origmail); |
|
} |
|
if ($defmail ne '') { |
|
push(@recipients,$defmail); |
|
} |
|
if ($otheremails) { |
|
my @others; |
|
if ($otheremails =~ /,/) { |
|
@others = split(/,/,$otheremails); |
|
} else { |
|
push(@others,$otheremails); |
|
} |
|
foreach my $addr (@others) { |
|
if (!grep(/^\Q$addr\E$/,@recipients)) { |
|
push(@recipients,$addr); |
|
} |
|
} |
|
} |
|
my $recipientlist = join(',',@recipients); |
|
return $recipientlist; |
|
} |
|
|
############################################################ |
############################################################ |
############################################################ |
############################################################ |
|
|