--- loncom/interface/lonhelper.pm 2004/08/12 05:44:36 1.85
+++ loncom/interface/lonhelper.pm 2004/10/07 22:12:47 1.88
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.85 2004/08/12 05:44:36 albertel Exp $
+# $Id: lonhelper.pm,v 1.88 2004/10/07 22:12:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1174,6 +1174,13 @@ sub end_choice {
return '';
}
+{
+ # used to generate unique id attributes for tags.
+ # internal use only.
+ my $id = 0;
+ sub new_id { return $id++; }
+}
+
sub render {
my $self = shift;
my $var = $self->{'variable'};
@@ -1256,6 +1263,7 @@ BUTTONS
my $type = "radio";
if ($self->{'multichoice'}) { $type = 'checkbox'; }
foreach my $choice (@{$self->{CHOICES}}) {
+ my $id = &new_id();
$result .= "
\n | \n";
$result .= " tags.
+ # internal use only.
+ my $id=0;
+ sub new_id { return $id++;}
+}
+
sub render {
my $self = shift;
my $result = '';
@@ -2513,14 +2530,16 @@ BUTTONS
if ($status eq 'Published' && $helper->{VARS}->{'construction'}) {
$onclick = 'onclick="a=1" ';
}
+ my $id = &new_id();
$result .= ' |
" .
"&"').
+ . ".forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,'<>&"').
"'";
if (!$self->{'multichoice'} && $choices == 0) {
$result .= ' checked';
}
- $result .= "/> | " . $file . " | " .
+ $result .= "/>".
+ qq{ | " .
"$title | " .
"$status | " . "
\n";
$choices++;
@@ -2548,10 +2567,14 @@ sub fileState {
my $constructionSpaceDir = shift;
my $file = shift;
+ my ($uname,$udom)=($ENV{'user.name'},$ENV{'user.domain'});
+ if ($ENV{'request.role'}=~/^ca\./) {
+ (undef,$udom,$uname)=split(/\//,$ENV{'request.role'});
+ }
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $subdirpart = $constructionSpaceDir;
- $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
- my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+ $subdirpart =~ s/^\/home\/$uname\/public_html//;
+ my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
$subdirpart;
my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
@@ -3124,7 +3147,6 @@ sub render {
my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
my $title = $res->compTitle();
$symb = $res->symb();
- $navmap->untieHashes();
$resourceString .= ''.&mt('for the map named [_1]',"$title").'';
$level = 8;
$affectedResourceId = $vars->{RESOURCE_ID};
@@ -3134,7 +3156,6 @@ sub render {
my $res = $navmap->getById($vars->{RESOURCE_ID});
$symb = $res->symb();
my $title = $res->compTitle();
- $navmap->untieHashes();
$resourceString .= ''.&mt('for the resource named [_1]',"$title").'';
$level = 7;
$affectedResourceId = $vars->{RESOURCE_ID};