version 1.454, 2006/09/13 19:42:06
|
version 1.465, 2006/10/13 22:03:26
|
Line 2353 sub preferred_languages {
|
Line 2353 sub preferred_languages {
|
$env{'course.'.$env{'request.course.id'}.'.languages'})); |
$env{'course.'.$env{'request.course.id'}.'.languages'})); |
} |
} |
if ($env{'environment.languages'}) { |
if ($env{'environment.languages'}) { |
@languages=split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}); |
@languages=(@languages, |
|
split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'})); |
} |
} |
my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0]; |
my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0]; |
if ($browser) { |
if ($browser) { |
Line 2595 sub submlink {
|
Line 2596 sub submlink {
|
my ($text,$uname,$udom,$symb,$target)=@_; |
my ($text,$uname,$udom,$symb,$target)=@_; |
if (!($uname && $udom)) { |
if (!($uname && $udom)) { |
(my $cursymb, my $courseid,$udom,$uname)= |
(my $cursymb, my $courseid,$udom,$uname)= |
&Apache::lonxml::whichuser($symb); |
&Apache::lonnet::whichuser($symb); |
if (!$symb) { $symb=$cursymb; } |
if (!$symb) { $symb=$cursymb; } |
} |
} |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
Line 2641 sub pprmlink {
|
Line 2642 sub pprmlink {
|
my ($text,$uname,$udom,$symb,$target)=@_; |
my ($text,$uname,$udom,$symb,$target)=@_; |
if (!($uname && $udom)) { |
if (!($uname && $udom)) { |
(my $cursymb, my $courseid,$udom,$uname)= |
(my $cursymb, my $courseid,$udom,$uname)= |
&Apache::lonxml::whichuser($symb); |
&Apache::lonnet::whichuser($symb); |
if (!$symb) { $symb=$cursymb; } |
if (!$symb) { $symb=$cursymb; } |
} |
} |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
Line 2853 Inputs:
|
Line 2854 Inputs:
|
=item * $no_inline_link, if true and in remote mode, don't show the |
=item * $no_inline_link, if true and in remote mode, don't show the |
'Switch To Inline Menu' link |
'Switch To Inline Menu' link |
|
|
|
=item * $args, optional argument valid values are |
|
no_auto_mt_title -> prevents &mt()ing the title arg |
|
|
=back |
=back |
|
|
Returns: A uniform header for LON-CAPA web pages. |
Returns: A uniform header for LON-CAPA web pages. |
Line 2864 other decorations will be returned.
|
Line 2868 other decorations will be returned.
|
|
|
sub bodytag { |
sub bodytag { |
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle, |
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle, |
$notopbar,$bgcolor,$notitle,$no_inline_link)=@_; |
$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_; |
|
|
$title=&mt($title); |
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); } |
|
|
$function = &get_users_function() if (!$function); |
$function = &get_users_function() if (!$function); |
my $img = &designparm($function.'.img',$domain); |
my $img = &designparm($function.'.img',$domain); |
Line 3199 form, .inline { display: inline; }
|
Line 3203 form, .inline { display: inline; }
|
color: red; |
color: red; |
font-size: larger; |
font-size: larger; |
} |
} |
.LC_warning { |
.LC_warning, |
|
.LC_diff_removed { |
color: red; |
color: red; |
} |
} |
.LC_success { |
.LC_success, |
|
.LC_diff_added { |
color: green; |
color: green; |
} |
} |
.LC_icon { |
.LC_icon { |
border: 0px; |
border: 0px; |
} |
} |
|
|
|
table.LC_pastsubmission { |
|
border: 1px solid black; |
|
margin: 2px; |
|
} |
|
|
table#LC_top_nav, table#LC_menubuttons { |
table#LC_top_nav, table#LC_menubuttons { |
width: 100%; |
width: 100%; |
background: $pgbg; |
background: $pgbg; |
Line 3377 table.LC_whatsnew tr.LC_empty_row td {
|
Line 3388 table.LC_whatsnew tr.LC_empty_row td {
|
text-align: center; |
text-align: center; |
padding: 8px; |
padding: 8px; |
} |
} |
|
table.LC_whatsnew tr.LC_empty_row td { |
|
padding: 4ex |
|
} |
|
|
|
|
table.LC_whatsnew { |
table.LC_whatsnew { |
} |
} |
Line 3499 table#LC_browser tr.LC_browser_file_unpu
|
Line 3514 table#LC_browser tr.LC_browser_file_unpu
|
table#LC_browser tr.LC_browser_file_obsolete { |
table#LC_browser tr.LC_browser_file_obsolete { |
background: #AAAAAA; |
background: #AAAAAA; |
} |
} |
table#LC_browser tr.LC_browser_file_modified { |
table#LC_browser tr.LC_browser_file_modified, |
|
table#LC_browser tr.LC_browser_file_metamodified { |
background: #FFFF77; |
background: #FFFF77; |
} |
} |
table#LC_browser tr.LC_browser_folder { |
table#LC_browser tr.LC_browser_folder { |
Line 3714 Inputs: $title - optional title for the
|
Line 3730 Inputs: $title - optional title for the
|
domain |
domain |
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 |
|
no_auto_mt_title |
|
-> prevent &mt()ing the title arg |
|
|
=back |
=back |
|
|
Line 3726 sub headtag {
|
Line 3744 sub headtag {
|
my $domain = $args->{'domain'} || &determinedomain(); |
my $domain = $args->{'domain'} || &determinedomain(); |
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'}, |
#time(), |
|
$Apache::lonnet::perlvar{'lonVersion'}, |
$Apache::lonnet::perlvar{'lonVersion'}, |
|
#time(), |
$env{'environment.color.timestamp'}, |
$env{'environment.color.timestamp'}, |
$function,$domain,$bgcolor); |
$function,$domain,$bgcolor); |
|
|
Line 3735 sub headtag {
|
Line 3753 sub headtag {
|
|
|
my $result = |
my $result = |
'<head>'. |
'<head>'. |
&font_settings(). |
&font_settings(); |
&Apache::lonhtmlcommon::htmlareaheaders(); |
|
|
|
|
if (!$args->{'frameset'}) { |
|
$result .= &Apache::lonhtmlcommon::htmlareaheaders(); |
|
} |
if ($args->{'force_register'}) { |
if ($args->{'force_register'}) { |
$result .= &Apache::lonmenu::registerurl(1); |
$result .= &Apache::lonmenu::registerurl(1); |
} |
} |
Line 3761 ADDMETA
|
Line 3781 ADDMETA
|
if (!defined($title)) { |
if (!defined($title)) { |
$title = 'The LearningOnline Network with CAPA'; |
$title = 'The LearningOnline Network with CAPA'; |
} |
} |
|
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); } |
$result .= '<title> LON-CAPA '.&mt($title).'</title>' |
$result .= '<title> LON-CAPA '.$title.'</title>' |
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />' |
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />' |
.$head_extra; |
.$head_extra; |
return $result; |
return $result; |
Line 3906 Inputs: $title - optional title for the
|
Line 3926 Inputs: $title - optional title for the
|
no_inline_link -> if true and in remote mode, don't show the |
no_inline_link -> if true and in remote mode, don't show the |
'Switch To Inline Menu' link |
'Switch To Inline Menu' link |
|
|
|
no_auto_mt_title -> prevent &mt()ing the title arg |
|
|
=back |
=back |
|
|
=cut |
=cut |
Line 3915 sub start_page {
|
Line 3937 sub start_page {
|
#&Apache::lonnet::logthis("start_page ".join(':',caller(0))); |
#&Apache::lonnet::logthis("start_page ".join(':',caller(0))); |
my %head_args; |
my %head_args; |
foreach my $arg ('redirect','force_register','domain','function', |
foreach my $arg ('redirect','force_register','domain','function', |
'bgcolor','frameset','no_nav_bar','only_body') { |
'bgcolor','frameset','no_nav_bar','only_body', |
|
'no_auto_mt_title') { |
if (defined($args->{$arg})) { |
if (defined($args->{$arg})) { |
$head_args{$arg} = $args->{$arg}; |
$head_args{$arg} = $args->{$arg}; |
} |
} |
Line 3941 sub start_page {
|
Line 3964 sub start_page {
|
$args->{'only_body'}, $args->{'domain'}, |
$args->{'only_body'}, $args->{'domain'}, |
$args->{'force_register'}, $args->{'body_title'}, |
$args->{'force_register'}, $args->{'body_title'}, |
$args->{'no_nav_bar'}, $args->{'bgcolor'}, |
$args->{'no_nav_bar'}, $args->{'bgcolor'}, |
$args->{'no_title'}, $args->{'no_inline_link'}); |
$args->{'no_title'}, $args->{'no_inline_link'}, |
|
$args); |
} |
} |
} |
} |
|
|
Line 4657 sub get_env_multiple {
|
Line 4681 sub get_env_multiple {
|
|
|
=pod |
=pod |
|
|
=back |
=back |
|
|
=head1 CSV Upload/Handling functions |
=head1 CSV Upload/Handling functions |
|
|
Line 5950 sub lonhttpdurl {
|
Line 5974 sub lonhttpdurl {
|
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url; |
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url; |
} |
} |
|
|
sub absolute_url { |
|
my ($host_name) = @_; |
|
my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://'); |
|
if ($host_name eq '') { |
|
$host_name = $ENV{'SERVER_NAME'}; |
|
} |
|
return $protocol.$host_name; |
|
} |
|
|
|
sub connection_aborted { |
sub connection_aborted { |
my ($r)=@_; |
my ($r)=@_; |
$r->print(" ");$r->rflush(); |
$r->print(" ");$r->rflush(); |
Line 5991 sub escape_url {
|
Line 6006 sub escape_url {
|
my $lastitem = &escape(pop(@urlslices)); |
my $lastitem = &escape(pop(@urlslices)); |
return join('/',@urlslices).'/'.$lastitem; |
return join('/',@urlslices).'/'.$lastitem; |
} |
} |
|
|
|
# -------------------------------------------------------- Initliaze user login |
|
sub init_user_environment { |
|
my ($r, $username, $domain, $authhost, $form, $args) = @_; |
|
my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'}; |
|
|
|
my $public=($username eq 'public' && $domain eq 'public'); |
|
|
|
# See if old ID present, if so, remove |
|
|
|
my ($filename,$cookie,$userroles); |
|
my $now=time; |
|
|
|
if ($public) { |
|
my $max_public=100; |
|
my $oldest; |
|
my $oldest_time=0; |
|
for(my $next=1;$next<=$max_public;$next++) { |
|
if (-e $lonids."/publicuser_$next.id") { |
|
my $mtime=(stat($lonids."/publicuser_$next.id"))[9]; |
|
if ($mtime<$oldest_time || !$oldest_time) { |
|
$oldest_time=$mtime; |
|
$oldest=$next; |
|
} |
|
} else { |
|
$cookie="publicuser_$next"; |
|
last; |
|
} |
|
} |
|
if (!$cookie) { $cookie="publicuser_$oldest"; } |
|
} else { |
|
# if this isn't a robot, kill any existing non-robot sessions |
|
if (!$args->{'robot'}) { |
|
opendir(DIR,$lonids); |
|
while ($filename=readdir(DIR)) { |
|
if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) { |
|
unlink($lonids.'/'.$filename); |
|
} |
|
} |
|
closedir(DIR); |
|
} |
|
# Give them a new cookie |
|
my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'} |
|
: $now); |
|
$cookie="$username\_$id\_$domain\_$authhost"; |
|
|
|
# Initialize roles |
|
|
|
$userroles=&Apache::lonnet::rolesinit($domain,$username,$authhost); |
|
} |
|
# ------------------------------------ Check browser type and MathML capability |
|
|
|
my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
|
$clientunicode,$clientos) = &decode_user_agent($r); |
|
|
|
# -------------------------------------- Any accessibility options to remember? |
|
if (($form->{'interface'}) && ($form->{'remember'} eq 'true')) { |
|
foreach my $option ('imagesuppress','appletsuppress', |
|
'embedsuppress','fontenhance','blackwhite') { |
|
if ($form->{$option} eq 'true') { |
|
&Apache::lonnet::put('environment',{$option => 'on'}, |
|
$domain,$username); |
|
} else { |
|
&Apache::lonnet::del('environment',[$option], |
|
$domain,$username); |
|
} |
|
} |
|
} |
|
# ------------------------------------------------------------- Get environment |
|
|
|
my %userenv = &Apache::lonnet::dump('environment',$domain,$username); |
|
my ($tmp) = keys(%userenv); |
|
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
|
# default remote control to off |
|
if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; } |
|
} else { |
|
undef(%userenv); |
|
} |
|
if (($userenv{'interface'}) && (!$form->{'interface'})) { |
|
$form->{'interface'}=$userenv{'interface'}; |
|
} |
|
$env{'environment.remote'}=$userenv{'remote'}; |
|
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; } |
|
|
|
# --------------- Do not trust query string to be put directly into environment |
|
foreach my $option ('imagesuppress','appletsuppress', |
|
'embedsuppress','fontenhance','blackwhite', |
|
'interface','localpath','localres') { |
|
$form->{$option}=~s/[\n\r\=]//gs; |
|
} |
|
# --------------------------------------------------------- Write first profile |
|
|
|
{ |
|
my %initial_env = |
|
("user.name" => $username, |
|
"user.domain" => $domain, |
|
"user.home" => $authhost, |
|
"browser.type" => $clientbrowser, |
|
"browser.version" => $clientversion, |
|
"browser.mathml" => $clientmathml, |
|
"browser.unicode" => $clientunicode, |
|
"browser.os" => $clientos, |
|
"server.domain" => $Apache::lonnet::perlvar{'lonDefDomain'}, |
|
"request.course.fn" => '', |
|
"request.course.uri" => '', |
|
"request.course.sec" => '', |
|
"request.role" => 'cm', |
|
"request.role.adv" => $env{'user.adv'}, |
|
"request.host" => $ENV{'REMOTE_ADDR'},); |
|
|
|
if ($form->{'localpath'}) { |
|
$initial_env{"browser.localpath"} = $form->{'localpath'}; |
|
$initial_env{"browser.localres"} = $form->{'localres'}; |
|
} |
|
|
|
if ($public) { |
|
$initial_env{"environment.remote"} = "off"; |
|
} |
|
if ($form->{'interface'}) { |
|
$form->{'interface'}=~s/\W//gs; |
|
$initial_env{"browser.interface"} = $form->{'interface'}; |
|
$env{'browser.interface'}=$form->{'interface'}; |
|
foreach my $option ('imagesuppress','appletsuppress', |
|
'embedsuppress','fontenhance','blackwhite') { |
|
if (($form->{$option} eq 'true') || |
|
($userenv{$option} eq 'on')) { |
|
$initial_env{"browser.$option"} = "on"; |
|
} |
|
} |
|
} |
|
|
|
$env{'user.environment'} = "$lonids/$cookie.id"; |
|
|
|
if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id", |
|
&GDBM_WRCREAT(),0640)) { |
|
&_add_to_env(\%disk_env,\%initial_env); |
|
&_add_to_env(\%disk_env,\%userenv,'environment.'); |
|
&_add_to_env(\%disk_env,$userroles); |
|
if (ref($args->{'extra_env'})) { |
|
&_add_to_env(\%disk_env,$args->{'extra_env'}); |
|
} |
|
untie(%disk_env); |
|
} else { |
|
&Apache::lonnet::logthis("<font color=\"blue\">WARNING: ". |
|
'Could not create environment storage in lonauth: '.$!.'</font>'); |
|
return 'error: '.$!; |
|
} |
|
} |
|
$env{'request.role'}='cm'; |
|
$env{'request.role.adv'}=$env{'user.adv'}; |
|
$env{'browser.type'}=$clientbrowser; |
|
|
|
return $cookie; |
|
|
|
} |
|
|
|
sub _add_to_env { |
|
my ($idf,$env_data,$prefix) = @_; |
|
while (my ($key,$value) = each(%$env_data)) { |
|
$idf->{$prefix.$key} = $value; |
|
$env{$prefix.$key} = $value; |
|
} |
|
} |
|
|
|
|
=pod |
=pod |
|
|
=back |
=back |