|
version 1.591, 2007/10/09 17:33:57
|
version 1.647, 2008/03/20 19:46:44
|
|
Line 78 my $readit;
|
Line 78 my $readit;
|
| ## Global Variables |
## Global Variables |
| ## |
## |
| |
|
| |
|
| |
# ----------------------------------------------- SSI with retries: |
| |
# |
| |
|
| |
=pod |
| |
|
| |
=head1 Server Side incliude with retries: |
| |
|
| |
=over 4 |
| |
|
| |
=item * ssi_with_retries(resource, retries form) |
| |
|
| |
Performs an ssi with some number of retries. Retries continue either |
| |
until the result is ok or until the retry count supplied by the |
| |
caller is exhausted. |
| |
|
| |
Inputs: |
| |
resource - Identifies the resource to insert. |
| |
retries - Count of the number of retries allowed. |
| |
form - Hash that identifies the rendering options. |
| |
|
| |
Returns: |
| |
content - The content of the response. If retries were exhausted this is empty. |
| |
response - The response from the last attempt (which may or may not have been successful. |
| |
|
| |
=cut |
| |
|
| |
sub ssi_with_retries { |
| |
my ($resource, $retries, %form) = @_; |
| |
|
| |
|
| |
my $ok = 0; # True if we got a good response. |
| |
my $content; |
| |
my $response; |
| |
|
| |
# Try to get the ssi done. within the retries count: |
| |
|
| |
do { |
| |
($content, $response) = &Apache::lonnet::ssi($resource, %form); |
| |
$ok = $response->is_success; |
| |
$retries--; |
| |
} while (!$ok && ($retries > 0)); |
| |
|
| |
if (!$ok) { |
| |
$content = ''; # On error return an empty content. |
| |
} |
| |
return ($content, $response); |
| |
|
| |
} |
| |
|
| |
|
| |
|
| # ----------------------------------------------- Filetypes/Languages/Copyright |
# ----------------------------------------------- Filetypes/Languages/Copyright |
| my %language; |
my %language; |
| my %supported_language; |
my %supported_language; |
|
Line 257 sub browser_and_searcher_javascript {
|
Line 309 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 318 sub storeresurl {
|
Line 371 sub storeresurl {
|
| unless ($resurl=~/^\/res/) { return 0; } |
unless ($resurl=~/^\/res/) { return 0; } |
| $resurl=~s/\/$//; |
$resurl=~s/\/$//; |
| &Apache::lonnet::put('environment',{'lastresurl' => $resurl}); |
&Apache::lonnet::put('environment',{'lastresurl' => $resurl}); |
| &Apache::lonnet::appenv('environment.lastresurl' => $resurl); |
&Apache::lonnet::appenv({'environment.lastresurl' => $resurl}); |
| return 1; |
return 1; |
| } |
} |
| |
|
|
Line 367 sub selectstudent_link {
|
Line 420 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 407 sub coursebrowser_javascript {
|
Line 460 sub coursebrowser_javascript {
|
| '&cdomelement='+udom+ |
'&cdomelement='+udom+ |
| '&cnameelement='+desc; |
'&cnameelement='+desc; |
| if (extra_element !=null && extra_element != '') { |
if (extra_element !=null && extra_element != '') { |
| if (formname == 'rolechoice') { |
if (formname == 'rolechoice' || formname == 'studentform') { |
| url += '&roleelement='+extra_element; |
url += '&roleelement='+extra_element; |
| if (domainfilter == null || domainfilter == '') { |
if (domainfilter == null || domainfilter == '') { |
| url += '&domainfilter='+extra_element; |
url += '&domainfilter='+extra_element; |
|
Line 471 sub setsec_javascript {
|
Line 524 sub setsec_javascript {
|
| my ($sec_element,$formname) = @_; |
my ($sec_element,$formname) = @_; |
| my $setsections = qq| |
my $setsections = qq| |
| function setSect(sectionlist) { |
function setSect(sectionlist) { |
| var sectionsArray = sectionlist.split(","); |
var sectionsArray = new Array(); |
| |
if ((sectionlist != '') && (typeof sectionlist != "undefined")) { |
| |
sectionsArray = sectionlist.split(","); |
| |
} |
| var numSections = sectionsArray.length; |
var numSections = sectionsArray.length; |
| document.$formname.$sec_element.length = 0; |
document.$formname.$sec_element.length = 0; |
| if (numSections == 0) { |
if (numSections == 0) { |
|
Line 544 linked_select_forms returns a string con
|
Line 600 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 618 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 636 $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 645 $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 658 $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 671 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 686 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 728 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 742 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 760 sub helpLatexCheatsheet {
|
Line 834 sub helpLatexCheatsheet {
|
| } |
} |
| return '<table><tr><td>'. |
return '<table><tr><td>'. |
| $addOther . |
$addOther . |
| &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', |
&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'), |
| undef,undef,600) |
undef,undef,600) |
| .'</td><td>'. |
.'</td><td>'. |
| &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', |
&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'), |
| undef,undef,600) |
undef,undef,600) |
| .'</td></tr></table>'; |
.'</td></tr></table>'; |
| } |
} |
|
Line 1593 input: 4 arguments (two required, two op
|
Line 1667 input: 4 arguments (two required, two op
|
| option, and selected by default. |
option, and selected by default. |
| $hide - Value of 'hide' causes hiding of the name of the server, |
$hide - Value of 'hide' causes hiding of the name of the server, |
| if 1 server found, or default, if 0 found. |
if 1 server found, or default, if 0 found. |
| output: returns 1 items: |
output: returns 2 items: |
| (a) form element which contains either: |
(a) form element which contains either: |
| (i) <select name="$name"> |
(i) <select name="$name"> |
| <option value="$hostid1">$hostid $servers{$hostid}</option> |
<option value="$hostid1">$hostid $servers{$hostid}</option> |
|
Line 1923 sub authform_kerberos {
|
Line 1997 sub authform_kerberos {
|
| if (defined($in{'curr_authtype'})) { |
if (defined($in{'curr_authtype'})) { |
| if ($in{'curr_authtype'} eq 'krb') { |
if ($in{'curr_authtype'} eq 'krb') { |
| $krbcheck = ' checked="on"'; |
$krbcheck = ' checked="on"'; |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifyuser') { |
| |
$krbcheck = ''; |
| |
} |
| |
} |
| if (defined($in{'curr_kerb_ver'})) { |
if (defined($in{'curr_kerb_ver'})) { |
| if ($in{'curr_krb_ver'} eq '5') { |
if ($in{'curr_krb_ver'} eq '5') { |
| $check5 = ' checked="on"'; |
$check5 = ' checked="on"'; |
|
Line 2020 sub authform_internal{
|
Line 2099 sub authform_internal{
|
| if ($in{'curr_authtype'} eq 'int') { |
if ($in{'curr_authtype'} eq 'int') { |
| if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
| $intcheck = 'checked="on" '; |
$intcheck = 'checked="on" '; |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifyuser') { |
| |
$intcheck = ''; |
| |
} |
| |
} |
| if (defined($in{'curr_autharg'})) { |
if (defined($in{'curr_autharg'})) { |
| $intarg = $in{'curr_autharg'}; |
$intarg = $in{'curr_autharg'}; |
| } |
} |
|
Line 2049 sub authform_internal{
|
Line 2133 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 2069 sub authform_local{
|
Line 2154 sub authform_local{
|
| if ($in{'curr_authtype'} eq 'loc') { |
if ($in{'curr_authtype'} eq 'loc') { |
| if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
| $loccheck = 'checked="on" '; |
$loccheck = 'checked="on" '; |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifyuser') { |
| |
$loccheck = ''; |
| |
} |
| |
} |
| if (defined($in{'curr_autharg'})) { |
if (defined($in{'curr_autharg'})) { |
| $locarg = $in{'curr_autharg'}; |
$locarg = $in{'curr_autharg'}; |
| } |
} |
|
Line 2118 sub authform_filesystem{
|
Line 2208 sub authform_filesystem{
|
| if ($in{'curr_authtype'} eq 'fsys') { |
if ($in{'curr_authtype'} eq 'fsys') { |
| if ($can_assign{'fsys'}) { |
if ($can_assign{'fsys'}) { |
| $fsyscheck = 'checked="on" '; |
$fsyscheck = 'checked="on" '; |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifyuser') { |
| |
$fsyscheck = ''; |
| |
} |
| |
} |
| } else { |
} else { |
| $result = &mt('Currently Filesystem Authenticated.'); |
$result = &mt('Currently Filesystem Authenticated.'); |
| return $result; |
return $result; |
|
Line 2151 sub authform_filesystem{
|
Line 2246 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 2199 sub get_assignable_auth {
|
Line 2294 sub get_assignable_auth {
|
| } |
} |
| |
|
| ############################################################### |
############################################################### |
| ## Get Authentication Defaults for Domain ## |
|
| ############################################################### |
|
| |
|
| =pod |
|
| |
|
| =head1 Domains and Authentication |
|
| |
|
| Returns default authentication type and an associated argument as |
|
| listed in file 'domain.tab'. |
|
| |
|
| =over 4 |
|
| |
|
| =item * get_auth_defaults |
|
| |
|
| get_auth_defaults($target_domain) returns the default authentication |
|
| type and an associated argument (initial password or a kerberos domain). |
|
| These values are stored in lonTabs/domain.tab |
|
| |
|
| ($def_auth, $def_arg) = &get_auth_defaults($target_domain); |
|
| |
|
| If target_domain is not found in domain.tab, returns nothing (''). |
|
| |
|
| =cut |
|
| |
|
| #------------------------------------------- |
|
| sub get_auth_defaults { |
|
| my $domain=shift; |
|
| return (&Apache::lonnet::domain($domain,'auth_def'), |
|
| &Apache::lonnet::domain($domain,'auth_arg_def')); |
|
| |
|
| } |
|
| ############################################################### |
|
| ## End Get Authentication Defaults for Domain ## |
|
| ############################################################### |
|
| |
|
| ############################################################### |
|
| ## Get Kerberos Defaults for Domain ## |
## Get Kerberos Defaults for Domain ## |
| ############################################################### |
############################################################### |
| ## |
## |
|
Line 2249 sub get_auth_defaults {
|
Line 2308 sub get_auth_defaults {
|
| =item * get_kerberos_defaults |
=item * get_kerberos_defaults |
| |
|
| get_kerberos_defaults($target_domain) returns the default kerberos |
get_kerberos_defaults($target_domain) returns the default kerberos |
| version and domain. If not found in domain.tabs, it defaults to |
version and domain. If not found, it defaults to version 4 and the |
| version 4 and the domain of the server. |
domain of the server. |
| |
|
| ($def_version, $def_krb_domain) = &get_kerberos_defaults($target_domain); |
($def_version, $def_krb_domain) = &get_kerberos_defaults($target_domain); |
| |
|
|
Line 2259 version 4 and the domain of the server.
|
Line 2318 version 4 and the domain of the server.
|
| #------------------------------------------- |
#------------------------------------------- |
| sub get_kerberos_defaults { |
sub get_kerberos_defaults { |
| my $domain=shift; |
my $domain=shift; |
| my ($krbdef,$krbdefdom) = |
my ($krbdef,$krbdefdom); |
| &Apache::loncommon::get_auth_defaults($domain); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
| unless ($krbdef =~/^krb/ && $krbdefdom) { |
if (($domdefaults{'auth_def'} =~/^krb(4|5)$/) && ($domdefaults{'auth_arg_def'} ne '')) { |
| |
$krbdef = $domdefaults{'auth_def'}; |
| |
$krbdefdom = $domdefaults{'auth_arg_def'}; |
| |
} else { |
| $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/; |
$ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/; |
| my $krbdefdom=$1; |
my $krbdefdom=$1; |
| $krbdefdom=~tr/a-z/A-Z/; |
$krbdefdom=~tr/a-z/A-Z/; |
|
Line 2840 sub preferred_languages {
|
Line 2902 sub preferred_languages {
|
| map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser)); |
map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser)); |
| push(@languages,@browser); |
push(@languages,@browser); |
| } |
} |
| if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) { |
|
| @languages=(@languages, |
foreach my $domtype ($env{'user.domain'},$env{'request.role.domain'}, |
| &Apache::lonnet::domain($env{'user.domain'}, |
$Apache::lonnet::perlvar{'lonDefDomain'}) { |
| 'lang_def')); |
if ($domtype ne '') { |
| } |
my %domdefs = &Apache::lonnet::get_domain_defaults($domtype); |
| if (&Apache::lonnet::domain($env{'request.role.domain'},'lang_def')) { |
if ($domdefs{'lang_def'} ne '') { |
| @languages=(@languages, |
push(@languages,$domdefs{'lang_def'}); |
| &Apache::lonnet::domain($env{'request.role.domain'}, |
} |
| 'lang_def')); |
} |
| } |
|
| if (&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'}, |
|
| 'lang_def')) { |
|
| @languages=(@languages, |
|
| &Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'}, |
|
| 'lang_def')); |
|
| } |
} |
| # turn "en-ca" into "en-ca,en" |
# turn "en-ca" into "en-ca,en" |
| my @genlanguages; |
my @genlanguages; |
|
Line 2948 sub get_previous_attempt {
|
Line 3004 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 3020 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 3160 sub pprmlink {
|
Line 3225 sub pprmlink {
|
| if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
| $symb=&escape($symb); |
$symb=&escape($symb); |
| if ($target) { $target="target=\"$target\""; } |
if ($target) { $target="target=\"$target\""; } |
| return '<a href="/adm/parmset?&command=set&'. |
return '<a href="/adm/parmset?command=set&'. |
| 'symb='.$symb.'&uname='.$uname. |
'symb='.$symb.'&uname='.$uname. |
| '&udom='.$udom.'" '.$target.'>'.$text.'</a>'; |
'&udom='.$udom.'" '.$target.'>'.$text.'</a>'; |
| } |
} |
| ############################################## |
############################################## |
| |
|
|
Line 3618 sub get_domainconf {
|
Line 3683 sub get_domainconf {
|
| |
|
| my %domconfig = &Apache::lonnet::get_dom('configuration', |
my %domconfig = &Apache::lonnet::get_dom('configuration', |
| ['login','rolecolors'],$udom); |
['login','rolecolors'],$udom); |
| my %designhash; |
my (%designhash,%legacy); |
| if (keys(%domconfig) > 0) { |
if (keys(%domconfig) > 0) { |
| if (ref($domconfig{'login'}) eq 'HASH') { |
if (ref($domconfig{'login'}) eq 'HASH') { |
| foreach my $key (keys(%{$domconfig{'login'}})) { |
if (keys(%{$domconfig{'login'}})) { |
| $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key}; |
foreach my $key (keys(%{$domconfig{'login'}})) { |
| |
$designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key}; |
| |
} |
| |
} else { |
| |
$legacy{'login'} = 1; |
| } |
} |
| |
} else { |
| |
$legacy{'login'} = 1; |
| } |
} |
| if (ref($domconfig{'rolecolors'}) eq 'HASH') { |
if (ref($domconfig{'rolecolors'}) eq 'HASH') { |
| foreach my $role (keys(%{$domconfig{'rolecolors'}})) { |
if (keys(%{$domconfig{'rolecolors'}})) { |
| if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') { |
foreach my $role (keys(%{$domconfig{'rolecolors'}})) { |
| foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) { |
if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') { |
| $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item}; |
foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) { |
| |
$designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item}; |
| |
} |
| } |
} |
| } |
} |
| |
} else { |
| |
$legacy{'rolecolors'} = 1; |
| } |
} |
| |
} else { |
| |
$legacy{'rolecolors'} = 1; |
| } |
} |
| } else { |
if (keys(%legacy) > 0) { |
| my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors'; |
my %legacyhash = &get_legacy_domconf($udom); |
| my $designfile = $designdir.'/'.$udom.'.tab'; |
foreach my $item (keys(%legacyhash)) { |
| if (-e $designfile) { |
if ($item =~ /^\Q$udom\E\.login/) { |
| if ( open (my $fh,"<$designfile") ) { |
if ($legacy{'login'}) { |
| while (my $line = <$fh>) { |
$designhash{$item} = $legacyhash{$item}; |
| next if ($line =~ /^\#/); |
} |
| chomp($line); |
} else { |
| my ($key,$val)=(split(/\=/,$line)); |
if ($legacy{'rolecolors'}) { |
| if ($val) { $designhash{$udom.'.'.$key}=$val; } |
$designhash{$item} = $legacyhash{$item}; |
| |
} |
| } |
} |
| close($fh); |
|
| } |
} |
| } |
} |
| if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') { |
} else { |
| $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif"; |
%designhash = &get_legacy_domconf($udom); |
| } |
|
| } |
} |
| &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash, |
&Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash, |
| $cachetime); |
$cachetime); |
| return %designhash; |
return %designhash; |
| } |
} |
| |
|
| |
sub get_legacy_domconf { |
| |
my ($udom) = @_; |
| |
my %legacyhash; |
| |
my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors'; |
| |
my $designfile = $designdir.'/'.$udom.'.tab'; |
| |
if (-e $designfile) { |
| |
if ( open (my $fh,"<$designfile") ) { |
| |
while (my $line = <$fh>) { |
| |
next if ($line =~ /^\#/); |
| |
chomp($line); |
| |
my ($key,$val)=(split(/\=/,$line)); |
| |
if ($val) { $legacyhash{$udom.'.'.$key}=$val; } |
| |
} |
| |
close($fh); |
| |
} |
| |
} |
| |
if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') { |
| |
$legacyhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif"; |
| |
} |
| |
return %legacyhash; |
| |
} |
| |
|
| =pod |
=pod |
| |
|
| =item * &domainlogo() |
=item * &domainlogo() |
|
Line 3706 Returns: value of designparamter $which
|
Line 3804 Returns: value of designparamter $which
|
| sub designparm { |
sub designparm { |
| my ($which,$domain)=@_; |
my ($which,$domain)=@_; |
| if ($env{'browser.blackwhite'} eq 'on') { |
if ($env{'browser.blackwhite'} eq 'on') { |
| if ($which=~/\.(font|alink|vlink|link)$/) { |
if ($which=~/\.(font|alink|vlink|link|textcol)$/) { |
| return '#000000'; |
return '#000000'; |
| } |
} |
| if ($which=~/\.(pgbg|sidebg)$/) { |
if ($which=~/\.(pgbg|sidebg|bgcol)$/) { |
| return '#FFFFFF'; |
return '#FFFFFF'; |
| } |
} |
| if ($which=~/\.tabbg$/) { |
if ($which=~/\.tabbg$/) { |
|
Line 3728 sub designparm {
|
Line 3826 sub designparm {
|
| $output = $defaultdesign{$which}; |
$output = $defaultdesign{$which}; |
| } |
} |
| if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
| ($which =~ /login\.(img|logo|domlogo)/)) { |
($which =~ /login\.(img|logo|domlogo|login)/)) { |
| if ($output =~ m{^/(adm|res)/}) { |
if ($output =~ m{^/(adm|res)/}) { |
| if ($output =~ m{^/res/}) { |
if ($output =~ m{^/res/}) { |
| my $local_name = &Apache::lonnet::filelocation('',$output); |
my $local_name = &Apache::lonnet::filelocation('',$output); |
|
Line 3896 ENDROLE
|
Line 3994 ENDROLE
|
| $dc_info = '('.$dc_info.')'; |
$dc_info = '('.$dc_info.')'; |
| } |
} |
| |
|
| if ($env{'environment.remote'} eq 'off') { |
if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) { |
| # No Remote |
# No Remote |
| if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
| $forcereg=1; |
$forcereg=1; |
|
Line 3919 ENDROLE
|
Line 4017 ENDROLE
|
| $lastitem = $thisdisfn; |
$lastitem = $thisdisfn; |
| } |
} |
| $titleinfo = |
$titleinfo = |
| &Apache::loncommon::help_open_menu('','',3,'Authoring'). |
&Apache::loncommon::help_open_menu('','',3,'Authoring') |
| '<b>Construction Space</b>: '. |
.'<b>'.&mt('Construction Space').'</b>: ' |
| '<form name="dirs" method="post" action="'.$formaction |
.'<form name="dirs" method="post" action="'.$formaction |
| .'" target="_top"><tt><b>' |
.'" target="_top"><tt><b>' |
| .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />" |
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />" |
| .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()') |
.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()') |
|
Line 4045 sub make_attr_string {
|
Line 4143 sub make_attr_string {
|
| |
|
| Returns a uniform footer for LON-CAPA web pages. |
Returns a uniform footer for LON-CAPA web pages. |
| |
|
| Inputs: none |
Inputs: 1 - optional reference to an args hash |
| |
If in the hash, key for noredirectlink has a value which evaluates to true, |
| |
a 'Continue' link is not displayed if the page contains an |
| |
internal redirect in the <head></head> section, |
| |
i.e., $env{'internal.head.redirect'} exists |
| |
|
| =cut |
=cut |
| |
|
| sub endbodytag { |
sub endbodytag { |
| |
my ($args) = @_; |
| my $endbodytag='</body>'; |
my $endbodytag='</body>'; |
| $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag; |
$endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag; |
| if ( exists( $env{'internal.head.redirect'} ) ) { |
if ( exists( $env{'internal.head.redirect'} ) ) { |
| $endbodytag= |
if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) { |
| "<br /><a href=\"$env{'internal.head.redirect'}\">". |
$endbodytag= |
| &mt('Continue').'</a>'. |
"<br /><a href=\"$env{'internal.head.redirect'}\">". |
| $endbodytag; |
&mt('Continue').'</a>'. |
| |
$endbodytag; |
| |
} |
| } |
} |
| return $endbodytag; |
return $endbodytag; |
| } |
} |
|
Line 4090 sub standard_css {
|
Line 4195 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 4213 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 4129 table.thinborder tr td {
|
Line 4235 table.thinborder tr td {
|
| |
|
| form, .inline { display: inline; } |
form, .inline { display: inline; } |
| .center { text-align: center; } |
.center { text-align: center; } |
| .LC_filename {font-family: $mono;} |
.LC_filename {font-family: $mono; white-space:pre;} |
| .LC_error { |
.LC_error { |
| color: red; |
color: red; |
| font-size: larger; |
font-size: larger; |
|
Line 4170 table.LC_pastsubmission {
|
Line 4276 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 4284 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 4318 td.LC_menubuttons_img {
|
Line 4424 td.LC_menubuttons_img {
|
| } |
} |
| .LC_new_mail { |
.LC_new_mail { |
| font-family: $sans; |
font-family: $sans; |
| |
background: $tabbg; |
| font-weight: bold; |
font-weight: bold; |
| } |
} |
| |
|
|
Line 4369 table.LC_data_table, table.LC_mail_list
|
Line 4476 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 4391 table.LC_prior_tries tr th {
|
Line 4499 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; |
| } |
} |
| table.LC_data_table tr.LC_data_table_highlight td { |
table.LC_data_table tr.LC_data_table_highlight td { |
| background-color: $data_table_darker; |
background-color: $data_table_darker; |
| } |
} |
| |
table.LC_data_table tr td.LC_leftcol_header { |
| |
background-color: $data_table_head; |
| |
font-weight: bold; |
| |
} |
| table.LC_data_table tr.LC_empty_row td, |
table.LC_data_table tr.LC_empty_row td, |
| table.LC_nested tr.LC_empty_row td { |
table.LC_nested tr.LC_empty_row td { |
| background-color: #FFFFFF; |
background-color: #FFFFFF; |
|
Line 4678 table.LC_pick_box td.LC_pick_box_title {
|
Line 4790 table.LC_pick_box td.LC_pick_box_title {
|
| width: 184px; |
width: 184px; |
| padding: 8px; |
padding: 8px; |
| } |
} |
| |
table.LC_pick_box td.LC_selfenroll_pick_box_title { |
| |
background: $tabbg; |
| |
font-weight: bold; |
| |
text-align: right; |
| |
width: 350px; |
| |
padding: 8px; |
| |
} |
| |
|
| table.LC_pick_box td.LC_pick_box_value { |
table.LC_pick_box td.LC_pick_box_value { |
| text-align: left; |
text-align: left; |
| padding: 8px; |
padding: 8px; |
|
Line 4803 table.LC_descriptive_input td.LC_descrip
|
Line 4923 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 4884 span.LC_cusr_emph {
|
Line 5012 span.LC_cusr_emph {
|
| font-style: italic; |
font-style: italic; |
| } |
} |
| |
|
| |
span.LC_cusr_subheading { |
| |
font-weight: normal; |
| |
font-size: 85%; |
| |
} |
| |
|
| table.LC_docs_documents { |
table.LC_docs_documents { |
| background: #BBBBBB; |
background: #BBBBBB; |
| border-width: 0px; |
border-width: 0px; |
|
Line 4979 table.LC_double_column tr td.LC_right_co
|
Line 5112 table.LC_double_column tr td.LC_right_co
|
| vertical-align: top; |
vertical-align: top; |
| } |
} |
| |
|
| |
span.LC_role_level { |
| |
font-weight: bold; |
| |
} |
| |
|
| 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 5087 Inputs: none
|
Line 5342 Inputs: none
|
| |
|
| sub font_settings { |
sub font_settings { |
| my $headerstring=''; |
my $headerstring=''; |
| if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) { |
if (!$env{'browser.mathml'} && $env{'browser.unicode'}) { |
| $headerstring.= |
|
| '<meta Content-Type="text/html; charset=x-mac-roman" />'; |
|
| } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) { |
|
| $headerstring.= |
$headerstring.= |
| '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; |
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; |
| } |
} |
|
Line 5110 Inputs: none
|
Line 5362 Inputs: none
|
| sub xml_begin { |
sub xml_begin { |
| my $output=''; |
my $output=''; |
| |
|
| &Apache::lonhtmlcommon::init_htmlareafields(); |
if ($env{'internal.start_page'}==1) { |
| |
&Apache::lonhtmlcommon::init_htmlareafields(); |
| |
} |
| |
|
| if ($env{'browser.mathml'}) { |
if ($env{'browser.mathml'}) { |
| $output='<?xml version="1.0"?>' |
$output='<?xml version="1.0"?>' |
|
Line 5287 sub end_page {
|
Line 5541 sub end_page {
|
| if ($args->{'frameset'}) { |
if ($args->{'frameset'}) { |
| $result .= '</frameset>'; |
$result .= '</frameset>'; |
| } else { |
} else { |
| $result .= &endbodytag(); |
$result .= &endbodytag($args); |
| } |
} |
| $result .= "\n</html>"; |
$result .= "\n</html>"; |
| |
|
|
Line 5359 sub simple_error_page {
|
Line 5613 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 5392 sub simple_error_page {
|
Line 5646 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 5664 previous, future, or all.
|
Line 5918 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 |
| |
9. flag if privileged users (except those set to unhide in |
| |
course settings) should be excluded |
| |
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 5678 of the possibility of multiple values fo
|
Line 5937 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,$hidepriv) = @_; |
| my %idx = (); |
my %idx = (); |
| my %seclists; |
my %seclists; |
| |
|
|
Line 5698 sub get_course_users {
|
Line 5957 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 5717 sub get_course_users {
|
Line 5977 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 5725 sub get_course_users {
|
Line 5984 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', |
| |
); |
| |
my %nothide; |
| |
if ($hidepriv) { |
| |
my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum); |
| |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
| |
if ($user !~ /:/) { |
| |
$nothide{join(':',split(/[\@]/,$user))}=1; |
| |
} else { |
| |
$nothide{$user} = 1; |
| |
} |
| |
} |
| |
} |
| 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 5777 sub get_course_users {
|
Line 6057 sub get_course_users {
|
| $usec = 'none'; |
$usec = 'none'; |
| } |
} |
| if ($uname ne '' && $udom ne '') { |
if ($uname ne '' && $udom ne '') { |
| |
if ($hidepriv) { |
| |
if ((&Apache::lonnet::privileged($uname,$udom)) && |
| |
(!$nothide{$uname.':'.$udom})) { |
| |
next; |
| |
} |
| |
} |
| if ($end > 0 && $end < $now) { |
if ($end > 0 && $end < $now) { |
| $status = 'previous'; |
$status = 'previous'; |
| } elsif ($start > $now) { |
} elsif ($start > $now) { |
|
Line 5799 sub get_course_users {
|
Line 6085 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 5808 sub get_course_users {
|
Line 6097 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 5836 sub get_user_info {
|
Line 6135 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 5956 sub default_quota {
|
Line 6257 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 6025 sub get_secgrprole_info {
|
Line 6326 sub get_secgrprole_info {
|
| } |
} |
| |
|
| sub user_picker { |
sub user_picker { |
| my ($dom,$srch,$forcenewuser,$caller) = @_; |
my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_; |
| my $currdom = $dom; |
my $currdom = $dom; |
| my %curr_selected = ( |
my %curr_selected = ( |
| srchin => 'dom', |
srchin => 'dom', |
| srchby => 'lastname', |
srchby => 'lastname', |
| ); |
); |
| my $srchterm; |
my $srchterm; |
| if (ref($srch) eq 'HASH') { |
if ((ref($srch) eq 'HASH') && ($env{'form.origform'} ne 'crtusername')) { |
| if ($srch->{'srchby'} ne '') { |
if ($srch->{'srchby'} ne '') { |
| $curr_selected{'srchby'} = $srch->{'srchby'}; |
$curr_selected{'srchby'} = $srch->{'srchby'}; |
| } |
} |
|
Line 6119 sub user_picker {
|
Line 6420 sub user_picker {
|
| if ($forcenewuser) { |
if ($forcenewuser) { |
| if (ref($srch) eq 'HASH') { |
if (ref($srch) eq 'HASH') { |
| if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) { |
if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) { |
| $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>'; |
if ($cancreate) { |
| |
$new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>'; |
| |
} else { |
| |
my $helplink = ' href="javascript:helpMenu('."'display'".')"'; |
| |
my %usertypetext = ( |
| |
official => 'institutional', |
| |
unofficial => 'non-institutional', |
| |
); |
| |
$new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />'; |
| |
} |
| } |
} |
| } |
} |
| |
|
|
Line 6248 END_BLOCK
|
Line 6558 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; |
| |
} |
| |
|
| |
sub personal_data_fieldtitles { |
| |
my %fieldtitles = &Apache::lonlocal::texthash ( |
| |
id => 'Student/Employee ID', |
| |
permanentemail => 'E-mail address', |
| |
lastname => 'Last Name', |
| |
firstname => 'First Name', |
| |
middlename => 'Middle Name', |
| |
generation => 'Generation', |
| |
gen => 'Generation', |
| |
); |
| |
return %fieldtitles; |
| |
} |
| |
|
| |
sub sorted_inst_types { |
| |
my ($dom) = @_; |
| |
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); |
| |
my $othertitle = &mt('All users'); |
| |
if ($env{'request.course.id'}) { |
| |
$othertitle = 'any'; |
| |
} |
| |
my @types; |
| |
if (ref($order) eq 'ARRAY') { |
| |
@types = @{$order}; |
| |
} |
| |
if (@types == 0) { |
| |
if (ref($usertypes) eq 'HASH') { |
| |
@types = sort(keys(%{$usertypes})); |
| |
} |
| |
} |
| |
if (keys(%{$usertypes}) > 0) { |
| |
$othertitle = &mt('Other users'); |
| |
if ($env{'request.course.id'}) { |
| |
$othertitle = 'other'; |
| |
} |
| |
} |
| |
return ($othertitle,$usertypes,\@types); |
| |
} |
| |
|
| |
sub get_institutional_codes { |
| |
my ($settings,$allcourses,$LC_code) = @_; |
| |
# Get complete list of course sections to update |
| |
my @currsections = (); |
| |
my @currxlists = (); |
| |
my $coursecode = $$settings{'internal.coursecode'}; |
| |
|
| |
if ($$settings{'internal.sectionnums'} ne '') { |
| |
@currsections = split(/,/,$$settings{'internal.sectionnums'}); |
| |
} |
| |
|
| |
if ($$settings{'internal.crosslistings'} ne '') { |
| |
@currxlists = split(/,/,$$settings{'internal.crosslistings'}); |
| |
} |
| |
|
| |
if (@currxlists > 0) { |
| |
foreach (@currxlists) { |
| |
if (m/^([^:]+):(\w*)$/) { |
| |
unless (grep/^$1$/,@{$allcourses}) { |
| |
push @{$allcourses},$1; |
| |
$$LC_code{$1} = $2; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
if (@currsections > 0) { |
| |
foreach (@currsections) { |
| |
if (m/^(\w+):(\w*)$/) { |
| |
my $sec = $coursecode.$1; |
| |
my $lc_sec = $2; |
| |
unless (grep/^$sec$/,@{$allcourses}) { |
| |
push @{$allcourses},$sec; |
| |
$$LC_code{$sec} = $lc_sec; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| } |
} |
| |
|
| =pod |
=pod |
|
Line 6672 sub csv_print_samples {
|
Line 7147 sub csv_print_samples {
|
| my ($r,$records) = @_; |
my ($r,$records) = @_; |
| my $samples = &get_samples($records,3); |
my $samples = &get_samples($records,3); |
| |
|
| $r->print(&mt('Samples').'<br /><table border="2"><tr>'); |
$r->print(&mt('Samples').'<br />'.&start_data_table(). |
| |
&start_data_table_header_row()); |
| foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { |
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { |
| $r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); } |
$r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); } |
| $r->print('</tr>'); |
$r->print(&end_data_table_header_row()); |
| foreach my $hash (@$samples) { |
foreach my $hash (@$samples) { |
| $r->print('<tr>'); |
$r->print(&start_data_table_row()); |
| foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { |
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { |
| $r->print('<td>'); |
$r->print('<td>'); |
| if (defined($$hash{$sample})) { $r->print($$hash{$sample}); } |
if (defined($$hash{$sample})) { $r->print($$hash{$sample}); } |
| $r->print('</td>'); |
$r->print('</td>'); |
| } |
} |
| $r->print('</tr>'); |
$r->print(&end_data_table_row()); |
| } |
} |
| $r->print('</tr></table><br />'."\n"); |
$r->print(&end_data_table().'<br />'."\n"); |
| } |
} |
| |
|
| ###################################################### |
###################################################### |
|
Line 6710 sub csv_print_select_table {
|
Line 7186 sub csv_print_select_table {
|
| my $i=0; |
my $i=0; |
| my $samples = &get_samples($records,1); |
my $samples = &get_samples($records,1); |
| $r->print(&mt('Associate columns with student attributes.')."\n". |
$r->print(&mt('Associate columns with student attributes.')."\n". |
| '<table border="2"><tr>'. |
&start_data_table().&start_data_table_header_row(). |
| '<th>'.&mt('Attribute').'</th>'. |
'<th>'.&mt('Attribute').'</th>'. |
| '<th>'.&mt('Column').'</th></tr>'."\n"); |
'<th>'.&mt('Column').'</th>'. |
| |
&end_data_table_header_row()."\n"); |
| foreach my $array_ref (@$d) { |
foreach my $array_ref (@$d) { |
| my ($value,$display,$defaultcol)=@{ $array_ref }; |
my ($value,$display,$defaultcol)=@{ $array_ref }; |
| $r->print('<tr><td>'.$display.'</td>'); |
$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>'); |
| |
|
| $r->print('<td><select name=f'.$i. |
$r->print('<td><select name=f'.$i. |
| ' onchange="javascript:flip(this.form,'.$i.');">'); |
' onchange="javascript:flip(this.form,'.$i.');">'); |
|
Line 6725 sub csv_print_select_table {
|
Line 7202 sub csv_print_select_table {
|
| ($sample eq $defaultcol ? ' selected="selected" ' : ''). |
($sample eq $defaultcol ? ' selected="selected" ' : ''). |
| '>Column '.($sample+1).'</option>'); |
'>Column '.($sample+1).'</option>'); |
| } |
} |
| $r->print('</select></td></tr>'."\n"); |
$r->print('</select></td>'.&end_data_table_row()."\n"); |
| $i++; |
$i++; |
| } |
} |
| |
$r->print(&end_data_table()); |
| $i--; |
$i--; |
| return $i; |
return $i; |
| } |
} |
|
Line 6754 sub csv_samples_select_table {
|
Line 7232 sub csv_samples_select_table {
|
| my $i=0; |
my $i=0; |
| # |
# |
| my $samples = &get_samples($records,3); |
my $samples = &get_samples($records,3); |
| $r->print('<table border=2><tr><th>'. |
$r->print(&start_data_table(). |
| &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>'); |
&start_data_table_header_row().'<th>'. |
| |
&mt('Field').'</th><th>'.&mt('Samples').'</th>'. |
| |
&end_data_table_header_row()); |
| |
|
| foreach my $key (sort(keys(%{ $samples->[0] }))) { |
foreach my $key (sort(keys(%{ $samples->[0] }))) { |
| $r->print('<tr><td><select name="f'.$i.'"'. |
$r->print(&start_data_table_row().'<td><select name="f'.$i.'"'. |
| ' onchange="javascript:flip(this.form,'.$i.');">'); |
' onchange="javascript:flip(this.form,'.$i.');">'); |
| foreach my $option (@$d) { |
foreach my $option (@$d) { |
| my ($value,$display,$defaultcol)=@{ $option }; |
my ($value,$display,$defaultcol)=@{ $option }; |
|
Line 6772 sub csv_samples_select_table {
|
Line 7252 sub csv_samples_select_table {
|
| $r->print($samples->[$line]{$key}."<br />\n"); |
$r->print($samples->[$line]{$key}."<br />\n"); |
| } |
} |
| } |
} |
| $r->print('</td></tr>'); |
$r->print('</td>'.&end_data_table_row()); |
| $i++; |
$i++; |
| } |
} |
| |
$r->print(&end_data_table()); |
| $i--; |
$i--; |
| return($i); |
return($i); |
| } |
} |
|
Line 7003 sub DrawBarGraph {
|
Line 7484 sub DrawBarGraph {
|
| $ValuesHash{$id.'.'.$key} = $value; |
$ValuesHash{$id.'.'.$key} = $value; |
| } |
} |
| # |
# |
| &Apache::lonnet::appenv(%ValuesHash); |
&Apache::lonnet::appenv(\%ValuesHash); |
| return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />'; |
return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />'; |
| } |
} |
| |
|
|
Line 7093 sub DrawXYGraph {
|
Line 7574 sub DrawXYGraph {
|
| $ValuesHash{$id.'.'.$key} = $value; |
$ValuesHash{$id.'.'.$key} = $value; |
| } |
} |
| # |
# |
| &Apache::lonnet::appenv(%ValuesHash); |
&Apache::lonnet::appenv(\%ValuesHash); |
| return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />'; |
return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />'; |
| } |
} |
| |
|
|
Line 7195 sub DrawXYYGraph {
|
Line 7676 sub DrawXYYGraph {
|
| $ValuesHash{$id.'.'.$key} = $value; |
$ValuesHash{$id.'.'.$key} = $value; |
| } |
} |
| # |
# |
| &Apache::lonnet::appenv(%ValuesHash); |
&Apache::lonnet::appenv(\%ValuesHash); |
| return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />'; |
return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />'; |
| } |
} |
| |
|
|
Line 7273 a hash ref describing the data to be sto
|
Line 7754 a hash ref describing the data to be sto
|
| |
|
| Returns: both routines return nothing |
Returns: both routines return nothing |
| |
|
| |
=back |
| |
|
| =cut |
=cut |
| |
|
| ####################################################### |
####################################################### |
|
Line 7325 sub store_settings {
|
Line 7808 sub store_settings {
|
| 'got error:'.$put_result); |
'got error:'.$put_result); |
| } |
} |
| # Make sure these settings stick around in this session, too |
# Make sure these settings stick around in this session, too |
| &Apache::lonnet::appenv(%AppHash); |
&Apache::lonnet::appenv(\%AppHash); |
| return; |
return; |
| } |
} |
| |
|
|
Line 7353 sub restore_settings {
|
Line 7836 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; |
| |
} |
| |
|
| ############################################################ |
############################################################ |
| ############################################################ |
############################################################ |
| |
|
| sub commit_customrole { |
sub commit_customrole { |
| my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_; |
my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_; |
| my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url. |
my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url. |
| ($start?', '.&mt('starting').' '.localtime($start):''). |
($start?', '.&mt('starting').' '.localtime($start):''). |
| ($end?', ending '.localtime($end):'').': <b>'. |
($end?', ending '.localtime($end):'').': <b>'. |
| &Apache::lonnet::assigncustomrole( |
&Apache::lonnet::assigncustomrole( |
|
Line 7379 sub commit_standardrole {
|
Line 7932 sub commit_standardrole {
|
| my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end, |
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end, |
| $one,$two,$sec,$context); |
$one,$two,$sec,$context); |
| if (($result =~ /^error/) || ($result eq 'not_in_class') || |
if (($result =~ /^error/) || ($result eq 'not_in_class') || |
| ($result eq 'unknown_course')) { |
($result eq 'unknown_course') || ($result eq 'refused')) { |
| $output = "Error: $result\n"; |
$output = $logmsg.' '.&mt('Error: ').$result."\n"; |
| } else { |
} else { |
| $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url. |
$output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url. |
| ($start?', '.&mt('starting').' '.localtime($start):''). |
($start?', '.&mt('starting').' '.localtime($start):''). |
|
Line 7409 sub commit_standardrole {
|
Line 7962 sub commit_standardrole {
|
| |
|
| sub commit_studentrole { |
sub commit_studentrole { |
| my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
| my ($result,$linefeed); |
my ($result,$linefeed,$oldsecurl,$newsecurl); |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $linefeed = "\n"; |
$linefeed = "\n"; |
| } else { |
} else { |
|
Line 7421 sub commit_studentrole {
|
Line 7974 sub commit_studentrole {
|
| my $secchange = 0; |
my $secchange = 0; |
| my $expire_role_result; |
my $expire_role_result; |
| my $modify_section_result; |
my $modify_section_result; |
| unless ($oldsec eq '-1') { |
if ($oldsec ne '-1') { |
| unless ($sec eq $oldsec) { |
if ($oldsec ne $sec) { |
| $secchange = 1; |
$secchange = 1; |
| |
my $now = time; |
| my $uurl='/'.$cid; |
my $uurl='/'.$cid; |
| $uurl=~s/\_/\//g; |
$uurl=~s/\_/\//g; |
| if ($oldsec) { |
if ($oldsec) { |
| $uurl.='/'.$oldsec; |
$uurl.='/'.$oldsec; |
| } |
} |
| $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time); |
$oldsecurl = $uurl; |
| |
$expire_role_result = |
| |
&Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now); |
| |
if ($env{'request.course.sec'} ne '') { |
| |
if ($expire_role_result eq 'refused') { |
| |
my @roles = ('st'); |
| |
my @statuses = ('previous'); |
| |
my @roledoms = ($one); |
| |
my $withsec = 1; |
| |
my %roleshash = |
| |
&Apache::lonnet::get_my_roles($uname,$udom,'userroles', |
| |
\@statuses,\@roles,\@roledoms,$withsec); |
| |
if (defined ($roleshash{$two.':'.$one.':st:'.$oldsec})) { |
| |
my ($oldstart,$oldend) = |
| |
split(':',$roleshash{$two.':'.$one.':st:'.$oldsec}); |
| |
if ($oldend > 0 && $oldend <= $now) { |
| |
$expire_role_result = 'ok'; |
| |
} |
| |
} |
| |
} |
| |
} |
| $result = $expire_role_result; |
$result = $expire_role_result; |
| } |
} |
| } |
} |
|
Line 7437 sub commit_studentrole {
|
Line 8011 sub commit_studentrole {
|
| $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid); |
$modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid); |
| if ($modify_section_result =~ /^ok/) { |
if ($modify_section_result =~ /^ok/) { |
| if ($secchange == 1) { |
if ($secchange == 1) { |
| $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed; |
if ($sec eq '') { |
| |
$$logmsg .= &mt('Section for [_1] switched from (possibly expired) old section: [_2] to student role without a section.',$uname,$oldsec).$linefeed; |
| |
} else { |
| |
$$logmsg .= &mt('Section for [_1] switched from (possibly expired) old section: [_2] to new section: [_3].',$uname,$oldsec,$sec).$linefeed; |
| |
} |
| } elsif ($oldsec eq '-1') { |
} elsif ($oldsec eq '-1') { |
| $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed; |
if ($sec eq '') { |
| |
$$logmsg .= &mt('New student role without a section for [_1] in course [_2].',$uname,$cid).$linefeed; |
| |
} else { |
| |
$$logmsg .= &mt('New student role for [_1] in section [_2] in course [_3].',$uname,$sec,$cid).$linefeed; |
| |
} |
| } else { |
} else { |
| $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed; |
if ($sec eq '') { |
| |
$$logmsg .= &mt('Student [_1] assigned to course [_2] without a section.',$uname,$cid).$linefeed; |
| |
} else { |
| |
$$logmsg .= &mt('Student [_1] assigned to section [_2] in course [_3].',$uname,$sec,$cid).$linefeed; |
| |
} |
| } |
} |
| } else { |
} else { |
| $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed; |
if ($secchange) { |
| |
$$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed; |
| |
} else { |
| |
$$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed; |
| |
} |
| } |
} |
| $result = $modify_section_result; |
$result = $modify_section_result; |
| } elsif ($secchange == 1) { |
} elsif ($secchange == 1) { |
| $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed; |
if ($oldsec eq '') { |
| |
$$logmsg .= &mt('Error when attempting to expire existing role without a section for [_1] in course [_3] -error: ',$uname,$cid).' '.$expire_role_result.$linefeed; |
| |
} else { |
| |
$$logmsg .= &mt('Error when attempting to expire existing role for [_1] in section [_2] in course [_3] -error: ',$uname,$oldsec,$cid).' '.$expire_role_result.$linefeed; |
| |
} |
| |
if ($expire_role_result eq 'refused') { |
| |
my $newsecurl = '/'.$cid; |
| |
$newsecurl =~ s/\_/\//g; |
| |
if ($sec ne '') { |
| |
$newsecurl.='/'.$sec; |
| |
} |
| |
if (&Apache::lonnet::allowed('cst',$newsecurl) && !(&Apache::lonnet::allowed('cst',$oldsecurl))) { |
| |
if ($sec eq '') { |
| |
$$logmsg .= &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments unaffiliated with any section.',$sec).$linefeed; |
| |
} else { |
| |
$$logmsg .= &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$sec).$linefeed; |
| |
} |
| |
} |
| |
} |
| } |
} |
| } else { |
} else { |
| $$logmsg .= "Incomplete course id defined. Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed"; |
$$logmsg .= &mt('Incomplete course id defined.').$linefeed.&mt('Addition of user [_1] from domain [_2] to course [_3], section [_4] not completed.',$uname,$udom,$one.'_'.$two,$sec).$linefeed; |
| $result = "error: incomplete course id\n"; |
$result = "error: incomplete course id\n"; |
| } |
} |
| return $result; |
return $result; |
|
Line 7563 sub construct_course {
|
Line 8171 sub construct_course {
|
| $outcome .= $clonemsg.$linefeed; |
$outcome .= $clonemsg.$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,$args->{'datemode'},$args->{'dateshift'}); |
| # Restore URL |
# Restore URL |
| $cenv{'url'}=$oldcenv{'url'}; |
$cenv{'url'}=$oldcenv{'url'}; |
| # Restore title |
# Restore title |
| $cenv{'description'}=$oldcenv{'description'}; |
$cenv{'description'}=$oldcenv{'description'}; |
| # restore grading mode |
|
| if (defined($oldcenv{'grading'})) { |
|
| $cenv{'grading'}=$oldcenv{'grading'}; |
|
| } |
|
| # Mark as cloned |
# Mark as cloned |
| $cenv{'clonedfrom'}=$cloneid; |
$cenv{'clonedfrom'}=$cloneid; |
| delete($cenv{'default_enrollment_start_date'}); |
# Need to clone grading mode |
| delete($cenv{'default_enrollment_end_date'}); |
my %newenv=&Apache::lonnet::get('environment',['grading'],$$crsudom,$$crsunum); |
| |
$cenv{'grading'}=$newenv{'grading'}; |
| |
# Do not clone these environment entries |
| |
&Apache::lonnet::del('environment', |
| |
['default_enrollment_start_date', |
| |
'default_enrollment_end_date', |
| |
'question.email', |
| |
'policy.email', |
| |
'comment.email', |
| |
'pch.users.denied', |
| |
'plc.users.denied'], |
| |
$$crsudom,$$crsunum); |
| } |
} |
| |
|
| # |
# |
|
Line 7603 sub construct_course {
|
Line 8218 sub construct_course {
|
| } else { |
} else { |
| $cenv{'internal.courseowner'} = $args->{'curruser'}; |
$cenv{'internal.courseowner'} = $args->{'curruser'}; |
| } |
} |
| |
|
| my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. |
my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. |
| if ($args->{'crssections'}) { |
if ($args->{'crssections'}) { |
| $cenv{'internal.sectionnums'} = ''; |
$cenv{'internal.sectionnums'} = ''; |
|
Line 7663 sub construct_course {
|
Line 8277 sub construct_course {
|
| } |
} |
| if ($args->{'notify_dc'}) { |
if ($args->{'notify_dc'}) { |
| if ($uname ne '') { |
if ($uname ne '') { |
| push(@notified,$uname.'@'.$udom); |
push(@notified,$uname.':'.$udom); |
| } |
} |
| } |
} |
| if (@notified > 0) { |
if (@notified > 0) { |
![[BACK]](/icons/back.gif){kind=icon}
Return to loncommon.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface