--- loncom/interface/loncommon.pm 2008/12/17 16:07:45 1.722 +++ loncom/interface/loncommon.pm 2008/12/21 22:02:39 1.727 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.722 2008/12/17 16:07:45 harmsja Exp $ +# $Id: loncommon.pm,v 1.727 2008/12/21 22:02:39 riegler Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3168,7 +3168,7 @@ sub relative_to_absolute { } $thisdir=~s-/[^/]*$--; foreach my $link (@rlinks) { - unless (($link=~/^http:\/\//i) || + unless (($link=~/^https?\:\/\//i) || ($link=~/^\//) || ($link=~/^javascript:/i) || ($link=~/^mailto:/i) || @@ -5501,7 +5501,7 @@ h2,h3,h4,h5,h6 } .LC_bgLightGrey{ - background:URL(lonIcons/lightGreyBG.png) repeat-x left top; + background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } .LC_bgLightGreyYellow { background-color:#EFECE0; @@ -5571,7 +5571,7 @@ ol#LC_TabMainMenuContent li { line-height: 140%; font-weight: bold; white-space:nowrap; - background: url(lonIcons/lightGreyBG.png) repeat-x left top; + background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } ol#LC_TabMainMenuContent li a{ @@ -5592,7 +5592,7 @@ ul.LC_TabContent li{ border-right:solid 1px $lg_border_color; padding:5px 10px 5px 10px; margin-right:2px; - background: url(lonIcons/lightGreyBG.png) repeat-x left top; + background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } ul.LC_TabContent li a, ul.LC_TabContent li{ color:rgb(47,47,47); @@ -5615,11 +5615,11 @@ ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcr margin: 0px 0px 30px 0px; padding-left: 10px; list-style-position: inside; - background: url(lonIcons/lightGreyBG.png) repeat-x left top; + background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li { - background: url(lonIcons/arrow_white.png) no-repeat left center; + background: url(/adm/lonIcons/arrow_white.png) no-repeat left center; display: inline; padding: 0px 0px 0px 10px; vertical-align: bottom; @@ -7943,7 +7943,7 @@ sub upfile_select_html { # xml => &mt('HTML/XML'), ); my $Str = ''. - '
Type: '; foreach my $type (sort(keys(%Types))) { $Str .= '\n"; } @@ -9367,7 +9367,9 @@ sub construct_course { 'policy.email', 'comment.email', 'pch.users.denied', - 'plc.users.denied'], + 'plc.users.denied', + 'hidefromcat', + 'categories'], $$crsudom,$$crsunum); } @@ -9825,6 +9827,11 @@ sub init_user_environment { } } + foreach my $tool ('aboutme','blog','portfolio') { + $userenv{'availabletools.'.$tool} = + &Apache::lonnet::usertools_access($username,$domain,$tool,'reload'); + } + $env{'user.environment'} = "$lonids/$cookie.id"; if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id", @@ -9863,7 +9870,7 @@ sub _add_to_env { # --- Get the symbolic name of a problem and the url sub get_symb { my ($request,$silent) = @_; - (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; + (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))); if ($symb eq '') { if (!$silent) {