version 1.96, 2008/11/18 19:14:28
|
version 1.97, 2008/12/19 14:28:14
|
Line 320 sub displayfoils {
|
Line 320 sub displayfoils {
|
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( ($target eq 'web' || $target eq 'answer') |
if ( ($target eq 'web' || $target eq 'answer') |
&& $image !~ /^http:/ ) { |
&& $image !~ /^https?\:/ ) { |
$image=&clean_up_image($image); |
$image=&clean_up_image($image); |
} |
} |
push(@images,$image); |
push(@images,$image); |
Line 386 sub display_answers {
|
Line 386 sub display_answers {
|
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( ($target eq 'web' || $target eq 'answer') |
if ( ($target eq 'web' || $target eq 'answer') |
&& $image !~ /^http:/ ) { |
&& $image !~ /^https?\:/ ) { |
$image = &clean_up_image($image); |
$image = &clean_up_image($image); |
} |
} |
my $token=&prep_image($image,'answeronly',$name); |
my $token=&prep_image($image,'answeronly',$name); |
Line 401 sub clean_up_image {
|
Line 401 sub clean_up_image {
|
my ($image)=@_; |
my ($image)=@_; |
if ($image =~ /\s*<img\s*/) { |
if ($image =~ /\s*<img\s*/) { |
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i); |
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i); |
if ($image !~ /^http:/) { |
if ($image !~ /^https?\:/) { |
$image=&Apache::lonnet::hreflocation('',$image); |
$image=&Apache::lonnet::hreflocation('',$image); |
} |
} |
if (!$image) { |
if (!$image) { |