--- loncom/interface/lonindexer.pm 2013/08/12 19:47:10 1.213.4.6 +++ loncom/interface/lonindexer.pm 2012/08/25 19:22:59 1.217 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.213.4.6 2013/08/12 19:47:10 raeburn Exp $ +# $Id: lonindexer.pm,v 1.217 2012/08/25 19:22:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -92,8 +92,15 @@ sub handler { undef (@Omit); %fieldnames=&Apache::lonmeta::fieldnames(); -# --------------------------------------------------------------- get icon path +# ------------------------------------- read in machine configuration variables my $iconpath= $r->dir_config('lonIconsURL') . "/"; + my $domain = $r->dir_config('lonDefDomain'); + my $role = $r->dir_config('lonRole'); + my $loadlim = $r->dir_config('lonLoadLim'); + my $servadm = $r->dir_config('lonAdmEMail'); + my $sysadm = $r->dir_config('lonSysEMail'); + my $lonhost = $r->dir_config('lonHostID'); + my $tabdir = $r->dir_config('lonTabDir'); #SB my $fileclr='#ffffe6'; my $line; @@ -1341,18 +1348,15 @@ sub coursecontext { my $filesymb=&Apache::lonnet::symbread($filelink); if ($filesymb) { my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb); - $r->print( - &mt('Already in this course:').'
' - .&mt('[_1] in folder/map [_2]', - &Apache::lonnet::gettitle($resource), - &Apache::lonnet::gettitle($map)) - .'
'); + $r->print(&mt('Already in this course:
[_1] in folder/map [_2].
', + &Apache::lonnet::gettitle($resource), + &Apache::lonnet::gettitle($map))); } } sub showpreview { my ($filelink)=@_; - if ($filelink=~m-^(/ext/|https?://)-) { + if ($filelink=~m-^(/ext/|http://)-) { return &mt('External Resource, preview not enabled'); } my ($curfext)=($filelink=~/\.(\w+)$/);