--- loncom/homework/randomlabel.pm 2001/10/24 19:40:50 1.6 +++ loncom/homework/randomlabel.pm 2001/12/04 15:17:56 1.8 @@ -1,5 +1,30 @@ # The LearningOnline Network with CAPA # random labelling tool +# +# $Id: randomlabel.pm,v 1.8 2001/12/04 15:17:56 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 7/20/2001 Isaac Tsai, initial syntax # 8/10/2001 Isaac Tsai, # 8/30/2001 Isaac Tsai, @@ -49,7 +74,11 @@ sub start_randomlabel { if ( $bgimg !~ /^http:/ ) { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg; $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg); - $bgimg=~s-$Apache::lonnet::perlvar{'lonDocRoot'}--; + if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) { + $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//; + } elsif ($bgimg =~ m:^/home/.*/public_html:) { + $bgimg =~ s:^/home/(.*)/public_html:/~$1:; + } $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg; } my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);