|
version 1.527, 2007/04/17 18:28:44
|
version 1.595, 2007/10/26 00:22:36
|
|
Line 240 Inputs: formname, elementname
|
Line 240 Inputs: formname, elementname
|
| |
|
| formname and elementname specify the name of the html form and the name |
formname and elementname specify the name of the html form and the name |
| of the element the selection from the search results will be placed in. |
of the element the selection from the search results will be placed in. |
| =back |
|
| =cut |
=cut |
| |
|
| sub browser_and_searcher_javascript { |
sub browser_and_searcher_javascript { |
|
Line 334 sub studentbrowser_javascript {
|
Line 334 sub studentbrowser_javascript {
|
| return (<<'ENDSTDBRW'); |
return (<<'ENDSTDBRW'); |
| <script type="text/javascript" language="Javascript" > |
<script type="text/javascript" language="Javascript" > |
| var stdeditbrowser; |
var stdeditbrowser; |
| function openstdbrowser(formname,uname,udom,roleflag) { |
function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) { |
| var url = '/adm/pickstudent?'; |
var url = '/adm/pickstudent?'; |
| var filter; |
var filter; |
| eval('filter=document.'+formname+'.'+uname+'.value;'); |
if (!ignorefilter) { |
| |
eval('filter=document.'+formname+'.'+uname+'.value;'); |
| |
} |
| if (filter != null) { |
if (filter != null) { |
| if (filter != '') { |
if (filter != '') { |
| url += 'filter='+filter+'&'; |
url += 'filter='+filter+'&'; |
|
Line 365 sub selectstudent_link {
|
Line 367 sub selectstudent_link {
|
| return ''; |
return ''; |
| } |
} |
| return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
| '","'.$udomele.'");'."'>".&mt('Select User')."</a>"; |
'","'.$udomele.'","","1");'."'>".&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 378 sub coursebrowser_javascript {
|
Line 380 sub coursebrowser_javascript {
|
| my ($domainfilter,$sec_element,$formname)=@_; |
my ($domainfilter,$sec_element,$formname)=@_; |
| my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); |
my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); |
| my $output = ' |
my $output = ' |
| <script type="text/javascript" language="Javascript" > |
<script type="text/javascript"> |
| var stdeditbrowser;'."\n"; |
var stdeditbrowser;'."\n"; |
| $output .= <<"ENDSTDBRW"; |
$output .= <<"ENDSTDBRW"; |
| function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
|
Line 405 sub coursebrowser_javascript {
|
Line 407 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 524 function uncheckAll(field) {
|
Line 526 function uncheckAll(field) {
|
| if (field.length > 0) { |
if (field.length > 0) { |
| for (i = 0; i < field.length; i++) { |
for (i = 0; i < field.length; i++) { |
| field[i].checked = false ; |
field[i].checked = false ; |
| } } else { |
} |
| |
} else { |
| field.checked = false ; |
field.checked = false ; |
| } |
} |
| } |
} |
|
Line 708 sub help_open_topic {
|
Line 711 sub help_open_topic {
|
| my ($topic, $text, $stayOnPage, $width, $height) = @_; |
my ($topic, $text, $stayOnPage, $width, $height) = @_; |
| $text = "" if (not defined $text); |
$text = "" if (not defined $text); |
| $stayOnPage = 0 if (not defined $stayOnPage); |
$stayOnPage = 0 if (not defined $stayOnPage); |
| if ($env{'browser.interface'} eq 'textual' || |
if ($env{'browser.interface'} eq 'textual') { |
| $env{'environment.remote'} eq 'off' ) { |
|
| $stayOnPage=1; |
$stayOnPage=1; |
| } |
} |
| $width = 350 if (not defined $width); |
$width = 350 if (not defined $width); |
|
Line 719 sub help_open_topic {
|
Line 721 sub help_open_topic {
|
| |
|
| my $template = ""; |
my $template = ""; |
| my $link; |
my $link; |
| |
|
| $topic=~s/\W/\_/g; |
$topic=~s/\W/\_/g; |
| |
|
| if (!$stayOnPage) |
if (!$stayOnPage) { |
| { |
|
| $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
| } |
} else { |
| else |
|
| { |
|
| $link = "/adm/help/${filename}.hlp"; |
$link = "/adm/help/${filename}.hlp"; |
| } |
} |
| |
|
| # Add the text |
# Add the text |
| if ($text ne "") |
if ($text ne "") { |
| { |
|
| $template .= |
$template .= |
| "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>". |
"<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>". |
| "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>"; |
"<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>"; |
| } |
} |
| |
|
| # Add the graphic |
# Add the graphic |
|
Line 801 ENDOUTPUT
|
Line 799 ENDOUTPUT
|
| # now just updates the help link and generates a blue icon |
# now just updates the help link and generates a blue icon |
| sub help_open_menu { |
sub help_open_menu { |
| my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) |
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) |
| = @_; |
= @_; |
| |
|
| $stayOnPage = 0 if (not defined $stayOnPage); |
$stayOnPage = 0 if (not defined $stayOnPage); |
| |
# only use pop-up help (stayOnPage == 0) |
| |
# if environment.remote is on (using remote control UI) |
| if ($env{'browser.interface'} eq 'textual' || |
if ($env{'browser.interface'} eq 'textual' || |
| $env{'environment.remote'} eq 'off' ) { |
$env{'environment.remote'} eq 'off' ) { |
| $stayOnPage=1; |
$stayOnPage=1; |
| } |
} |
| my $output; |
my $output; |
| if ($component_help) { |
if ($component_help) { |
|
Line 827 sub help_open_menu {
|
Line 826 sub help_open_menu {
|
| |
|
| sub top_nav_help { |
sub top_nav_help { |
| my ($text) = @_; |
my ($text) = @_; |
| |
|
| $text = &mt($text); |
$text = &mt($text); |
| |
my $stay_on_page = |
| my $stayOnPage = |
|
| ($env{'browser.interface'} eq 'textual' || |
($env{'browser.interface'} eq 'textual' || |
| $env{'environment.remote'} eq 'off' ); |
$env{'environment.remote'} eq 'off' ); |
| my $link= ($stayOnPage) ? "javascript:helpMenu('display')" |
my $link = ($stay_on_page) ? "javascript:helpMenu('display')" |
| : "javascript:helpMenu('open')"; |
: "javascript:helpMenu('open')"; |
| my $banner_link = &update_help_link(undef,undef,undef,undef,$stayOnPage); |
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page); |
| |
|
| my $title = &mt('Get help'); |
my $title = &mt('Get help'); |
| |
|
|
Line 863 sub help_menu_js {
|
Line 860 sub help_menu_js {
|
| 'js_ready' => 1, |
'js_ready' => 1, |
| 'add_entries' => { |
'add_entries' => { |
| 'border' => '0', |
'border' => '0', |
| 'rows' => "105,*",},}); |
'rows' => "110,*",},}); |
| my $end_page = |
my $end_page = |
| &Apache::loncommon::end_page({'frameset' => 1, |
&Apache::loncommon::end_page({'frameset' => 1, |
| 'js_ready' => 1,}); |
'js_ready' => 1,}); |
|
Line 1077 sub changable_area {
|
Line 1074 sub changable_area {
|
| |
|
| =pod |
=pod |
| |
|
| =back |
=item * viewport_geometry_js { |
| |
|
| |
Provides javascript object (Geometry) which can provide information about the viewport geometry for the client browser. |
| |
|
| |
=cut |
| |
|
| |
|
| |
sub viewport_geometry_js { |
| |
return <<"GEOMETRY"; |
| |
var Geometry = {}; |
| |
function init_geometry() { |
| |
if (Geometry.init) { return }; |
| |
Geometry.init=1; |
| |
if (window.innerHeight) { |
| |
Geometry.getViewportHeight = function() { return window.innerHeight; }; |
| |
Geometry.getViewportWidth = function() { return window.innerWidth; }; |
| |
Geometry.getHorizontalScroll = function() { return window.pageXOffset; }; |
| |
Geometry.getVerticalScroll = function() { return window.pageYOffset; }; |
| |
} |
| |
else if (document.documentElement && document.documentElement.clientHeight) { |
| |
Geometry.getViewportHeight = |
| |
function() { return document.documentElement.clientHeight; }; |
| |
Geometry.getViewportWidth = |
| |
function() { return document.documentElement.clientWidth; }; |
| |
|
| |
Geometry.getHorizontalScroll = |
| |
function() { return document.documentElement.scrollLeft; }; |
| |
Geometry.getVerticalScroll = |
| |
function() { return document.documentElement.scrollTop; }; |
| |
} |
| |
else if (document.body.clientHeight) { |
| |
Geometry.getViewportHeight = |
| |
function() { return document.body.clientHeight; }; |
| |
Geometry.getViewportWidth = |
| |
function() { return document.body.clientWidth; }; |
| |
Geometry.getHorizontalScroll = |
| |
function() { return document.body.scrollLeft; }; |
| |
Geometry.getVerticalScroll = |
| |
function() { return document.body.scrollTop; }; |
| |
} |
| |
} |
| |
|
| |
GEOMETRY |
| |
} |
| |
|
| |
=pod |
| |
|
| |
=item * viewport_size_js { |
| |
|
| |
Provides a javascript function to set values of two form elements - width and height (elements are passed in as arguments to the javascript function) to the dimensions of the user's browser window. |
| |
|
| |
=cut |
| |
|
| |
sub viewport_size_js { |
| |
my $geometry = &viewport_geometry_js(); |
| |
return <<"DIMS"; |
| |
|
| |
$geometry |
| |
|
| |
function getViewportDims(width,height) { |
| |
init_geometry(); |
| |
width.value = Geometry.getViewportWidth(); |
| |
height.value = Geometry.getViewportHeight(); |
| |
return; |
| |
} |
| |
|
| |
DIMS |
| |
} |
| |
|
| |
=pod |
| |
|
| |
=item * resize_textarea_js |
| |
|
| |
emits the needed javascript to resize a textarea to be as big as possible |
| |
|
| |
creates a function resize_textrea that takes two IDs first should be |
| |
the id of the element to resize, second should be the id of a div that |
| |
surrounds everything that comes after the textarea, this routine needs |
| |
to be attached to the <body> for the onload and onresize events. |
| |
|
| |
|
| |
=cut |
| |
|
| |
sub resize_textarea_js { |
| |
my $geometry = &viewport_geometry_js(); |
| |
return <<"RESIZE"; |
| |
<script type="text/javascript"> |
| |
$geometry |
| |
|
| |
function getX(element) { |
| |
var x = 0; |
| |
while (element) { |
| |
x += element.offsetLeft; |
| |
element = element.offsetParent; |
| |
} |
| |
return x; |
| |
} |
| |
function getY(element) { |
| |
var y = 0; |
| |
while (element) { |
| |
y += element.offsetTop; |
| |
element = element.offsetParent; |
| |
} |
| |
return y; |
| |
} |
| |
|
| |
|
| |
function resize_textarea(textarea_id,bottom_id) { |
| |
init_geometry(); |
| |
var textarea = document.getElementById(textarea_id); |
| |
//alert(textarea); |
| |
|
| |
var textarea_top = getY(textarea); |
| |
var textarea_height = textarea.offsetHeight; |
| |
var bottom = document.getElementById(bottom_id); |
| |
var bottom_top = getY(bottom); |
| |
var bottom_height = bottom.offsetHeight; |
| |
var window_height = Geometry.getViewportHeight(); |
| |
var fudge = 23; |
| |
var new_height = window_height-fudge-textarea_top-bottom_height; |
| |
if (new_height < 300) { |
| |
new_height = 300; |
| |
} |
| |
textarea.style.height=new_height+'px'; |
| |
} |
| |
</script> |
| |
RESIZE |
| |
|
| |
} |
| |
|
| |
=pod |
| |
|
| |
=back |
| |
|
| =head1 Excel and CSV file utility routines |
=head1 Excel and CSV file utility routines |
| |
|
| =over 4 |
=over 4 |
|
Line 1212 sub create_workbook {
|
Line 1341 sub create_workbook {
|
| |
|
| =item * create_text_file |
=item * create_text_file |
| |
|
| Create a file to write to and eventually make available to the usre. |
Create a file to write to and eventually make available to the user. |
| If file creation fails, outputs an error message on the request object and |
If file creation fails, outputs an error message on the request object and |
| return undefs. |
return undefs. |
| |
|
|
Line 1262 sub domain_select {
|
Line 1391 sub domain_select {
|
| } &Apache::lonnet::all_domains(); |
} &Apache::lonnet::all_domains(); |
| if ($multiple) { |
if ($multiple) { |
| $domains{''}=&mt('Any domain'); |
$domains{''}=&mt('Any domain'); |
| |
$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))]; |
| return &multiple_select_form($name,$value,4,\%domains); |
return &multiple_select_form($name,$value,4,\%domains); |
| } else { |
} else { |
| |
$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))]; |
| return &select_form($name,$value,%domains); |
return &select_form($name,$value,%domains); |
| } |
} |
| } |
} |
|
Line 1276 sub domain_select {
|
Line 1407 sub domain_select {
|
| |
|
| =over 4 |
=over 4 |
| |
|
| =cut |
|
| |
|
| =item * multiple_select_form($name,$value,$size,$hash,$order) |
=item * multiple_select_form($name,$value,$size,$hash,$order) |
| |
|
| Returns a string containing a <select> element int multiple mode |
Returns a string containing a <select> element int multiple mode |
|
Line 1415 sub select_level_form {
|
Line 1544 sub select_level_form {
|
| |
|
| =pod |
=pod |
| |
|
| =item * select_dom_form($defdom,$name,$includeempty) |
=item * select_dom_form($defdom,$name,$includeempty,$showdomdesc) |
| |
|
| Returns a string containing a <select name='$name' size='1'> form to |
Returns a string containing a <select name='$name' size='1'> form to |
| allow a user to select the domain to preform an operation in. |
allow a user to select the domain to preform an operation in. |
|
Line 1424 See loncreateuser.pm for an example invo
|
Line 1553 See loncreateuser.pm for an example invo
|
| If the $includeempty flag is set, it also includes an empty choice ("no domain |
If the $includeempty flag is set, it also includes an empty choice ("no domain |
| selected"); |
selected"); |
| |
|
| |
If the $showdomdesc flag is set, the domain name is followed by the domain description. |
| |
|
| =cut |
=cut |
| |
|
| #------------------------------------------- |
#------------------------------------------- |
| sub select_dom_form { |
sub select_dom_form { |
| my ($defdom,$name,$includeempty) = @_; |
my ($defdom,$name,$includeempty,$showdomdesc) = @_; |
| my @domains = sort(&Apache::lonnet::all_domains()); |
my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains()); |
| if ($includeempty) { @domains=('',@domains); } |
if ($includeempty) { @domains=('',@domains); } |
| my $selectdomain = "<select name=\"$name\" size=\"1\">\n"; |
my $selectdomain = "<select name=\"$name\" size=\"1\">\n"; |
| foreach my $dom (@domains) { |
foreach my $dom (@domains) { |
| $selectdomain.="<option value=\"$dom\" ". |
$selectdomain.="<option value=\"$dom\" ". |
| ($dom eq $defdom ? 'selected="selected" ' : ''). |
($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom; |
| ">$dom</option>\n"; |
if ($showdomdesc) { |
| |
if ($dom ne '') { |
| |
my $domdesc = &Apache::lonnet::domain($dom,'description'); |
| |
if ($domdesc ne '') { |
| |
$selectdomain .= ' ('.$domdesc.')'; |
| |
} |
| |
} |
| |
} |
| |
$selectdomain .= "</option>\n"; |
| } |
} |
| $selectdomain.="</select>"; |
$selectdomain.="</select>"; |
| return $selectdomain; |
return $selectdomain; |
|
Line 1445 sub select_dom_form {
|
Line 1584 sub select_dom_form {
|
| |
|
| =pod |
=pod |
| |
|
| =item * home_server_option_list($domain) |
=item * home_server_form_item($domain,$name,$defaultflag) |
| |
|
| |
input: 4 arguments (two required, two optional) - |
| |
$domain - domain of new user |
| |
$name - name of form element |
| |
$default - Value of 'default' causes a default item to be first |
| |
option, and selected by default. |
| |
$hide - Value of 'hide' causes hiding of the name of the server, |
| |
if 1 server found, or default, if 0 found. |
| |
output: returns 2 items: |
| |
(a) form element which contains either: |
| |
(i) <select name="$name"> |
| |
<option value="$hostid1">$hostid $servers{$hostid}</option> |
| |
<option value="$hostid2">$hostid $servers{$hostid}</option> |
| |
</select> |
| |
form item if there are multiple library servers in $domain, or |
| |
(ii) an <input type="hidden" name="$name" value="$hostid" /> form item |
| |
if there is only one library server in $domain. |
| |
|
| returns a string which contains an <option> list to be used in a |
(b) number of library servers found. |
| <select> form input. See loncreateuser.pm for an example. |
|
| |
See loncreateuser.pm for example of use. |
| |
|
| =cut |
=cut |
| |
|
| #------------------------------------------- |
#------------------------------------------- |
| sub home_server_option_list { |
sub home_server_form_item { |
| my $domain = shift; |
my ($domain,$name,$default,$hide) = @_; |
| my %servers = &Apache::lonnet::get_servers($domain,'library'); |
my %servers = &Apache::lonnet::get_servers($domain,'library'); |
| my $result = ''; |
my $result; |
| foreach my $hostid (sort(keys(%servers))) { |
my $numlib = keys(%servers); |
| $result.= |
if ($numlib > 1) { |
| '<option value="'.$hostid.'">'. |
$result .= '<select name="'.$name.'" />'."\n"; |
| $hostid.' '.$servers{$hostid}."</option>\n"; |
if ($default) { |
| |
$result .= '<option value="default" selected>'.&mt('default'). |
| |
'</option>'."\n"; |
| |
} |
| |
foreach my $hostid (sort(keys(%servers))) { |
| |
$result.= '<option value="'.$hostid.'">'. |
| |
$hostid.' '.$servers{$hostid}."</option>\n"; |
| |
} |
| |
$result .= '</select>'."\n"; |
| |
} elsif ($numlib == 1) { |
| |
my $hostid; |
| |
foreach my $item (keys(%servers)) { |
| |
$hostid = $item; |
| |
} |
| |
$result .= '<input type="hidden" name="'.$name.'" value="'. |
| |
$hostid.'" />'; |
| |
if (!$hide) { |
| |
$result .= $hostid.' '.$servers{$hostid}; |
| |
} |
| |
$result .= "\n"; |
| |
} elsif ($default) { |
| |
$result .= '<input type="hidden" name="'.$name. |
| |
'" value="default" />'; |
| |
if (!$hide) { |
| |
$result .= &mt('default'); |
| |
} |
| |
$result .= "\n"; |
| } |
} |
| return $result; |
return ($result,$numlib); |
| } |
} |
| |
|
| =pod |
=pod |
| |
|
| |
=back |
| |
|
| =cut |
=cut |
| |
|
| ############################################################### |
############################################################### |
|
Line 1613 END
|
Line 1798 END
|
| } |
} |
| |
|
| my $radioval = "'nochange'"; |
my $radioval = "'nochange'"; |
| if (exists($in{'curr_authtype'}) && |
if (defined($in{'curr_authtype'})) { |
| defined($in{'curr_authtype'}) && |
if ($in{'curr_authtype'} ne '') { |
| $in{'curr_authtype'} ne '') { |
$radioval = "'".$in{'curr_authtype'}."arg'"; |
| $radioval = "'$in{'curr_authtype'}arg'"; |
} |
| } |
} |
| my $argfield = 'null'; |
my $argfield = 'null'; |
| if ( grep/^mode$/,(keys %in) ) { |
if (defined($in{'mode'})) { |
| if ($in{'mode'} eq 'modifycourse') { |
if ($in{'mode'} eq 'modifycourse') { |
| if ( grep/^curr_authtype$/,(keys %in) ) { |
if (defined($in{'curr_autharg'})) { |
| $radioval = "'$in{'curr_authtype'}'"; |
if ($in{'curr_autharg'} ne '') { |
| } |
|
| if ( grep/^curr_autharg$/,(keys %in) ) { |
|
| unless ($in{'curr_autharg'} eq '') { |
|
| $argfield = "'$in{'curr_autharg'}'"; |
$argfield = "'$in{'curr_autharg'}'"; |
| } |
} |
| } |
} |
|
Line 1708 sub authform_nochange{
|
Line 1890 sub authform_nochange{
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| my $result = '<label>'.&mt('[_1] Do not change login data', |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| '<input type="radio" name="login" value="nochange" '. |
my $result; |
| 'checked="checked" onclick="'. |
if (keys(%can_assign) == 0) { |
| |
$result = &mt('Under you current role you are not permitted to change login settings for this user'); |
| |
} else { |
| |
$result = '<label>'.&mt('[_1] Do not change login data', |
| |
'<input type="radio" name="login" value="nochange" '. |
| |
'checked="checked" onclick="'. |
| "javascript:changed_radio('nochange',$in{'formname'});".'" />'). |
"javascript:changed_radio('nochange',$in{'formname'});".'" />'). |
| '</label>'; |
'</label>'; |
| |
} |
| return $result; |
return $result; |
| } |
} |
| |
|
| sub authform_kerberos{ |
sub authform_kerberos { |
| my %in = ( |
my %in = ( |
| formname => 'document.cu', |
formname => 'document.cu', |
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| kerb_def_auth => 'krb4', |
kerb_def_auth => 'krb4', |
| @_, |
@_, |
| ); |
); |
| my ($check4,$check5,$krbarg); |
my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype, |
| |
$autharg,$jscall); |
| |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| if ($in{'kerb_def_auth'} eq 'krb5') { |
if ($in{'kerb_def_auth'} eq 'krb5') { |
| $check5 = " checked=\"on\""; |
$check5 = ' checked="on"'; |
| } else { |
} else { |
| $check4 = " checked=\"on\""; |
$check4 = ' checked="on"'; |
| } |
} |
| $krbarg = $in{'kerb_def_dom'}; |
$krbarg = $in{'kerb_def_dom'}; |
| |
if (defined($in{'curr_authtype'})) { |
| my $krbcheck = ""; |
if ($in{'curr_authtype'} eq 'krb') { |
| if ( grep/^curr_authtype$/,(keys %in) ) { |
$krbcheck = ' checked="on"'; |
| if ($in{'curr_authtype'} =~ m/^krb/) { |
if (defined($in{'curr_kerb_ver'})) { |
| $krbcheck = " checked=\"on\""; |
if ($in{'curr_krb_ver'} eq '5') { |
| if ( grep/^curr_autharg$/,(keys %in) ) { |
$check5 = ' checked="on"'; |
| |
$check4 = ''; |
| |
} else { |
| |
$check4 = ' checked="on"'; |
| |
$check5 = ''; |
| |
} |
| |
} |
| |
if (defined($in{'curr_autharg'})) { |
| $krbarg = $in{'curr_autharg'}; |
$krbarg = $in{'curr_autharg'}; |
| } |
} |
| |
if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) { |
| |
if (defined($in{'curr_autharg'})) { |
| |
$result = |
| |
&mt('Currently Kerberos authenticated with domain [_1] Version [_2].', |
| |
$in{'curr_autharg'},$krbver); |
| |
} else { |
| |
$result = |
| |
&mt('Currently Kerberos authenticated, Version [_1].',$krbver); |
| |
} |
| |
return $result; |
| |
} |
| |
} |
| |
} else { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="krb">'; |
| } |
} |
| } |
} |
| |
if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) { |
| my $jscall = "javascript:changed_radio('krb',$in{'formname'});"; |
return; |
| my $result .= &mt |
} elsif ($authtype eq '') { |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifycourse') { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="krb">'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
$jscall = "javascript:changed_radio('krb',$in{'formname'});"; |
| |
if ($authtype eq '') { |
| |
$authtype = '<input type="radio" name="login" value="krb" '. |
| |
'onclick="'.$jscall.'" onchange="'.$jscall.'"'. |
| |
$krbcheck.' />'; |
| |
} |
| |
if (($can_assign{'krb4'} && $can_assign{'krb5'}) || |
| |
($can_assign{'krb4'} && !$can_assign{'krb5'} && |
| |
$in{'curr_authtype'} eq 'krb5') || |
| |
(!$can_assign{'krb4'} && $can_assign{'krb5'} && |
| |
$in{'curr_authtype'} eq 'krb4')) { |
| |
$result .= &mt |
| ('[_1] Kerberos authenticated with domain [_2] '. |
('[_1] Kerberos authenticated with domain [_2] '. |
| '[_3] Version 4 [_4] Version 5 [_5]', |
'[_3] Version 4 [_4] Version 5 [_5]', |
| '<label><input type="radio" name="login" value="krb" '. |
'<label>'.$authtype, |
| 'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />', |
|
| '</label><input type="text" size="10" name="krbarg" '. |
'</label><input type="text" size="10" name="krbarg" '. |
| 'value="'.$krbarg.'" '. |
'value="'.$krbarg.'" '. |
| 'onchange="'.$jscall.'" />', |
'onchange="'.$jscall.'" />', |
| '<label><input type="radio" name="krbver" value="4" '.$check4.' />', |
'<label><input type="radio" name="krbver" value="4" '.$check4.' />', |
| '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />', |
'</label><label><input type="radio" name="krbver" value="5" '.$check5.' />', |
| '</label>'); |
'</label>'); |
| |
} elsif ($can_assign{'krb4'}) { |
| |
$result .= &mt |
| |
('[_1] Kerberos authenticated with domain [_2] '. |
| |
'[_3] Version 4 [_4]', |
| |
'<label>'.$authtype, |
| |
'</label><input type="text" size="10" name="krbarg" '. |
| |
'value="'.$krbarg.'" '. |
| |
'onchange="'.$jscall.'" />', |
| |
'<label><input type="hidden" name="krbver" value="4" />', |
| |
'</label>'); |
| |
} elsif ($can_assign{'krb5'}) { |
| |
$result .= &mt |
| |
('[_1] Kerberos authenticated with domain [_2] '. |
| |
'[_3] Version 5 [_4]', |
| |
'<label>'.$authtype, |
| |
'</label><input type="text" size="10" name="krbarg" '. |
| |
'value="'.$krbarg.'" '. |
| |
'onchange="'.$jscall.'" />', |
| |
'<label><input type="hidden" name="krbver" value="5" />', |
| |
'</label>'); |
| |
} |
| return $result; |
return $result; |
| } |
} |
| |
|
| sub authform_internal{ |
sub authform_internal{ |
| my %args = ( |
my %in = ( |
| formname => 'document.cu', |
formname => 'document.cu', |
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| |
my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall); |
| my $intcheck = ""; |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| my $intarg = 'value=""'; |
if (defined($in{'curr_authtype'})) { |
| if ( grep/^curr_authtype$/,(keys %args) ) { |
if ($in{'curr_authtype'} eq 'int') { |
| if ($args{'curr_authtype'} eq 'int') { |
if ($can_assign{'int'}) { |
| $intcheck = " checked=\"on\""; |
$intcheck = 'checked="on" '; |
| if ( grep/^curr_autharg$/,(keys %args) ) { |
if (defined($in{'curr_autharg'})) { |
| $intarg = "value=\"$args{'curr_autharg'}\""; |
$intarg = $in{'curr_autharg'}; |
| |
} |
| |
} else { |
| |
$result = &mt('Currently internally authenticated.'); |
| |
return $result; |
| |
} |
| |
} |
| |
} else { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="int">'; |
| |
} |
| |
} |
| |
if (!$can_assign{'int'}) { |
| |
return; |
| |
} elsif ($authtype eq '') { |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifycourse') { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="int">'; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| |
$jscall = "javascript:changed_radio('int',$in{'formname'});"; |
| my $jscall = "javascript:changed_radio('int',$args{'formname'});"; |
if ($authtype eq '') { |
| my $result.=&mt |
$authtype = '<input type="radio" name="login" value="int" '.$intcheck. |
| |
' onchange="'.$jscall.'" onclick="'.$jscall.'" />'; |
| |
} |
| |
$autharg = '<input type="text" size="10" name="intarg" value="'. |
| |
$intarg.'" onchange="'.$jscall.'" />'; |
| |
$result = &mt |
| ('[_1] Internally authenticated (with initial password [_2])', |
('[_1] Internally authenticated (with initial password [_2])', |
| '<label><input type="radio" name="login" value="int" '.$intcheck. |
'<label>'.$authtype,'</label>'.$autharg); |
| ' onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
|
| '</label><input type="text" size="10" name="intarg" '.$intarg. |
|
| ' onchange="'.$jscall.'" />'); |
|
| return $result; |
return $result; |
| } |
} |
| |
|
|
Line 1790 sub authform_local{
|
Line 2063 sub authform_local{
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| |
my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall); |
| my $loccheck = ""; |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| my $locarg = 'value=""'; |
if (defined($in{'curr_authtype'})) { |
| if ( grep/^curr_authtype$/,(keys %in) ) { |
|
| if ($in{'curr_authtype'} eq 'loc') { |
if ($in{'curr_authtype'} eq 'loc') { |
| $loccheck = " checked=\"on\""; |
if ($can_assign{'loc'}) { |
| if ( grep/^curr_autharg$/,(keys %in) ) { |
$loccheck = 'checked="on" '; |
| $locarg = "value=\"$in{'curr_autharg'}\""; |
if (defined($in{'curr_autharg'})) { |
| |
$locarg = $in{'curr_autharg'}; |
| |
} |
| |
} else { |
| |
$result = &mt('Currently using local (institutional) authentication.'); |
| |
return $result; |
| } |
} |
| } |
} |
| |
} else { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="loc">'; |
| |
} |
| } |
} |
| |
if (!$can_assign{'loc'}) { |
| my $jscall = "javascript:changed_radio('loc',$in{'formname'});"; |
return; |
| my $result.=&mt('[_1] Local Authentication with argument [_2]', |
} elsif ($authtype eq '') { |
| '<label><input type="radio" name="login" value="loc" '.$loccheck. |
if (defined($in{'mode'})) { |
| ' onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
if ($in{'mode'} eq 'modifycourse') { |
| '</label><input type="text" size="10" name="locarg" '.$locarg. |
if ($authnum == 1) { |
| ' onchange="'.$jscall.'" />'); |
$authtype = '<input type="hidden" name="login" value="loc">'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
$jscall = "javascript:changed_radio('loc',$in{'formname'});"; |
| |
if ($authtype eq '') { |
| |
$authtype = '<input type="radio" name="login" value="loc" '. |
| |
$loccheck.' onchange="'.$jscall.'" onclick="'. |
| |
$jscall.'" />'; |
| |
} |
| |
$autharg = '<input type="text" size="10" name="locarg" value="'. |
| |
$locarg.'" onchange="'.$jscall.'" />'; |
| |
$result = &mt('[_1] Local Authentication with argument [_2]', |
| |
'<label>'.$authtype,'</label>'.$autharg); |
| return $result; |
return $result; |
| } |
} |
| |
|
|
Line 1817 sub authform_filesystem{
|
Line 2112 sub authform_filesystem{
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| my $jscall = "javascript:changed_radio('fsys',$in{'formname'});"; |
my ($fsyscheck,$result,$authtype,$autharg,$jscall); |
| my $result.= &mt |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| |
if (defined($in{'curr_authtype'})) { |
| |
if ($in{'curr_authtype'} eq 'fsys') { |
| |
if ($can_assign{'fsys'}) { |
| |
$fsyscheck = 'checked="on" '; |
| |
} else { |
| |
$result = &mt('Currently Filesystem Authenticated.'); |
| |
return $result; |
| |
} |
| |
} |
| |
} else { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="fsys">'; |
| |
} |
| |
} |
| |
if (!$can_assign{'fsys'}) { |
| |
return; |
| |
} elsif ($authtype eq '') { |
| |
if (defined($in{'mode'})) { |
| |
if ($in{'mode'} eq 'modifycourse') { |
| |
if ($authnum == 1) { |
| |
$authtype = '<input type="hidden" name="login" value="fsys">'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
$jscall = "javascript:changed_radio('fsys',$in{'formname'});"; |
| |
if ($authtype eq '') { |
| |
$authtype = '<input type="radio" name="login" value="fsys" '. |
| |
$fsyscheck.' onchange="'.$jscall.'" onclick="'. |
| |
$jscall.'" />'; |
| |
} |
| |
$autharg = '<input type="text" size="10" name="fsysarg" value=""'. |
| |
' onchange="'.$jscall.'" />'; |
| |
$result = &mt |
| ('[_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" '. |
| 'onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
$fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
| '</label><input type="text" size="10" name="fsysarg" value="" '. |
'</label><input type="text" size="10" name="fsysarg" value="" '. |
| 'onchange="'.$jscall.'" />'); |
'onchange="'.$jscall.'" />'); |
| return $result; |
return $result; |
| } |
} |
| |
|
| |
sub get_assignable_auth { |
| |
my ($dom) = @_; |
| |
if ($dom eq '') { |
| |
$dom = $env{'request.role.domain'}; |
| |
} |
| |
my %can_assign = ( |
| |
krb4 => 1, |
| |
krb5 => 1, |
| |
int => 1, |
| |
loc => 1, |
| |
); |
| |
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
| |
if (ref($domconfig{'usercreation'}) eq 'HASH') { |
| |
if (ref($domconfig{'usercreation'}{'authtypes'}) eq 'HASH') { |
| |
my $authhash = $domconfig{'usercreation'}{'authtypes'}; |
| |
my $context; |
| |
if ($env{'request.role'} =~ /^au/) { |
| |
$context = 'author'; |
| |
} elsif ($env{'request.role'} =~ /^dc/) { |
| |
$context = 'domain'; |
| |
} elsif ($env{'request.course.id'}) { |
| |
$context = 'course'; |
| |
} |
| |
if ($context) { |
| |
if (ref($authhash->{$context}) eq 'HASH') { |
| |
%can_assign = %{$authhash->{$context}}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $authnum = 0; |
| |
foreach my $key (keys(%can_assign)) { |
| |
if ($can_assign{$key}) { |
| |
$authnum ++; |
| |
} |
| |
} |
| |
if ($can_assign{'krb4'} && $can_assign{'krb5'}) { |
| |
$authnum --; |
| |
} |
| |
return ($authnum,%can_assign); |
| |
} |
| |
|
| ############################################################### |
############################################################### |
| ## Get Authentication Defaults for Domain ## |
## Get Authentication Defaults for Domain ## |
| ############################################################### |
############################################################### |
|
Line 1952 sub initialize_keywords {
|
Line 2323 sub initialize_keywords {
|
| # Remove special values from %Keywords. |
# Remove special values from %Keywords. |
| foreach my $value ('total.count','average.count') { |
foreach my $value ('total.count','average.count') { |
| delete($Keywords{$value}) if (exists($Keywords{$value})); |
delete($Keywords{$value}) if (exists($Keywords{$value})); |
| } |
} |
| return 1; |
return 1; |
| } |
} |
| |
|
|
Line 2052 if $first is set to 'lastname' then it r
|
Line 2423 if $first is set to 'lastname' then it r
|
| ############################################################### |
############################################################### |
| sub plainname { |
sub plainname { |
| my ($uname,$udom,$first)=@_; |
my ($uname,$udom,$first)=@_; |
| |
return if (!defined($uname) || !defined($udom)); |
| my %names=&getnames($uname,$udom); |
my %names=&getnames($uname,$udom); |
| my $name=&Apache::lonnet::format_name($names{'firstname'}, |
my $name=&Apache::lonnet::format_name($names{'firstname'}, |
| $names{'middlename'}, |
$names{'middlename'}, |
|
Line 2083 if the user does not
|
Line 2455 if the user does not
|
| |
|
| sub nickname { |
sub nickname { |
| my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
| |
return if (!defined($uname) || !defined($udom)); |
| my %names=&getnames($uname,$udom); |
my %names=&getnames($uname,$udom); |
| my $name=$names{'nickname'}; |
my $name=$names{'nickname'}; |
| if ($name) { |
if ($name) { |
|
Line 2098 sub nickname {
|
Line 2471 sub nickname {
|
| |
|
| sub getnames { |
sub getnames { |
| my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
| |
return if (!defined($uname) || !defined($udom)); |
| if ($udom eq 'public' && $uname eq 'public') { |
if ($udom eq 'public' && $uname eq 'public') { |
| return ('lastname' => &mt('Public')); |
return ('lastname' => &mt('Public')); |
| } |
} |
|
Line 2114 sub getnames {
|
Line 2488 sub getnames {
|
| } |
} |
| } |
} |
| |
|
| |
# -------------------------------------------------------------------- getemails |
| |
=pod |
| |
|
| |
=item * getemails($uname,$udom) |
| |
|
| |
Gets a user's email information and returns it as a hash with keys: |
| |
notification, critnotification, permanentemail |
| |
|
| |
For notification and critnotification, values are comma-separated lists |
| |
of e-mail address(es); for permanentemail, value is a single e-mail address. |
| |
|
| |
=cut |
| |
|
| sub getemails { |
sub getemails { |
| my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
| if ($udom eq 'public' && $uname eq 'public') { |
if ($udom eq 'public' && $uname eq 'public') { |
|
Line 2135 sub getemails {
|
Line 2522 sub getemails {
|
| } |
} |
| } |
} |
| |
|
| |
sub flush_email_cache { |
| |
my ($uname,$udom)=@_; |
| |
if (!$udom) { $udom =$env{'user.domain'}; } |
| |
if (!$uname) { $uname=$env{'user.name'}; } |
| |
return if ($udom eq 'public' && $uname eq 'public'); |
| |
my $id=$uname.':'.$udom; |
| |
&Apache::lonnet::devalidate_cache_new('emailscache',$id); |
| |
} |
| |
|
| # ------------------------------------------------------------------ Screenname |
# ------------------------------------------------------------------ Screenname |
| |
|
| =pod |
=pod |
|
Line 2208 sub track_student_link {
|
Line 2604 sub track_student_link {
|
| $target = ''; |
$target = ''; |
| } |
} |
| if ($start) { $link.='&start='.$start; } |
if ($start) { $link.='&start='.$start; } |
| |
$title = &mt($title); |
| |
$linktext = &mt($linktext); |
| return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
| &help_open_topic('View_recent_activity'); |
&help_open_topic('View_recent_activity'); |
| } |
} |
|
Line 2437 sub preferred_languages {
|
Line 2834 sub preferred_languages {
|
| @languages=(@languages, |
@languages=(@languages, |
| split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'})); |
split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'})); |
| } |
} |
| my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0]; |
my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'}; |
| if ($browser) { |
if ($browser) { |
| @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser)); |
my @browser = |
| |
map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser)); |
| |
push(@languages,@browser); |
| } |
} |
| if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) { |
if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) { |
| @languages=(@languages, |
@languages=(@languages, |
|
Line 2461 sub preferred_languages {
|
Line 2860 sub preferred_languages {
|
| my @genlanguages; |
my @genlanguages; |
| foreach my $lang (@languages) { |
foreach my $lang (@languages) { |
| unless ($lang=~/\w/) { next; } |
unless ($lang=~/\w/) { next; } |
| push (@genlanguages,$lang); |
push(@genlanguages,$lang); |
| if ($lang=~/(\-|\_)/) { |
if ($lang=~/(\-|\_)/) { |
| push(@genlanguages,(split(/(\-|\_)/,$lang))[0]); |
push(@genlanguages,(split(/(\-|\_)/,$lang))[0]); |
| } |
} |
| } |
} |
| |
#uniqueify the languages list |
| |
my %count; |
| |
@genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages; |
| return @genlanguages; |
return @genlanguages; |
| } |
} |
| |
|
| |
sub languages { |
| |
my ($possible_langs) = @_; |
| |
my @preferred_langs = &preferred_languages(); |
| |
if (!ref($possible_langs)) { |
| |
if( wantarray ) { |
| |
return @preferred_langs; |
| |
} else { |
| |
return $preferred_langs[0]; |
| |
} |
| |
} |
| |
my %possibilities = map { $_ => 1 } (@$possible_langs); |
| |
my @preferred_possibilities; |
| |
foreach my $preferred_lang (@preferred_langs) { |
| |
if (exists($possibilities{$preferred_lang})) { |
| |
push(@preferred_possibilities, $preferred_lang); |
| |
} |
| |
} |
| |
if( wantarray ) { |
| |
return @preferred_possibilities; |
| |
} |
| |
return $preferred_possibilities[0]; |
| |
} |
| |
|
| ############################################################### |
############################################################### |
| ## Student Answer Attempts ## |
## Student Answer Attempts ## |
| ############################################################### |
############################################################### |
|
Line 2543 sub get_previous_attempt {
|
Line 2968 sub get_previous_attempt {
|
| for ($version=1;$version<=$returnhash{'version'};$version++) { |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
| $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>'; |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>'; |
| foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
| my $value; |
my $value = &format_previous_attempt_value($key, |
| if ($key =~ /timestamp/) { |
$returnhash{$version.':'.$key}); |
| $value=scalar(localtime($returnhash{$version.':'.$key})); |
$prevattempts.='<td>'.$value.' </td>'; |
| } else { |
|
| $value=$returnhash{$version.':'.$key}; |
|
| } |
|
| $prevattempts.='<td>'.&unescape($value).' </td>'; |
|
| } |
} |
| } |
} |
| } |
} |
| $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>'; |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>'; |
| foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
| my $value; |
my $value = &format_previous_attempt_value($key,$lasthash{$key}); |
| if ($key =~ /timestamp/) { |
|
| $value=scalar(localtime($lasthash{$key})); |
|
| } else { |
|
| $value=$lasthash{$key}; |
|
| } |
|
| $value=&unescape($value); |
|
| if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
| $prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'.$value.' </td>'; |
| } |
} |
|
Line 2574 sub get_previous_attempt {
|
Line 2989 sub get_previous_attempt {
|
| } |
} |
| } |
} |
| |
|
| |
sub format_previous_attempt_value { |
| |
my ($key,$value) = @_; |
| |
if ($key =~ /timestamp/) { |
| |
$value = &Apache::lonlocal::locallocaltime($value); |
| |
} elsif (ref($value) eq 'ARRAY') { |
| |
$value = '('.join(', ', @{ $value }).')'; |
| |
} else { |
| |
$value = &unescape($value); |
| |
} |
| |
return $value; |
| |
} |
| |
|
| |
|
| sub relative_to_absolute { |
sub relative_to_absolute { |
| my ($url,$output)=@_; |
my ($url,$output)=@_; |
| my $parser=HTML::TokeParser->new(\$output); |
my $parser=HTML::TokeParser->new(\$output); |
|
Line 2661 sub get_student_answers {
|
Line 3089 sub get_student_answers {
|
| $moreenv{'grade_target'}='answer'; |
$moreenv{'grade_target'}='answer'; |
| %moreenv=(%form,%moreenv); |
%moreenv=(%form,%moreenv); |
| $feedurl = &Apache::lonnet::clutter($feedurl); |
$feedurl = &Apache::lonnet::clutter($feedurl); |
| &Apache::lonenc::check_encrypt(\$feedurl); |
|
| my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); |
my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); |
| return $userview; |
return $userview; |
| } |
} |
|
Line 2733 sub pprmlink {
|
Line 3160 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 2912 sub blockcheck {
|
Line 3339 sub blockcheck {
|
| } |
} |
| my $no_ownblock = 0; |
my $no_ownblock = 0; |
| my $no_userblock = 0; |
my $no_userblock = 0; |
| if ($otheruser) { |
if ($otheruser && $activity ne 'com') { |
| # Check if current user has 'evb' priv for this |
# Check if current user has 'evb' priv for this |
| if (defined($own_courses{$course})) { |
if (defined($own_courses{$course})) { |
| foreach my $sec (keys(%{$own_courses{$course}})) { |
foreach my $sec (keys(%{$own_courses{$course}})) { |
|
Line 3165 Returns: Determines which domain should
|
Line 3592 Returns: Determines which domain should
|
| ############################################### |
############################################### |
| sub determinedomain { |
sub determinedomain { |
| my $domain=shift; |
my $domain=shift; |
| if (! $domain) { |
if (! $domain) { |
| # Determine domain if we have not been given one |
# Determine domain if we have not been given one |
| $domain = $Apache::lonnet::perlvar{'lonDefDomain'}; |
$domain = $Apache::lonnet::perlvar{'lonDefDomain'}; |
| if ($env{'user.domain'}) { $domain=$env{'user.domain'}; } |
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; } |
|
Line 3248 sub domainlogo {
|
Line 3675 sub domainlogo {
|
| # See if there is a logo |
# See if there is a logo |
| if ($designhash{$domain.'.login.domlogo'} ne '') { |
if ($designhash{$domain.'.login.domlogo'} ne '') { |
| my $imgsrc = $designhash{$domain.'.login.domlogo'}; |
my $imgsrc = $designhash{$domain.'.login.domlogo'}; |
| if ($imgsrc =~ /^\/(adm|res)/) { |
if ($imgsrc =~ m{^/(adm|res)/}) { |
| $imgsrc = &lonhttpdurl($imgsrc); |
if ($imgsrc =~ m{^/res/}) { |
| |
my $local_name = &Apache::lonnet::filelocation('',$imgsrc); |
| |
&Apache::lonnet::repcopy($local_name); |
| |
} |
| |
$imgsrc = &lonhttpdurl($imgsrc); |
| } |
} |
| return '<img src="'.$imgsrc.'" alt="'.$domain.'" />'; |
return '<img src="'.$imgsrc.'" alt="'.$domain.'" />'; |
| } elsif (defined(&Apache::lonnet::domain($domain,'description'))) { |
} elsif (defined(&Apache::lonnet::domain($domain,'description'))) { |
|
Line 3298 sub designparm {
|
Line 3729 sub designparm {
|
| } |
} |
| if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
| ($which =~ /login\.(img|logo|domlogo)/)) { |
($which =~ /login\.(img|logo|domlogo)/)) { |
| if ($output =~ /^\/(adm|res)\//) { |
if ($output =~ m{^/(adm|res)/}) { |
| |
if ($output =~ m{^/res/}) { |
| |
my $local_name = &Apache::lonnet::filelocation('',$output); |
| |
&Apache::lonnet::repcopy($local_name); |
| |
} |
| $output = &lonhttpdurl($output); |
$output = &lonhttpdurl($output); |
| } |
} |
| } |
} |
|
Line 3312 sub designparm {
|
Line 3747 sub designparm {
|
| |
|
| =back |
=back |
| |
|
| =head1 HTTP Helpers |
=head1 HTML Helpers |
| |
|
| =over 4 |
=over 4 |
| |
|
|
Line 3353 Inputs:
|
Line 3788 Inputs:
|
| |
|
| =item * $args, optional argument valid values are |
=item * $args, optional argument valid values are |
| no_auto_mt_title -> prevents &mt()ing the title arg |
no_auto_mt_title -> prevents &mt()ing the title arg |
| |
inherit_jsmath -> when creating popup window in a page, |
| |
should it have jsmath forced on by the |
| |
current page |
| |
|
| =back |
=back |
| |
|
|
Line 3375 sub bodytag {
|
Line 3813 sub bodytag {
|
| my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain); |
my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain); |
| |
|
| my %design = ( 'style' => 'margin-top: 0px', |
my %design = ( 'style' => 'margin-top: 0px', |
| 'bgcolor' => '#ffffff', |
'bgcolor' => $pgbg, |
| 'text' => $font, |
'text' => $font, |
| 'alink' => &designparm($function.'.alink',$domain), |
'alink' => &designparm($function.'.alink',$domain), |
| 'vlink' => &designparm($function.'.vlink',$domain), |
'vlink' => &designparm($function.'.vlink',$domain), |
|
Line 3401 sub bodytag {
|
Line 3839 sub bodytag {
|
| if (!$realm) { $realm=' '; } |
if (!$realm) { $realm=' '; } |
| # Set messages |
# Set messages |
| my $messages=&domainlogo($domain); |
my $messages=&domainlogo($domain); |
| # Port for miniserver |
|
| my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
|
| if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } |
|
| |
|
| my $extra_body_attr = &make_attr_string($forcereg,\%design); |
my $extra_body_attr = &make_attr_string($forcereg,\%design); |
| |
|
| # construct main body tag |
# construct main body tag |
| my $bodytag = "<body $extra_body_attr>". |
my $bodytag = "<body $extra_body_attr>". |
| &Apache::lontexconvert::init_math_support(); |
&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'}); |
| |
|
| if ($bodyonly |
if ($bodyonly) { |
| || ($env{'request.state'} eq 'construct' |
|
| && $env{'environment.remote'} ne 'off' )) { |
|
| return $bodytag; |
return $bodytag; |
| } elsif ($env{'browser.interface'} eq 'textual') { |
} elsif ($env{'browser.interface'} eq 'textual') { |
| # Accessibility |
# Accessibility |
|
Line 3523 ENDROLE
|
Line 3956 ENDROLE
|
| |
|
| my $imgsrc = $img; |
my $imgsrc = $img; |
| if ($img =~ /^\/adm/) { |
if ($img =~ /^\/adm/) { |
| $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img; |
$imgsrc = &lonhttpdurl($img); |
| } |
} |
| my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />'; |
my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />'; |
| |
|
|
Line 3608 sub make_attr_string {
|
Line 4041 sub make_attr_string {
|
| |
|
| =pod |
=pod |
| |
|
| =back |
|
| |
|
| =head1 HTML Helpers |
|
| |
|
| =over 4 |
|
| |
|
| =item * &endbodytag() |
=item * &endbodytag() |
| |
|
| Returns a uniform footer for LON-CAPA web pages. |
Returns a uniform footer for LON-CAPA web pages. |
| |
|
| Inputs: none |
Inputs: none |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| sub endbodytag { |
sub endbodytag { |
|
Line 3638 sub endbodytag {
|
Line 4063 sub endbodytag {
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &standard_css() |
=item * &standard_css() |
| |
|
| Returns a style sheet |
Returns a style sheet |
|
Line 3650 Inputs: (all optional)
|
Line 4073 Inputs: (all optional)
|
| function -> force usage of a specific rolish color scheme |
function -> force usage of a specific rolish color scheme |
| bgcolor -> override the default page bgcolor |
bgcolor -> override the default page bgcolor |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| sub standard_css { |
sub standard_css { |
|
Line 3708 table.thinborder tr td {
|
Line 4129 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 3717 form, .inline { display: inline; }
|
Line 4138 form, .inline { display: inline; }
|
| .LC_diff_removed { |
.LC_diff_removed { |
| color: red; |
color: red; |
| } |
} |
| |
|
| |
.LC_info, |
| .LC_success, |
.LC_success, |
| .LC_diff_added { |
.LC_diff_added { |
| color: green; |
color: green; |
| } |
} |
| |
.LC_unknown { |
| |
color: yellow; |
| |
} |
| |
|
| .LC_icon { |
.LC_icon { |
| border: 0px; |
border: 0px; |
| } |
} |
| |
.LC_indexer_icon { |
| |
border: 0px; |
| |
height: 22px; |
| |
} |
| |
.LC_docs_spacer { |
| |
width: 25px; |
| |
height: 1px; |
| |
border: 0px; |
| |
} |
| |
|
| |
.LC_internal_info { |
| |
color: #999; |
| |
} |
| |
|
| table.LC_pastsubmission { |
table.LC_pastsubmission { |
| border: 1px solid black; |
border: 1px solid black; |
|
Line 3935 table.LC_data_table, table.LC_mail_list
|
Line 4375 table.LC_data_table, table.LC_mail_list
|
| } |
} |
| table.LC_nested_outer { |
table.LC_nested_outer { |
| border: 1px solid #000000; |
border: 1px solid #000000; |
| border-collapse: separate; |
border-collapse: collapse; |
| border-spacing: 0px; |
border-spacing: 0px; |
| width: 100%; |
width: 100%; |
| } |
} |
| table.LC_nested { |
table.LC_nested { |
| border: 0px; |
border: 0px; |
| border-collapse: separate; |
border-collapse: collapse; |
| border-spacing: 0px; |
border-spacing: 0px; |
| width: 100%; |
width: 100%; |
| } |
} |
|
Line 3993 table.LC_nested tr.LC_info_row td {
|
Line 4433 table.LC_nested tr.LC_info_row td {
|
| font-size: small; |
font-size: small; |
| text-align: center; |
text-align: center; |
| } |
} |
| table.LC_nested tr.LC_info_row td.LC_left_item { |
table.LC_nested tr.LC_info_row td.LC_left_item, |
| |
table.LC_nested_outer tr th.LC_left_item { |
| text-align: left; |
text-align: left; |
| } |
} |
| table.LC_nested td { |
table.LC_nested td { |
|
Line 4224 table#LC_helpmenu_links a:hover {
|
Line 4665 table#LC_helpmenu_links a:hover {
|
| border: 1px solid #8888FF; |
border: 1px solid #8888FF; |
| background: #CCCCFF; |
background: #CCCCFF; |
| } |
} |
| |
|
| table.LC_pick_box { |
table.LC_pick_box { |
| width: 100%; |
|
| border-collapse: separate; |
border-collapse: separate; |
| background: white; |
background: white; |
| border: 1px solid black; |
border: 1px solid black; |
|
Line 4239 table.LC_pick_box td.LC_pick_box_title {
|
Line 4678 table.LC_pick_box td.LC_pick_box_title {
|
| width: 184px; |
width: 184px; |
| padding: 8px; |
padding: 8px; |
| } |
} |
| |
table.LC_pick_box td.LC_pick_box_value { |
| |
text-align: left; |
| |
padding: 8px; |
| |
} |
| |
table.LC_pick_box td.LC_pick_box_select { |
| |
text-align: left; |
| |
padding: 8px; |
| |
} |
| table.LC_pick_box td.LC_pick_box_separator { |
table.LC_pick_box td.LC_pick_box_separator { |
| padding: 0px; |
padding: 0px; |
| height: 1px; |
height: 1px; |
|
Line 4247 table.LC_pick_box td.LC_pick_box_separat
|
Line 4694 table.LC_pick_box td.LC_pick_box_separat
|
| table.LC_pick_box td.LC_pick_box_submit { |
table.LC_pick_box td.LC_pick_box_submit { |
| text-align: right; |
text-align: right; |
| } |
} |
| |
table.LC_pick_box td.LC_evenrow_value { |
| |
text-align: left; |
| |
padding: 8px; |
| |
background-color: $data_table_light; |
| |
} |
| |
table.LC_pick_box td.LC_oddrow_value { |
| |
text-align: left; |
| |
padding: 8px; |
| |
background-color: $data_table_light; |
| |
} |
| |
table.LC_helpform_receipt { |
| |
width: 620px; |
| |
border-collapse: separate; |
| |
background: white; |
| |
border: 1px solid black; |
| |
border-spacing: 1px; |
| |
} |
| |
table.LC_helpform_receipt td.LC_pick_box_title { |
| |
background: $tabbg; |
| |
font-weight: bold; |
| |
text-align: right; |
| |
width: 184px; |
| |
padding: 8px; |
| |
} |
| |
table.LC_helpform_receipt td.LC_evenrow_value { |
| |
text-align: left; |
| |
padding: 8px; |
| |
background-color: $data_table_light; |
| |
} |
| |
table.LC_helpform_receipt td.LC_oddrow_value { |
| |
text-align: left; |
| |
padding: 8px; |
| |
background-color: $data_table_light; |
| |
} |
| |
table.LC_helpform_receipt td.LC_pick_box_separator { |
| |
padding: 0px; |
| |
height: 1px; |
| |
background: black; |
| |
} |
| |
span.LC_helpform_receipt_cat { |
| |
font-weight: bold; |
| |
} |
| table.LC_group_priv_box { |
table.LC_group_priv_box { |
| background: white; |
background: white; |
| border: 1px solid black; |
border: 1px solid black; |
|
Line 4361 table.LC_prior_tries td {
|
Line 4849 table.LC_prior_tries td {
|
| } |
} |
| |
|
| |
|
| span.LC_prior_numerical { |
span.LC_prior_numerical, |
| |
span.LC_prior_string, |
| |
span.LC_prior_custom, |
| |
span.LC_prior_reaction, |
| |
span.LC_prior_math { |
| font-family: monospace; |
font-family: monospace; |
| white-space: pre; |
white-space: pre; |
| } |
} |
|
Line 4375 table.LC_prior_option {
|
Line 4867 table.LC_prior_option {
|
| width: 100%; |
width: 100%; |
| border-collapse: collapse; |
border-collapse: collapse; |
| } |
} |
| table.LC_prior_option tr td { |
table.LC_prior_rank, table.LC_prior_match { |
| |
border-collapse: collapse; |
| |
} |
| |
table.LC_prior_option tr td, |
| |
table.LC_prior_rank tr td, |
| |
table.LC_prior_match tr td { |
| border: 1px solid #000000; |
border: 1px solid #000000; |
| } |
} |
| |
|
| span.LC_nobreak { |
span.LC_nobreak { |
| white-space: nowrap; |
white-space: nowrap; |
| |
} |
| |
|
| |
span.LC_cusr_emph { |
| |
font-style: italic; |
| |
} |
| |
|
| |
table.LC_docs_documents { |
| |
background: #BBBBBB; |
| |
border-width: 0px; |
| |
border-collapse: collapse; |
| |
} |
| |
|
| |
table.LC_docs_documents td.LC_docs_document { |
| |
border: 2px solid black; |
| |
padding: 4px; |
| |
} |
| |
|
| |
.LC_docs_course_commands div { |
| |
float: left; |
| |
border: 4px solid #AAAAAA; |
| |
padding: 4px; |
| |
background: #DDDDCC; |
| |
} |
| |
|
| |
.LC_docs_entry_move { |
| |
border: 0px; |
| |
border-collapse: collapse; |
| |
} |
| |
|
| |
.LC_docs_entry_move td { |
| |
border: 2px solid #BBBBBB; |
| |
background: #DDDDDD; |
| |
} |
| |
|
| |
.LC_docs_editor td.LC_docs_entry_commands { |
| |
background: #DDDDDD; |
| |
font-size: x-small; |
| |
} |
| |
.LC_docs_copy { |
| |
color: #000099; |
| |
} |
| |
.LC_docs_cut { |
| |
color: #550044; |
| |
} |
| |
.LC_docs_rename { |
| |
color: #009900; |
| |
} |
| |
.LC_docs_remove { |
| |
color: #990000; |
| |
} |
| |
|
| |
.LC_docs_reinit_warn, |
| |
.LC_docs_ext_edit { |
| |
font-size: x-small; |
| |
} |
| |
|
| |
.LC_docs_editor td.LC_docs_entry_title, |
| |
.LC_docs_editor td.LC_docs_entry_icon { |
| |
background: #FFFFBB; |
| |
} |
| |
.LC_docs_editor td.LC_docs_entry_parameter { |
| |
background: #BBBBFF; |
| |
font-size: x-small; |
| |
white-space: nowrap; |
| |
} |
| |
|
| |
table.LC_docs_adddocs td, |
| |
table.LC_docs_adddocs th { |
| |
border: 1px solid #BBBBBB; |
| |
padding: 4px; |
| |
background: #DDDDDD; |
| |
} |
| |
|
| |
table.LC_sty_begin { |
| |
background: #BBFFBB; |
| |
} |
| |
table.LC_sty_end { |
| |
background: #FFBBBB; |
| |
} |
| |
|
| |
table.LC_double_column { |
| |
border-width: 0px; |
| |
border-collapse: collapse; |
| |
width: 100%; |
| |
padding: 2px; |
| |
} |
| |
|
| |
table.LC_double_column tr td.LC_left_col { |
| |
top: 2px; |
| |
left: 2px; |
| |
width: 47%; |
| |
vertical-align: top; |
| |
} |
| |
|
| |
table.LC_double_column tr td.LC_right_col { |
| |
top: 2px; |
| |
right: 2px; |
| |
width: 47%; |
| |
vertical-align: top; |
| |
} |
| |
|
| |
span.LC_role_level { |
| |
font-weight: bold; |
| |
} |
| |
|
| |
div.LC_left_float { |
| |
float: left; |
| |
padding-right: 5%; |
| |
padding:bottom: 4px; |
| |
} |
| |
|
| |
div.LC_clear_float_header { |
| |
padding:bottom: 2px; |
| |
} |
| |
|
| |
div.LC_clear_float_footer { |
| |
padding:top: 10px; |
| |
clear: both; |
| } |
} |
| |
|
| END |
END |
|
Line 4388 END
|
Line 5003 END
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &headtag() |
=item * &headtag() |
| |
|
| Returns a uniform footer for LON-CAPA web pages. |
Returns a uniform footer for LON-CAPA web pages. |
|
Line 4413 Inputs: $title - optional title for the
|
Line 5026 Inputs: $title - optional title for the
|
| no_auto_mt_title |
no_auto_mt_title |
| -> prevent &mt()ing the title arg |
-> prevent &mt()ing the title arg |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| sub headtag { |
sub headtag { |
|
Line 4425 sub headtag {
|
Line 5036 sub headtag {
|
| my $bgcolor = $args->{'bgcolor'} || &designparm($function.'.pgbg',$domain); |
my $bgcolor = $args->{'bgcolor'} || &designparm($function.'.pgbg',$domain); |
| my $url = join(':',$env{'user.name'},$env{'user.domain'}, |
my $url = join(':',$env{'user.name'},$env{'user.domain'}, |
| $Apache::lonnet::perlvar{'lonVersion'}, |
$Apache::lonnet::perlvar{'lonVersion'}, |
| time(), |
#time(), |
| $env{'environment.color.timestamp'}, |
$env{'environment.color.timestamp'}, |
| $function,$domain,$bgcolor); |
$function,$domain,$bgcolor); |
| |
|
|
Line 4470 ADDMETA
|
Line 5081 ADDMETA
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &font_settings() |
=item * &font_settings() |
| |
|
| Returns neccessary <meta> to set the proper encoding |
Returns neccessary <meta> to set the proper encoding |
| |
|
| Inputs: none |
Inputs: none |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| sub font_settings { |
sub font_settings { |
|
Line 4496 sub font_settings {
|
Line 5103 sub font_settings {
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &xml_begin() |
=item * &xml_begin() |
| |
|
| Returns the needed doctype and <html> |
Returns the needed doctype and <html> |
| |
|
| Inputs: none |
Inputs: none |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| 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 4530 sub xml_begin {
|
Line 5135 sub xml_begin {
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &endheadtag() |
=item * &endheadtag() |
| |
|
| Returns a uniform </head> for LON-CAPA web pages. |
Returns a uniform </head> for LON-CAPA web pages. |
| |
|
| Inputs: none |
Inputs: none |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| sub endheadtag { |
sub endheadtag { |
|
Line 4548 sub endheadtag {
|
Line 5149 sub endheadtag {
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &head() |
=item * &head() |
| |
|
| Returns a uniform complete <head>..</head> section for LON-CAPA web pages. |
Returns a uniform complete <head>..</head> section for LON-CAPA web pages. |
|
Line 4557 Returns a uniform complete <head>..</hea
|
Line 5156 Returns a uniform complete <head>..</hea
|
| Inputs: $title - optional title for the page |
Inputs: $title - optional title for the page |
| $head_extra - optional extra HTML to put inside the <head> |
$head_extra - optional extra HTML to put inside the <head> |
| |
|
| =back |
|
| |
|
| =cut |
=cut |
| |
|
| sub head { |
sub head { |
|
Line 4568 sub head {
|
Line 5165 sub head {
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &start_page() |
=item * &start_page() |
| |
|
| Returns a complete <html> .. <body> section for LON-CAPA web pages. |
Returns a complete <html> .. <body> section for LON-CAPA web pages. |
|
Line 4608 Inputs: $title - optional title for the
|
Line 5203 Inputs: $title - optional title for the
|
| |
|
| no_auto_mt_title -> prevent &mt()ing the title arg |
no_auto_mt_title -> prevent &mt()ing the title arg |
| |
|
| =back |
inherit_jsmath -> when creating popup window in a page, |
| |
should it have jsmath forced on by the |
| |
current page |
| |
|
| =cut |
=cut |
| |
|
|
Line 4661 sub start_page {
|
Line 5258 sub start_page {
|
| |
|
| =pod |
=pod |
| |
|
| =over 4 |
|
| |
|
| =item * &head() |
=item * &head() |
| |
|
| Returns a complete </body></html> section for LON-CAPA web pages. |
Returns a complete </body></html> section for LON-CAPA web pages. |
|
Line 4820 sub simple_error_page {
|
Line 5415 sub simple_error_page {
|
| } |
} |
| } |
} |
| |
|
| |
=pod |
| |
|
| |
=item * &inhibit_menu_check($arg) |
| |
|
| |
Checks for a inhibitmenu state and generates output to preserve it |
| |
|
| |
Inputs: $arg - can be any of |
| |
- undef - in which case the return value is a string |
| |
to add into arguments list of a uri |
| |
- 'input' - in which case the return value is a HTML |
| |
<form> <input> field of type hidden to |
| |
preserve the value |
| |
- a url - in which case the return value is the url with |
| |
the neccesary cgi args added to preserve the |
| |
inhibitmenu state |
| |
- a ref to a url - no return value, but the string is |
| |
updated to include the neccessary cgi |
| |
args to preserve the inhibitmenu state |
| |
|
| |
=cut |
| |
|
| |
sub inhibit_menu_check { |
| |
my ($arg) = @_; |
| |
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
| |
if ($arg eq 'input') { |
| |
if ($env{'form.inhibitmenu'}) { |
| |
return '<input type="hidden" name="inhibitmenu" value="'.$env{'form.inhibitmenu'}.'" />'; |
| |
} else { |
| |
return |
| |
} |
| |
} |
| |
if ($env{'form.inhibitmenu'}) { |
| |
if (ref($arg)) { |
| |
$$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'}; |
| |
} elsif ($arg eq '') { |
| |
$arg .= 'inhibitmenu='.$env{'form.inhibitmenu'}; |
| |
} else { |
| |
$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'}; |
| |
} |
| |
} |
| |
if (!ref($arg)) { |
| |
return $arg; |
| |
} |
| |
} |
| |
|
| ############################################### |
############################################### |
| |
|
| =pod |
=pod |
| |
|
| |
=back |
| |
|
| |
=head1 User Information Routines |
| |
|
| |
=over 4 |
| |
|
| =item * &get_users_function() |
=item * &get_users_function() |
| |
|
| Used by &bodytag to determine the current users primary role. |
Used by &bodytag to determine the current users primary role. |
|
Line 4851 sub get_users_function {
|
Line 5497 sub get_users_function {
|
| |
|
| =pod |
=pod |
| |
|
| =item * &check_user_status |
=item * &check_user_status() |
| |
|
| Determines current status of supplied role for a |
Determines current status of supplied role for a |
| specific user. Roles can be active, previous or future. |
specific user. Roles can be active, previous or future. |
|
Line 5212 Incoming parameters:
|
Line 5858 Incoming parameters:
|
| 2. user's domain |
2. user's domain |
| |
|
| Returns: |
Returns: |
| 1. Disk quota (in Mb) assigned to student. |
1. Disk quota (in Mb) assigned to student. |
| |
2. (Optional) Type of setting: custom or default |
| |
(individually assigned or default for user's |
| |
institutional status). |
| |
3. (Optional) - User's institutional status (e.g., faculty, staff |
| |
or student - types as defined in localenroll::inst_usertypes |
| |
for user's domain, which determines default quota for user. |
| |
4. (Optional) - Default quota which would apply to the user. |
| |
|
| If a value has been stored in the user's environment, |
If a value has been stored in the user's environment, |
| it will return that, otherwise it returns the default |
it will return that, otherwise it returns the maximal default |
| for users in the domain. |
defined for the user's instituional status(es) in the domain. |
| |
|
| =cut |
=cut |
| |
|
|
Line 5225 for users in the domain.
|
Line 5878 for users in the domain.
|
| |
|
| sub get_user_quota { |
sub get_user_quota { |
| my ($uname,$udom) = @_; |
my ($uname,$udom) = @_; |
| my $quota; |
my ($quota,$quotatype,$settingstatus,$defquota); |
| if (!defined($udom)) { |
if (!defined($udom)) { |
| $udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
| } |
} |
|
Line 5235 sub get_user_quota {
|
Line 5888 sub get_user_quota {
|
| if (($udom eq '' || $uname eq '') || |
if (($udom eq '' || $uname eq '') || |
| ($udom eq 'public') && ($uname eq 'public')) { |
($udom eq 'public') && ($uname eq 'public')) { |
| $quota = 0; |
$quota = 0; |
| |
$quotatype = 'default'; |
| |
$defquota = 0; |
| } else { |
} else { |
| |
my $inststatus; |
| if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) { |
if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) { |
| $quota = $env{'environment.portfolioquota'}; |
$quota = $env{'environment.portfolioquota'}; |
| |
$inststatus = $env{'environment.inststatus'}; |
| } else { |
} else { |
| my %userenv = &Apache::lonnet::dump('environment',$udom,$uname); |
my %userenv = |
| |
&Apache::lonnet::get('environment',['portfolioquota', |
| |
'inststatus'],$udom,$uname); |
| my ($tmp) = keys(%userenv); |
my ($tmp) = keys(%userenv); |
| if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
| $quota = $userenv{'portfolioquota'}; |
$quota = $userenv{'portfolioquota'}; |
| |
$inststatus = $userenv{'inststatus'}; |
| } else { |
} else { |
| undef(%userenv); |
undef(%userenv); |
| } |
} |
| } |
} |
| |
($defquota,$settingstatus) = &default_quota($udom,$inststatus); |
| if ($quota eq '') { |
if ($quota eq '') { |
| $quota = &default_quota($udom); |
$quota = $defquota; |
| |
$quotatype = 'default'; |
| |
} else { |
| |
$quotatype = 'custom'; |
| } |
} |
| } |
} |
| return $quota; |
if (wantarray) { |
| |
return ($quota,$quotatype,$settingstatus,$defquota); |
| |
} else { |
| |
return $quota; |
| |
} |
| } |
} |
| |
|
| ############################################### |
############################################### |
|
Line 5260 sub get_user_quota {
|
Line 5928 sub get_user_quota {
|
| |
|
| =item * &default_quota() |
=item * &default_quota() |
| |
|
| Retrieves default quota assigned for storage of user portfolio files |
Retrieves default quota assigned for storage of user portfolio files, |
| |
given an (optional) user's institutional status. |
| |
|
| Incoming parameters: |
Incoming parameters: |
| 1. domain |
1. domain |
| |
2. (Optional) institutional status(es). This is a : separated list of |
| |
status types (e.g., faculty, staff, student etc.) |
| |
which apply to the user for whom the default is being retrieved. |
| |
If the institutional status string in undefined, the domain |
| |
default quota will be returned. |
| |
|
| Returns: |
Returns: |
| 1. Default disk quota (in Mb) for user portfolios in the domain. |
1. Default disk quota (in Mb) for user portfolios in the domain. |
| |
2. (Optional) institutional type which determined the value of the |
| |
default quota. |
| |
|
| If a value has been stored in the domain's configuration db, |
If a value has been stored in the domain's configuration db, |
| it will return that, otherwise it returns 20 (for backwards |
it will return that, otherwise it returns 20 (for backwards |
| compatibility with domains which have not set up a configuration |
compatibility with domains which have not set up a configuration |
| db file; the original statically defined portfolio quota was 20 Mb). |
db file; the original statically defined portfolio quota was 20 Mb). |
| |
|
| |
If the user's status includes multiple types (e.g., staff and student), |
| |
the largest default quota which applies to the user determines the |
| |
default quota returned. |
| |
|
| =cut |
=cut |
| |
|
| ############################################### |
############################################### |
| |
|
| |
|
| sub default_quota { |
sub default_quota { |
| my ($udom) = @_; |
my ($udom,$inststatus) = @_; |
| my %defaults = &Apache::lonnet::get_dom('configuration', |
my ($defquota,$settingstatus); |
| ['portfolioquota'],$udom); |
my %quotahash = &Apache::lonnet::get_dom('configuration', |
| if ($defaults{'portfolioquota'} ne '') { |
['quota'],$udom); |
| return $defaults{'portfolioquota'}; |
if (ref($quotahash{'quota'}) eq 'HASH') { |
| |
if ($inststatus ne '') { |
| |
my @statuses = split(/:/,$inststatus); |
| |
foreach my $item (@statuses) { |
| |
if ($quotahash{'quota'}{$item} ne '') { |
| |
if ($defquota eq '') { |
| |
$defquota = $quotahash{'quota'}{$item}; |
| |
$settingstatus = $item; |
| |
} elsif ($quotahash{'quota'}{$item} > $defquota) { |
| |
$defquota = $quotahash{'quota'}{$item}; |
| |
$settingstatus = $item; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($defquota eq '') { |
| |
$defquota = $quotahash{'quota'}{'default'}; |
| |
$settingstatus = 'default'; |
| |
} |
| } else { |
} else { |
| return '20'; |
$settingstatus = 'default'; |
| |
$defquota = 20; |
| |
} |
| |
if (wantarray) { |
| |
return ($defquota,$settingstatus); |
| |
} else { |
| |
return $defquota; |
| } |
} |
| } |
} |
| |
|
|
Line 5326 sub get_secgrprole_info {
|
Line 6030 sub get_secgrprole_info {
|
| return (\@sections,\@groups,$allroles,$rolehash,$accesshash); |
return (\@sections,\@groups,$allroles,$rolehash,$accesshash); |
| } |
} |
| |
|
| |
sub user_picker { |
| |
my ($dom,$srch,$forcenewuser,$caller) = @_; |
| |
my $currdom = $dom; |
| |
my %curr_selected = ( |
| |
srchin => 'dom', |
| |
srchby => 'lastname', |
| |
); |
| |
my $srchterm; |
| |
if (ref($srch) eq 'HASH') { |
| |
if ($srch->{'srchby'} ne '') { |
| |
$curr_selected{'srchby'} = $srch->{'srchby'}; |
| |
} |
| |
if ($srch->{'srchin'} ne '') { |
| |
$curr_selected{'srchin'} = $srch->{'srchin'}; |
| |
} |
| |
if ($srch->{'srchtype'} ne '') { |
| |
$curr_selected{'srchtype'} = $srch->{'srchtype'}; |
| |
} |
| |
if ($srch->{'srchdomain'} ne '') { |
| |
$currdom = $srch->{'srchdomain'}; |
| |
} |
| |
$srchterm = $srch->{'srchterm'}; |
| |
} |
| |
my %lt=&Apache::lonlocal::texthash( |
| |
'usr' => 'Search criteria', |
| |
'doma' => 'Domain/institution to search', |
| |
'uname' => 'username', |
| |
'lastname' => 'last name', |
| |
'lastfirst' => 'last name, first name', |
| |
'crs' => 'in this course', |
| |
'dom' => 'in selected LON-CAPA domain', |
| |
'alc' => 'all LON-CAPA', |
| |
'instd' => 'in institutional directory for selected domain', |
| |
'exact' => 'is', |
| |
'contains' => 'contains', |
| |
'begins' => 'begins with', |
| |
'youm' => "You must include some text to search for.", |
| |
'thte' => "The text you are searching for must contain at least two characters when using a 'begins' type search.", |
| |
'thet' => "The text you are searching for must contain at least three characters when using a 'contains' type search.", |
| |
'yomc' => "You must choose a domain when using an institutional directory search.", |
| |
'ymcd' => "You must choose a domain when using a domain search.", |
| |
'whus' => "When using searching by last,first you must include a comma as separator between last name and first name.", |
| |
'whse' => "When searching by last,first you must include at least one character in the first name.", |
| |
'thfo' => "The following need to be corrected before the search can be run:", |
| |
); |
| |
my $domform = &select_dom_form($currdom,'srchdomain',1,1); |
| |
my $srchinsel = ' <select name="srchin">'; |
| |
|
| |
my @srchins = ('crs','dom','alc','instd'); |
| |
|
| |
foreach my $option (@srchins) { |
| |
# FIXME 'alc' option unavailable until |
| |
# loncreateuser::print_user_query_page() |
| |
# has been completed. |
| |
next if ($option eq 'alc'); |
| |
next if ($option eq 'crs' && !$env{'request.course.id'}); |
| |
if ($curr_selected{'srchin'} eq $option) { |
| |
$srchinsel .= ' |
| |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
| |
} else { |
| |
$srchinsel .= ' |
| |
<option value="'.$option.'">'.$lt{$option}.'</option>'; |
| |
} |
| |
} |
| |
$srchinsel .= "\n </select>\n"; |
| |
|
| |
my $srchbysel = ' <select name="srchby">'; |
| |
foreach my $option ('lastname','lastfirst','uname') { |
| |
if ($curr_selected{'srchby'} eq $option) { |
| |
$srchbysel .= ' |
| |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
| |
} else { |
| |
$srchbysel .= ' |
| |
<option value="'.$option.'">'.$lt{$option}.'</option>'; |
| |
} |
| |
} |
| |
$srchbysel .= "\n </select>\n"; |
| |
|
| |
my $srchtypesel = ' <select name="srchtype">'; |
| |
foreach my $option ('begins','contains','exact') { |
| |
if ($curr_selected{'srchtype'} eq $option) { |
| |
$srchtypesel .= ' |
| |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
| |
} else { |
| |
$srchtypesel .= ' |
| |
<option value="'.$option.'">'.$lt{$option}.'</option>'; |
| |
} |
| |
} |
| |
$srchtypesel .= "\n </select>\n"; |
| |
|
| |
my ($newuserscript,$new_user_create); |
| |
|
| |
if ($forcenewuser) { |
| |
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'}) { |
| |
$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>'; |
| |
} |
| |
} |
| |
|
| |
$newuserscript = <<"ENDSCRIPT"; |
| |
|
| |
function setSearch(createnew,callingForm) { |
| |
if (createnew == 1) { |
| |
for (var i=0; i<callingForm.srchby.length; i++) { |
| |
if (callingForm.srchby.options[i].value == 'uname') { |
| |
callingForm.srchby.selectedIndex = i; |
| |
} |
| |
} |
| |
for (var i=0; i<callingForm.srchin.length; i++) { |
| |
if ( callingForm.srchin.options[i].value == 'dom') { |
| |
callingForm.srchin.selectedIndex = i; |
| |
} |
| |
} |
| |
for (var i=0; i<callingForm.srchtype.length; i++) { |
| |
if (callingForm.srchtype.options[i].value == 'exact') { |
| |
callingForm.srchtype.selectedIndex = i; |
| |
} |
| |
} |
| |
for (var i=0; i<callingForm.srchdomain.length; i++) { |
| |
if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') { |
| |
callingForm.srchdomain.selectedIndex = i; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
ENDSCRIPT |
| |
|
| |
} |
| |
|
| |
my $output = <<"END_BLOCK"; |
| |
<script type="text/javascript"> |
| |
function validateEntry(callingForm) { |
| |
|
| |
var checkok = 1; |
| |
var srchin; |
| |
for (var i=0; i<callingForm.srchin.length; i++) { |
| |
if ( callingForm.srchin[i].checked ) { |
| |
srchin = callingForm.srchin[i].value; |
| |
} |
| |
} |
| |
|
| |
var srchtype = callingForm.srchtype.options[callingForm.srchtype.selectedIndex].value; |
| |
var srchby = callingForm.srchby.options[callingForm.srchby.selectedIndex].value; |
| |
var srchdomain = callingForm.srchdomain.options[callingForm.srchdomain.selectedIndex].value; |
| |
var srchterm = callingForm.srchterm.value; |
| |
var srchin = callingForm.srchin.options[callingForm.srchin.selectedIndex].value; |
| |
var msg = ""; |
| |
|
| |
if (srchterm == "") { |
| |
checkok = 0; |
| |
msg += "$lt{'youm'}\\n"; |
| |
} |
| |
|
| |
if (srchtype== 'begins') { |
| |
if (srchterm.length < 2) { |
| |
checkok = 0; |
| |
msg += "$lt{'thte'}\\n"; |
| |
} |
| |
} |
| |
|
| |
if (srchtype== 'contains') { |
| |
if (srchterm.length < 3) { |
| |
checkok = 0; |
| |
msg += "$lt{'thet'}\\n"; |
| |
} |
| |
} |
| |
if (srchin == 'instd') { |
| |
if (srchdomain == '') { |
| |
checkok = 0; |
| |
msg += "$lt{'yomc'}\\n"; |
| |
} |
| |
} |
| |
if (srchin == 'dom') { |
| |
if (srchdomain == '') { |
| |
checkok = 0; |
| |
msg += "$lt{'ymcd'}\\n"; |
| |
} |
| |
} |
| |
if (srchby == 'lastfirst') { |
| |
if (srchterm.indexOf(",") == -1) { |
| |
checkok = 0; |
| |
msg += "$lt{'whus'}\\n"; |
| |
} |
| |
if (srchterm.indexOf(",") == srchterm.length -1) { |
| |
checkok = 0; |
| |
msg += "$lt{'whse'}\\n"; |
| |
} |
| |
} |
| |
if (checkok == 0) { |
| |
alert("$lt{'thfo'}\\n"+msg); |
| |
return; |
| |
} |
| |
if (checkok == 1) { |
| |
callingForm.submit(); |
| |
} |
| |
} |
| |
|
| |
$newuserscript |
| |
|
| |
</script> |
| |
|
| |
$new_user_create |
| |
|
| |
<table> |
| |
<tr> |
| |
<td>$lt{'doma'}:</td> |
| |
<td>$domform</td> |
| |
</td> |
| |
</tr> |
| |
<tr> |
| |
<td>$lt{'usr'}:</td> |
| |
<td>$srchbysel |
| |
$srchtypesel |
| |
<input type="text" size="15" name="srchterm" value="$srchterm" /> |
| |
$srchinsel |
| |
</td> |
| |
</tr> |
| |
</table> |
| |
<br /> |
| |
END_BLOCK |
| |
|
| |
return $output; |
| |
} |
| |
|
| |
sub username_rule_check { |
| |
my ($srch,$caller) = @_; |
| |
my ($response,@curr_rules,%inst_results,$rulematch); |
| |
my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($srch->{'srchdomain'}); |
| |
if (ref($srch) eq 'HASH') { |
| |
(my $inst_response,%inst_results) = |
| |
&Apache::lonnet::get_instuser($srch->{'srchdomain'}, |
| |
$srch->{'srchterm'}); |
| |
my %domconfig = &Apache::lonnet::get_dom('configuration', |
| |
['usercreation'],$srch->{'srchdomain'}); |
| |
if (ref($domconfig{'usercreation'}) eq 'HASH') { |
| |
if (ref($domconfig{'usercreation'}{'username_rule'}) eq 'ARRAY') { |
| |
@curr_rules = @{$domconfig{'usercreation'}{'username_rule'}}; |
| |
} |
| |
} |
| |
if (@curr_rules > 0) { |
| |
my $domdesc = &Apache::lonnet::domain($srch->{'srchdomain'},'description'); |
| |
my $instuser_reqd; |
| |
my %rule_check = &Apache::lonnet::inst_rulecheck($srch->{'srchdomain'},$srch->{'srchterm'},\@curr_rules); |
| |
foreach my $rule (@curr_rules) { |
| |
if ($rule_check{$rule}) { |
| |
$rulematch = $rule; |
| |
if ($inst_response eq 'ok') { |
| |
if (keys(%inst_results) == 0) { |
| |
if ($caller eq 'new') { |
| |
$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."); |
| |
} |
| |
} |
| |
} |
| |
last; |
| |
} |
| |
} |
| |
if ($response) { |
| |
if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) { |
| |
if (@{$ruleorder} > 0) { |
| |
$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>'; |
| |
foreach my $rule (@{$ruleorder}) { |
| |
if (grep(/^\Q$rule\E$/,@curr_rules)) { |
| |
if (ref($rules->{$rule}) eq 'HASH') { |
| |
$response .= '<li>'.$rules->{$rule}{'name'}.': '. |
| |
$rules->{$rule}{'desc'}.'</li>'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
$response .= '</ul>'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($response,$rulematch,$rules,%inst_results); |
| |
} |
| |
|
| =pod |
=pod |
| |
|
| |
=back |
| |
|
| |
=head1 HTTP Helpers |
| |
|
| |
=over 4 |
| |
|
| =item * get_unprocessed_cgi($query,$possible_names) |
=item * get_unprocessed_cgi($query,$possible_names) |
| |
|
| Modify the %env hash to contain unprocessed CGI form parameters held in |
Modify the %env hash to contain unprocessed CGI form parameters held in |
|
Line 5577 sub record_sep {
|
Line 6564 sub record_sep {
|
| $i++; |
$i++; |
| } |
} |
| } else { |
} else { |
| my @allfields; |
my $separator=','; |
| if ($env{'form.upfiletype'} eq 'semisv') { |
if ($env{'form.upfiletype'} eq 'semisv') { |
| @allfields=split(/;/,$record,-1); |
$separator=';'; |
| } else { |
|
| @allfields=split(/\,/,$record,-1); |
|
| } |
} |
| my $i=0; |
my $i=0; |
| my $j; |
# the character we are looking for to indicate the end of a quote or a record |
| for ($j=0;$j<=$#allfields;$j++) { |
my $looking_for=$separator; |
| my $field=$allfields[$j]; |
# do not add the characters to the fields |
| if ($field=~/^\s*(\"|\')/) { |
my $ignore=0; |
| my $delimiter=$1; |
# we just encountered a separator (or the beginning of the record) |
| while (($field!~/$delimiter$/) && ($j<$#allfields)) { |
my $just_found_separator=1; |
| $j++; |
# store the field we are working on here |
| $field.=','.$allfields[$j]; |
my $field=''; |
| } |
# work our way through all characters in record |
| $field=~s/^\s*$delimiter//; |
foreach my $character ($record=~/(.)/g) { |
| $field=~s/$delimiter\s*$//; |
if ($character eq $looking_for) { |
| } |
if ($character ne $separator) { |
| $components{&takeleft($i)}=$field; |
# Found the end of a quote, again looking for separator |
| $i++; |
$looking_for=$separator; |
| |
$ignore=1; |
| |
} else { |
| |
# Found a separator, store away what we got |
| |
$components{&takeleft($i)}=$field; |
| |
$i++; |
| |
$just_found_separator=1; |
| |
$ignore=0; |
| |
$field=''; |
| |
} |
| |
next; |
| |
} |
| |
# single or double quotation marks after a separator indicate beginning of a quote |
| |
# we are now looking for the end of the quote and need to ignore separators |
| |
if ((($character eq '"') || ($character eq "'")) && ($just_found_separator)) { |
| |
$looking_for=$character; |
| |
next; |
| |
} |
| |
# ignore would be true after we reached the end of a quote |
| |
if ($ignore) { next; } |
| |
if (($just_found_separator) && ($character=~/\s/)) { next; } |
| |
$field.=$character; |
| |
$just_found_separator=0; |
| } |
} |
| |
# catch the very last entry, since we never encountered the separator |
| |
$components{&takeleft($i)}=$field; |
| } |
} |
| return %components; |
return %components; |
| } |
} |
|
Line 5669 sub csv_print_samples {
|
Line 6678 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 5707 sub csv_print_select_table {
|
Line 6717 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 5722 sub csv_print_select_table {
|
Line 6733 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 5751 sub csv_samples_select_table {
|
Line 6763 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 5769 sub csv_samples_select_table {
|
Line 6783 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 6365 sub commit_customrole {
|
Line 7380 sub commit_customrole {
|
| } |
} |
| |
|
| sub commit_standardrole { |
sub commit_standardrole { |
| my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; |
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
| my $output; |
my ($output,$logmsg,$linefeed); |
| my $logmsg; |
if ($context eq 'auto') { |
| |
$linefeed = "\n"; |
| |
} else { |
| |
$linefeed = "<br />\n"; |
| |
} |
| if ($three eq 'st') { |
if ($three eq 'st') { |
| my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec); |
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end, |
| if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { |
$one,$two,$sec,$context); |
| |
if (($result =~ /^error/) || ($result eq 'not_in_class') || |
| |
($result eq 'unknown_course')) { |
| $output = "Error: $result\n"; |
$output = "Error: $result\n"; |
| } else { |
} else { |
| $output = &mt('Assigning').' '.$three.' in '.$url. |
$output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url. |
| ($start?', '.&mt('starting').' '.localtime($start):''). |
($start?', '.&mt('starting').' '.localtime($start):''). |
| ($end?', '.&mt('ending').' '.localtime($end):''). |
($end?', '.&mt('ending').' '.localtime($end):'').': '; |
| ': <b>'.$result.'</b><br />'. |
if ($context eq 'auto') { |
| &mt('Add to classlist').': <b>ok</b><br />'; |
$output .= $result.$linefeed.&mt('Add to classlist').': ok'; |
| |
} else { |
| |
$output .= '<b>'.$result.'</b>'.$linefeed. |
| |
&mt('Add to classlist').': <b>ok</b>'; |
| |
} |
| |
$output .= $linefeed; |
| } |
} |
| } else { |
} else { |
| $output = &mt('Assigning').' '.$three.' in '.$url. |
$output = &mt('Assigning').' '.$three.' in '.$url. |
| ($start?', '.&mt('starting').' '.localtime($start):''). |
($start?', '.&mt('starting').' '.localtime($start):''). |
| ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'. |
($end?', '.&mt('ending').' '.localtime($end):'').': '; |
| &Apache::lonnet::assignrole( |
my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start); |
| $udom,$uname,$url,$three,$end,$start). |
if ($context eq 'auto') { |
| '</b><br />'; |
$output .= $result.$linefeed; |
| |
} else { |
| |
$output .= '<b>'.$result.'</b>'.$linefeed; |
| |
} |
| } |
} |
| return $output; |
return $output; |
| } |
} |
| |
|
| sub commit_studentrole { |
sub commit_studentrole { |
| my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; |
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
| my $linefeed = '<br />'."\n"; |
my ($result,$linefeed); |
| my $result; |
if ($context eq 'auto') { |
| |
$linefeed = "\n"; |
| |
} else { |
| |
$linefeed = '<br />'."\n"; |
| |
} |
| if (defined($one) && defined($two)) { |
if (defined($one) && defined($two)) { |
| my $cid=$one.'_'.$two; |
my $cid=$one.'_'.$two; |
| my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid); |
my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid); |
|
Line 6439 sub commit_studentrole {
|
Line 7472 sub commit_studentrole {
|
| ############################################################ |
############################################################ |
| ############################################################ |
############################################################ |
| |
|
| |
sub check_clone { |
| |
my ($args,$linefeed) = @_; |
| |
my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
| |
my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid); |
| |
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
| |
my $clonemsg; |
| |
my $can_clone = 0; |
| |
|
| |
if ($clonehome eq 'no_host') { |
| |
$clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'}); |
| |
} else { |
| |
my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); |
| |
if ($env{'request.role.domain'} eq $args->{'clonedomain'}) { |
| |
$can_clone = 1; |
| |
} else { |
| |
my %clonehash = &Apache::lonnet::get('environment',['cloners'], |
| |
$args->{'clonedomain'},$args->{'clonecourse'}); |
| |
my @cloners = split(/,/,$clonehash{'cloners'}); |
| |
if (grep(/^\*$/,@cloners)) { |
| |
$can_clone = 1; |
| |
} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) { |
| |
$can_clone = 1; |
| |
} else { |
| |
my %roleshash = |
| |
&Apache::lonnet::get_my_roles($args->{'ccuname'}, |
| |
$args->{'ccdomain'}, |
| |
'userroles',['active'],['cc'], |
| |
[$args->{'clonedomain'}]); |
| |
if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) { |
| |
$can_clone = 1; |
| |
} else { |
| |
$clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'}); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($can_clone, $clonemsg, $cloneid, $clonehome); |
| |
} |
| |
|
| sub construct_course { |
sub construct_course { |
| my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_; |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_; |
| my $outcome; |
my $outcome; |
| |
my $linefeed = '<br />'."\n"; |
| |
if ($context eq 'auto') { |
| |
$linefeed = "\n"; |
| |
} |
| |
|
| |
# |
| |
# Are we cloning? |
| |
# |
| |
my ($can_clone, $clonemsg, $cloneid, $clonehome); |
| |
if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
| |
($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args,$linefeed); |
| |
if ($context ne 'auto') { |
| |
if ($clonemsg ne '') { |
| |
$clonemsg = '<span class="LC_error">'.$clonemsg.'</span>'; |
| |
} |
| |
} |
| |
$outcome .= $clonemsg.$linefeed; |
| |
|
| |
if (!$can_clone) { |
| |
return (0,$outcome); |
| |
} |
| |
} |
| |
|
| # |
# |
| # Open course |
# Open course |
|
Line 6462 sub construct_course {
|
Line 7556 sub construct_course {
|
| # Utils::Course. This needs to at least be output as a comment |
# Utils::Course. This needs to at least be output as a comment |
| # if anyone ever decides to not show this, and Utils::Course::new |
# if anyone ever decides to not show this, and Utils::Course::new |
| # will need to be suitably modified. |
# will need to be suitably modified. |
| $outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid); |
$outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed; |
| # |
# |
| # Check if created correctly |
# Check if created correctly |
| # |
# |
| ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid); |
($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid); |
| my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
| $outcome .= &mt('Created on').': '.$crsuhome.'<br>'; |
$outcome .= &mt('Created on').': '.$crsuhome.$linefeed; |
| # |
|
| # Are we cloning? |
|
| # |
# |
| my $cloneid=''; |
# Do the cloning |
| if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
# |
| $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
if ($can_clone && $cloneid) { |
| my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid); |
$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome); |
| my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
if ($context ne 'auto') { |
| if ($clonehome eq 'no_host') { |
$clonemsg = '<span class="LC_success">'.$clonemsg.'</span>'; |
| $outcome .= |
} |
| '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>'; |
$outcome .= $clonemsg.$linefeed; |
| } else { |
my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
| $outcome .= |
|
| '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>'; |
|
| my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
|
| # Copy all files |
# Copy all files |
| &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); |
&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); |
| # 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 |
# restore grading mode |
| if (defined($oldcenv{'grading'})) { |
if (defined($oldcenv{'grading'})) { |
| $cenv{'grading'}=$oldcenv{'grading'}; |
$cenv{'grading'}=$oldcenv{'grading'}; |
| } |
|
| # Mark as cloned |
|
| $cenv{'clonedfrom'}=$cloneid; |
|
| delete($cenv{'default_enrollment_start_date'}); |
|
| delete($cenv{'default_enrollment_end_date'}); |
|
| } |
} |
| |
# Mark as cloned |
| |
$cenv{'clonedfrom'}=$cloneid; |
| |
delete($cenv{'default_enrollment_start_date'}); |
| |
delete($cenv{'default_enrollment_end_date'}); |
| } |
} |
| |
|
| # |
# |
| # Set environment (will override cloned, if existing) |
# Set environment (will override cloned, if existing) |
| # |
# |
|
Line 6603 sub construct_course {
|
Line 7693 sub construct_course {
|
| 'dnhr' => 'does not have rights to access enrollment in these classes', |
'dnhr' => 'does not have rights to access enrollment in these classes', |
| 'adby' => 'as determined by the policies of your institution on access to official classlists' |
'adby' => 'as determined by the policies of your institution on access to official classlists' |
| ); |
); |
| $outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n"; |
my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}. |
| foreach (@badclasses) { |
' ('.$lt{'adby'}.')'; |
| $outcome .= "<li>$_</li>\n"; |
if ($context eq 'auto') { |
| } |
$outcome .= $badclass_msg.$linefeed; |
| $outcome .= "</ul><br /><br /></font>\n"; |
$outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n"; |
| |
foreach my $item (@badclasses) { |
| |
if ($context eq 'auto') { |
| |
$outcome .= " - $item\n"; |
| |
} else { |
| |
$outcome .= "<li>$item</li>\n"; |
| |
} |
| |
} |
| |
if ($context eq 'auto') { |
| |
$outcome .= $linefeed; |
| |
} else { |
| |
$outcome .= "</ul><br /><br /></div>\n"; |
| |
} |
| |
} |
| } |
} |
| if ($args->{'no_end_date'}) { |
if ($args->{'no_end_date'}) { |
| $args->{'endaccess'} = 0; |
$args->{'endaccess'} = 0; |
|
Line 6623 sub construct_course {
|
Line 7726 sub construct_course {
|
| $cenv{'internal.autharg'} = $args->{'autharg'}; |
$cenv{'internal.autharg'} = $args->{'autharg'}; |
| if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) { |
if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) { |
| if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') { |
if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') { |
| $outcome .= '<font color="red" size="+1">'. |
my $krb_msg = &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student'); |
| &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>'; |
if ($context eq 'auto') { |
| |
$outcome .= $krb_msg; |
| |
} else { |
| |
$outcome .= '<span class="LC_error">'.$krb_msg.'</span>'; |
| |
} |
| |
$outcome .= $linefeed; |
| } |
} |
| } |
} |
| if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { |
if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { |
|
Line 6680 sub construct_course {
|
Line 7788 sub construct_course {
|
| # By default, use standard grading |
# By default, use standard grading |
| if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } |
if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } |
| |
|
| $outcome .= ('<br />'.&mt('Setting environment').': '. |
$outcome .= $linefeed.&mt('Setting environment').': '. |
| &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>'); |
&Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).$linefeed; |
| # |
# |
| # Open all assignments |
# Open all assignments |
| # |
# |
|
Line 6691 sub construct_course {
|
Line 7799 sub construct_course {
|
| $storeunder.'.type' => 'date_start'); |
$storeunder.'.type' => 'date_start'); |
| |
|
| $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput |
$outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput |
| ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>'; |
('resourcedata',\%storecontent,$$crsudom,$$crsunum).$linefeed; |
| } |
} |
| # |
# |
| # Set first page |
# Set first page |
|
Line 6718 sub construct_course {
|
Line 7826 sub construct_course {
|
| (my $outtext,$errtext) = &LONCAPA::map::storemap($map,1); |
(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1); |
| |
|
| if ($errtext) { $fatal=2; } |
if ($errtext) { $fatal=2; } |
| $outcome .= ($fatal?$errtext:'write ok').'<br />'; |
$outcome .= ($fatal?$errtext:'write ok').$linefeed; |
| } |
} |
| return $outcome; |
|
| |
return (1,$outcome); |
| } |
} |
| |
|
| ############################################################ |
############################################################ |
|
Line 6763 sub icon {
|
Line 7872 sub icon {
|
| return &lonhttpdurl($iconname); |
return &lonhttpdurl($iconname); |
| } |
} |
| |
|
| sub lonhttpdurl { |
sub lonhttpd_port { |
| my ($url)=@_; |
|
| my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
| if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; } |
if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; } |
| |
# IE doesn't like a secure page getting images from a non-secure |
| |
# port (when logging we haven't parsed the browser type so default |
| |
# back to secure |
| |
if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer') |
| |
&& $ENV{'SERVER_PORT'} == 443) { |
| |
return 443; |
| |
} |
| |
return $lonhttpd_port; |
| |
|
| |
} |
| |
|
| |
sub lonhttpdurl { |
| |
my ($url)=@_; |
| |
|
| |
my $lonhttpd_port = &lonhttpd_port(); |
| |
if ($lonhttpd_port == 443) { |
| |
return 'https://'.$ENV{'SERVER_NAME'}.$url; |
| |
} |
| return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url; |
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url; |
| } |
} |
| |
|
![[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