|
version 1.559, 2007/08/08 19:13:43
|
version 1.583, 2007/09/11 20:40:23
|
|
Line 721 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 805 sub help_open_menu {
|
Line 801 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); |
| # formerly only used pop-up help (stayOnPage = 0) |
# only use pop-up help (stayOnPage == 0) |
| # if environment.remote is on (using remote control UI) |
# 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; |
|
| #} |
|
| # Now making pop-up help the default even with remote control |
|
| if ($env{'browser.interface'} eq 'textual') { |
|
| $stayOnPage=1; |
$stayOnPage=1; |
| } |
} |
| my $output; |
my $output; |
|
Line 834 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 870 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 1084 sub changable_area {
|
Line 1074 sub changable_area {
|
| |
|
| =pod |
=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 { |
| |
return <<"RESIZE"; |
| |
<script type="text/javascript"> |
| |
var Geometry = {}; |
| |
function init_geometry() { |
| |
if (Geometry.init) { return }; |
| |
Geometry.init=1; |
| |
if (window.innerHeight) { |
| |
Geometry.getViewportHeight = function() { return window.innerHeight; }; |
| |
} |
| |
else if (document.documentElement && document.documentElement.clientHeight) { |
| |
Geometry.getViewportHeight = |
| |
function() { return document.documentElement.clientHeight; }; |
| |
} |
| |
else if (document.body.clientHeight) { |
| |
Geometry.getViewportHeight = |
| |
function() { return document.body.clientHeight; }; |
| |
} |
| |
} |
| |
|
| |
function resize_textarea(textarea_id,bottom_id) { |
| |
init_geometry(); |
| |
var textarea = document.getElementById(textarea_id); |
| |
//alert(textarea); |
| |
|
| |
var textarea_top = textarea.offsetTop; |
| |
var textarea_height = textarea.offsetHeight; |
| |
var bottom = document.getElementById(bottom_id); |
| |
var bottom_top = bottom.offsetTop; |
| |
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 |
=back |
| |
|
| =head1 Excel and CSV file utility routines |
=head1 Excel and CSV file utility routines |
|
Line 1424 sub select_level_form {
|
Line 1471 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 1433 See loncreateuser.pm for an example invo
|
Line 1480 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 {lc($a) cmp lc($b)} (&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 2474 sub preferred_languages {
|
Line 2531 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 2498 sub preferred_languages {
|
Line 2557 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 2580 sub get_previous_attempt {
|
Line 2665 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 2611 sub get_previous_attempt {
|
Line 2686 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 3397 Inputs:
|
Line 3485 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 3445 sub bodytag {
|
Line 3536 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) { |
| return $bodytag; |
return $bodytag; |
|
Line 3565 ENDROLE
|
Line 3653 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 4273 table#LC_helpmenu_links a:hover {
|
Line 4361 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 4288 table.LC_pick_box td.LC_pick_box_title {
|
Line 4374 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 4296 table.LC_pick_box td.LC_pick_box_separat
|
Line 4390 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 4441 span.LC_nobreak {
|
Line 4576 span.LC_nobreak {
|
| white-space: nowrap; |
white-space: nowrap; |
| } |
} |
| |
|
| |
span.LC_cusr_emph { |
| |
font-style: italic; |
| |
} |
| |
|
| table.LC_docs_documents { |
table.LC_docs_documents { |
| background: #BBBBBB; |
background: #BBBBBB; |
| border-width: 0px; |
border-width: 0px; |
|
Line 4711 Inputs: $title - optional title for the
|
Line 4850 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 |
| |
|
| |
inherit_jsmath -> when creating popup window in a page, |
| |
should it have jsmath forced on by the |
| |
current page |
| |
|
| =cut |
=cut |
| |
|
| sub start_page { |
sub start_page { |
|
Line 5535 sub get_secgrprole_info {
|
Line 5678 sub get_secgrprole_info {
|
| } |
} |
| |
|
| sub user_picker { |
sub user_picker { |
| my ($dom,$srch,$forcenewuser) = @_; |
my ($dom,$srch,$forcenewuser,$caller) = @_; |
| my $currdom = $dom; |
my $currdom = $dom; |
| my %curr_selected = ( |
my %curr_selected = ( |
| srchin => 'dom', |
srchin => 'dom', |
| srchby => 'uname', |
srchby => 'lastname', |
| ); |
); |
| my $srchterm; |
my $srchterm; |
| if (ref($srch) eq 'HASH') { |
if (ref($srch) eq 'HASH') { |
|
Line 5558 sub user_picker {
|
Line 5701 sub user_picker {
|
| $srchterm = $srch->{'srchterm'}; |
$srchterm = $srch->{'srchterm'}; |
| } |
} |
| my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
| 'usr' => 'Search for', |
'usr' => 'Search criteria', |
| 'or' => 'or', |
'doma' => 'Domain/institution to search', |
| 'doma' => 'domain', |
|
| 'uname' => 'username', |
'uname' => 'username', |
| 'lastname' => 'last name', |
'lastname' => 'last name', |
| 'lastfirst' => 'last name, first name', |
'lastfirst' => 'last name, first name', |
| 'crs' => 'in this course', |
'crs' => 'in this course', |
| 'dom' => 'in this domain', |
'dom' => 'in selected LON-CAPA domain', |
| 'alc' => 'all LON-CAPA', |
'alc' => 'all LON-CAPA', |
| 'instd' => 'in institutional directory', |
'instd' => 'in institutional directory for selected domain', |
| 'exact' => 'is', |
'exact' => 'is', |
| 'contains' => 'contains', |
'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); |
my $domform = &select_dom_form($currdom,'srchdomain',1,1); |
| |
my $srchinsel = ' <select name="srchin">'; |
| my $srchin; |
|
| |
|
| my @srchins = ('crs','dom','alc','instd'); |
my @srchins = ('crs','dom','alc','instd'); |
| |
|
|
Line 5583 sub user_picker {
|
Line 5733 sub user_picker {
|
| # has been completed. |
# has been completed. |
| next if ($option eq 'alc'); |
next if ($option eq 'alc'); |
| next if ($option eq 'crs' && !$env{'request.course.id'}); |
next if ($option eq 'crs' && !$env{'request.course.id'}); |
| my $checked =($curr_selected{'srchin'} eq $option) ?'checked="checked"' |
if ($curr_selected{'srchin'} eq $option) { |
| :''; |
$srchinsel .= ' |
| my $extra = ($option eq 'dom') ? $domform |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
| : ''; |
} else { |
| $srchin.=<<ROW |
$srchinsel .= ' |
| <tr> |
<option value="'.$option.'">'.$lt{$option}.'</option>'; |
| <td> |
} |
| <label><input type="radio" name="srchin" value="$option" $checked /> $lt{$option}</label> $extra |
|
| </td> |
|
| </tr> |
|
| ROW |
|
| } |
} |
| |
$srchinsel .= "\n </select>\n"; |
| |
|
| my $srchbysel = ' <select name="srchby">'; |
my $srchbysel = ' <select name="srchby">'; |
| foreach my $option ('uname','lastname','lastfirst') { |
foreach my $option ('lastname','lastfirst','uname') { |
| if ($curr_selected{'srchby'} eq $option) { |
if ($curr_selected{'srchby'} eq $option) { |
| $srchbysel .= ' |
$srchbysel .= ' |
| <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
|
Line 5609 ROW
|
Line 5756 ROW
|
| $srchbysel .= "\n </select>\n"; |
$srchbysel .= "\n </select>\n"; |
| |
|
| my $srchtypesel = ' <select name="srchtype">'; |
my $srchtypesel = ' <select name="srchtype">'; |
| foreach my $option ('exact','contains') { |
foreach my $option ('begins','contains','exact') { |
| if ($curr_selected{'srchtype'} eq $option) { |
if ($curr_selected{'srchtype'} eq $option) { |
| $srchtypesel .= ' |
$srchtypesel .= ' |
| <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
|
Line 5623 ROW
|
Line 5770 ROW
|
| my ($newuserscript,$new_user_create); |
my ($newuserscript,$new_user_create); |
| |
|
| if ($forcenewuser) { |
if ($forcenewuser) { |
| $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\');" /> </p>'; |
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"; |
$newuserscript = <<"ENDSCRIPT"; |
| |
|
| function setSearch(createnew) { |
function setSearch(createnew,callingForm) { |
| if (createnew == 1) { |
if (createnew == 1) { |
| for (var i=0; i<document.crtuser.srchby.length; i++) { |
for (var i=0; i<callingForm.srchby.length; i++) { |
| if (document.crtuser.srchby.options[i].value == 'uname') { |
if (callingForm.srchby.options[i].value == 'uname') { |
| document.crtuser.srchby.selectedIndex = i; |
callingForm.srchby.selectedIndex = i; |
| } |
} |
| } |
} |
| for (var i=0; i<document.crtuser.srchin.length; i++) { |
for (var i=0; i<callingForm.srchin.length; i++) { |
| if ( document.crtuser.srchin[i].value == 'dom') { |
if ( callingForm.srchin.options[i].value == 'dom') { |
| document.crtuser.srchin[i].checked = 1; |
callingForm.srchin.selectedIndex = i; |
| } |
} |
| } |
} |
| for (var i=0; i<document.crtuser.srchtype.length; i++) { |
for (var i=0; i<callingForm.srchtype.length; i++) { |
| if (document.crtuser.srchtype.options[i].value == 'exact') { |
if (callingForm.srchtype.options[i].value == 'exact') { |
| document.crtuser.srchtype.selectedIndex = i; |
callingForm.srchtype.selectedIndex = i; |
| } |
} |
| } |
} |
| for (var i=0; i<document.crtuser.srchdomain.length; i++) { |
for (var i=0; i<callingForm.srchdomain.length; i++) { |
| if (document.crtuser.srchdomain.options[i].value == '$env{'request.role.domain'}') { |
if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') { |
| document.crtuser.srchdomain.selectedIndex = i; |
callingForm.srchdomain.selectedIndex = i; |
| } |
} |
| } |
} |
| } |
} |
|
Line 5656 ENDSCRIPT
|
Line 5808 ENDSCRIPT
|
| |
|
| my $output = <<"END_BLOCK"; |
my $output = <<"END_BLOCK"; |
| <script type="text/javascript"> |
<script type="text/javascript"> |
| function validateEntry() { |
function validateEntry(callingForm) { |
| |
|
| var checkok = 1; |
var checkok = 1; |
| var srchin; |
var srchin; |
| for (var i=0; i<document.crtuser.srchin.length; i++) { |
for (var i=0; i<callingForm.srchin.length; i++) { |
| if ( document.crtuser.srchin[i].checked ) { |
if ( callingForm.srchin[i].checked ) { |
| srchin = document.crtuser.srchin[i].value; |
srchin = callingForm.srchin[i].value; |
| } |
} |
| } |
} |
| |
|
| var srchtype = document.crtuser.srchtype.options[document.crtuser.srchtype.selectedIndex].value; |
var srchtype = callingForm.srchtype.options[callingForm.srchtype.selectedIndex].value; |
| var srchby = document.crtuser.srchby.options[document.crtuser.srchby.selectedIndex].value; |
var srchby = callingForm.srchby.options[callingForm.srchby.selectedIndex].value; |
| var srchdomain = document.crtuser.srchdomain.options[document.crtuser.srchdomain.selectedIndex].value; |
var srchdomain = callingForm.srchdomain.options[callingForm.srchdomain.selectedIndex].value; |
| var srchterm = document.crtuser.srchterm.value; |
var srchterm = callingForm.srchterm.value; |
| |
var srchin = callingForm.srchin.options[callingForm.srchin.selectedIndex].value; |
| var msg = ""; |
var msg = ""; |
| |
|
| if (srchterm == "") { |
if (srchterm == "") { |
| checkok = 0; |
checkok = 0; |
| msg += "You must include some text to search for.\\n"; |
msg += "$lt{'youm'}\\n"; |
| |
} |
| |
|
| |
if (srchtype== 'begins') { |
| |
if (srchterm.length < 2) { |
| |
checkok = 0; |
| |
msg += "$lt{'thte'}\\n"; |
| |
} |
| } |
} |
| |
|
| if (srchtype== 'contains') { |
if (srchtype== 'contains') { |
| if (srchterm.length < 3) { |
if (srchterm.length < 3) { |
| checkok = 0; |
checkok = 0; |
| msg += "The text you are searching for must contain at least three characters when using a 'contained in' type search.\\n"; |
msg += "$lt{'thet'}\\n"; |
| } |
} |
| } |
} |
| if (srchin == 'instd') { |
if (srchin == 'instd') { |
| if (srchdomain == '') { |
if (srchdomain == '') { |
| checkok = 0; |
checkok = 0; |
| msg += "You must choose a domain when using an institutional directory search.\\n"; |
msg += "$lt{'yomc'}\\n"; |
| } |
} |
| } |
} |
| if (srchin == 'dom') { |
if (srchin == 'dom') { |
| if (srchdomain == '') { |
if (srchdomain == '') { |
| checkok = 0; |
checkok = 0; |
| msg += "You must choose a domain when using a domain search.\\n"; |
msg += "$lt{'ymcd'}\\n"; |
| } |
} |
| } |
} |
| if (srchby == 'lastfirst') { |
if (srchby == 'lastfirst') { |
| if (srchterm.indexOf(",") == -1) { |
if (srchterm.indexOf(",") == -1) { |
| checkok = 0; |
checkok = 0; |
| msg += "When using searching by last,first you must include a comma as separator between last name and first name.\\n"; |
msg += "$lt{'whus'}\\n"; |
| } |
} |
| if (srchterm.indexOf(",") == srchterm.length -1) { |
if (srchterm.indexOf(",") == srchterm.length -1) { |
| checkok = 0; |
checkok = 0; |
| msg += "When searching by last,first you must include at least one character in the first name.\\n"; |
msg += "$lt{'whse'}\\n"; |
| } |
} |
| } |
} |
| if (checkok == 0) { |
if (checkok == 0) { |
| alert("The following need to be corrected before the search can be run:\\n"+msg); |
alert("$lt{'thfo'}\\n"+msg); |
| return; |
return; |
| } |
} |
| if (checkok == 1) { |
if (checkok == 1) { |
| document.crtuser.submit(); |
callingForm.submit(); |
| } |
} |
| } |
} |
| |
|
|
Line 5722 $new_user_create
|
Line 5882 $new_user_create
|
| |
|
| <table> |
<table> |
| <tr> |
<tr> |
| <td> $srchbysel |
<td>$lt{'doma'}:</td> |
| $srchtypesel |
<td>$domform</td> |
| <input type="text" size="15" name="srchterm" value="$srchterm" /> |
</td> |
| |
</tr> |
| |
<tr> |
| |
<td>$lt{'usr'}:</td> |
| |
<td>$srchbysel |
| |
$srchtypesel |
| |
<input type="text" size="15" name="srchterm" value="$srchterm" /> |
| |
$srchinsel |
| </td> |
</td> |
| </tr> |
</tr> |
| $srchin |
|
| </table> |
</table> |
| <br /> |
<br /> |
| END_BLOCK |
END_BLOCK |
|
Line 5735 END_BLOCK
|
Line 5901 END_BLOCK
|
| return $output; |
return $output; |
| } |
} |
| |
|
| |
|
| |
|
| =pod |
=pod |
| |
|
| =back |
=back |
|
Line 5994 sub record_sep {
|
Line 6158 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 6874 sub commit_studentrole {
|
Line 7060 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,$context) = @_; |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_; |
| my $outcome; |
my $outcome; |
|
Line 6881 sub construct_course {
|
Line 7106 sub construct_course {
|
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $linefeed = "\n"; |
$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 6901 sub construct_course {
|
Line 7145 sub construct_course {
|
| # 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]',$crstype,$$courseid).$linefeed; |
$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.$linefeed; |
$outcome .= &mt('Created on').': '.$crsuhome.$linefeed; |
| |
|
| # |
# |
| # Are we cloning? |
# Do the cloning |
| # |
# |
| my $cloneid=''; |
if ($can_clone && $cloneid) { |
| if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome); |
| my $can_clone = 0; |
if ($context ne 'auto') { |
| $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
$clonemsg = '<span class="LC_success">'.$clonemsg.'</span>'; |
| my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid); |
} |
| my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
$outcome .= $clonemsg.$linefeed; |
| my $clonemsg; |
my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
| if ($clonehome eq 'no_host') { |
|
| $clonemsg = &mt('Attempting to clone non-existing [_1]',$crstype); |
|
| if ($context eq 'auto') { |
|
| $outcome .= $clonemsg; |
|
| } else { |
|
| $outcome .= '<font color="red">'.$clonemsg.'</font>'; |
|
| } |
|
| $outcome .= $linefeed; |
|
| } else { |
|
| my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); |
|
| if ($env{'request.role.domain'} eq $args->{'form.clonedomain'}) { |
|
| $can_clone = 1; |
|
| } else { |
|
| my %clonehash = &Apache::lonnet::get('environment',['cloners'], |
|
| $args->{'clonedomain'},$args->{'clonecourse'}); |
|
| my @cloners = split(/,/,$clonehash{'cloners'}); |
|
| my %roleshash = |
|
| &Apache::lonnet::get_my_roles($args->{'ccuname'}, |
|
| $args->{'ccdomain'},'userroles',['active'],['cc'], |
|
| [$args->{'clonedomain'}]); |
|
| if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) { |
|
| $can_clone = 1; |
|
| } else { |
|
| $clonemsg = &mt('The new course was not cloned from an existing course because the course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'}); |
|
| if ($context eq 'auto') { |
|
| $outcome .= $clonemsg; |
|
| } else { |
|
| $outcome .= '<font color="red">'.$clonemsg.'</font>'; |
|
| } |
|
| $outcome .= $linefeed; |
|
| } |
|
| } |
|
| } |
|
| if ($can_clone) { |
|
| $clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome); |
|
| if ($context eq 'auto') { |
|
| $outcome = $clonemsg; |
|
| } else { |
|
| $outcome .= '<font color="green">'.$clonemsg.'</font>'; |
|
| } |
|
| $outcome .= $linefeed; |
|
| my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
|
| # 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 7083 sub construct_course {
|
Line 7285 sub construct_course {
|
| ' ('.$lt{'adby'}.')'; |
' ('.$lt{'adby'}.')'; |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $outcome .= $badclass_msg.$linefeed; |
$outcome .= $badclass_msg.$linefeed; |
| $outcome .= '<font color="red">'.$badclass_msg.$linefeed.'<ul>'."\n"; |
$outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n"; |
| foreach my $item (@badclasses) { |
foreach my $item (@badclasses) { |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $outcome .= " - $item\n"; |
$outcome .= " - $item\n"; |
|
Line 7094 sub construct_course {
|
Line 7296 sub construct_course {
|
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $outcome .= $linefeed; |
$outcome .= $linefeed; |
| } else { |
} else { |
| $outcome .= "</ul><br /><br /></font>\n"; |
$outcome .= "</ul><br /><br /></div>\n"; |
| } |
} |
| } |
} |
| } |
} |
|
Line 7116 sub construct_course {
|
Line 7318 sub construct_course {
|
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $outcome .= $krb_msg; |
$outcome .= $krb_msg; |
| } else { |
} else { |
| $outcome .= '<font color="red" size="+1">'.$krb_msg.'</font>'; |
$outcome .= '<span class="LC_error">'.$krb_msg.'</span>'; |
| } |
} |
| $outcome .= $linefeed; |
$outcome .= $linefeed; |
| } |
} |
|
Line 7214 sub construct_course {
|
Line 7416 sub construct_course {
|
| if ($errtext) { $fatal=2; } |
if ($errtext) { $fatal=2; } |
| $outcome .= ($fatal?$errtext:'write ok').$linefeed; |
$outcome .= ($fatal?$errtext:'write ok').$linefeed; |
| } |
} |
| return $outcome; |
|
| |
return (1,$outcome); |
| } |
} |
| |
|
| ############################################################ |
############################################################ |
|
Line 7257 sub icon {
|
Line 7460 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