version 1.199, 2005/06/27 21:40:39
|
version 1.207, 2006/01/24 22:09:36
|
Line 355 sub hiddenfield {
|
Line 355 sub hiddenfield {
|
|
|
sub checkbox { |
sub checkbox { |
my ($name,$text)=@_; |
my ($name,$text)=@_; |
return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text); |
return "\n<br /><label><input type='checkbox' name='$name' /> ". |
|
&mt($text)."</label>"; |
} |
} |
|
|
sub selectbox { |
sub selectbox { |
Line 507 sub get_subscribed_hosts {
|
Line 508 sub get_subscribed_hosts {
|
if ( $sh=Apache::File->new("$target.subscription") ) { |
if ( $sh=Apache::File->new("$target.subscription") ) { |
&Apache::lonnet::logthis("opened $target.subscription"); |
&Apache::lonnet::logthis("opened $target.subscription"); |
while (my $subline=<$sh>) { |
while (my $subline=<$sh>) { |
&Apache::lonnet::logthis("Trying $subline"); |
|
if ($subline =~ /(^\w+):/) { |
if ($subline =~ /(^\w+):/) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
push(@subscribed,$1); |
push(@subscribed,$1); |
Line 547 sub get_max_ids_indices {
|
Line 547 sub get_max_ids_indices {
|
my %duplicatedids; |
my %duplicatedids; |
|
|
my $parser=HTML::LCParser->new($content); |
my $parser=HTML::LCParser->new($content); |
|
$parser->xml_mode(1); |
my $token; |
my $token; |
while ($token=$parser->get_token) { |
while ($token=$parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
Line 676 sub fix_ids_and_indices {
|
Line 677 sub fix_ids_and_indices {
|
$allow{$token->[2]->{'src'}}=1; |
$allow{$token->[2]->{'src'}}=1; |
next; |
next; |
} |
} |
|
if ($lctag eq 'base') { next; } |
my %parms=%{$token->[2]}; |
my %parms=%{$token->[2]}; |
$counter=$addid{$tag}; |
$counter=$addid{$tag}; |
if (!$counter) { $counter=$addid{$lctag}; } |
if (!$counter) { $counter=$addid{$lctag}; } |
Line 685 sub fix_ids_and_indices {
|
Line 687 sub fix_ids_and_indices {
|
$parms{'id'}!~/^\s*$/) { |
$parms{'id'}!~/^\s*$/) { |
$maxid++; |
$maxid++; |
$parms{'id'}=$maxid; |
$parms{'id'}=$maxid; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
print $logfile 'ID(new) : '.$tag.':'.$maxid."\n"; |
|
} else { |
|
print $logfile 'ID(kept): '.$tag.':'.$parms{'id'}."\n"; |
} |
} |
} elsif ($counter eq 'index') { |
} elsif ($counter eq 'index') { |
unless (defined($parms{'index'}) && |
unless (defined($parms{'index'}) && |
Line 696 sub fix_ids_and_indices {
|
Line 700 sub fix_ids_and_indices {
|
} |
} |
} |
} |
} |
} |
foreach my $type ('src','href','background','bgimg') { |
unless ($parms{'type'} eq 'zombie') { |
foreach my $key (keys(%parms)) { |
foreach my $type ('src','href','background','bgimg') { |
if ($key =~ /^$type$/i) { |
foreach my $key (keys(%parms)) { |
$parms{$key}=&set_allow(\%allow,$logfile, |
if ($key =~ /^$type$/i) { |
$target,$tag, |
$parms{$key}=&set_allow(\%allow,$logfile, |
$parms{$key}); |
$target,$tag, |
|
$parms{$key}); |
|
} |
} |
} |
} |
} |
} |
} |
Line 1312 END
|
Line 1318 END
|
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
my $uctitle=&mt('Obsolete'); |
my $uctitle=&mt('Obsolete'); |
$intr_scrout.= |
$intr_scrout.= |
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
"\n<p><label><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
'</b></font> <input type="checkbox" name="obsolete" '; |
'</b></font> <input type="checkbox" name="obsolete" '; |
if ($metadatafields{'obsolete'}) { |
if ($metadatafields{'obsolete'}) { |
$intr_scrout.=' checked="1" '; |
$intr_scrout.=' checked="1" '; |
} |
} |
$intr_scrout.='/ ></p>'. |
$intr_scrout.='/ ></label></p>'. |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
'obsoletereplacement', |
'obsoletereplacement', |
$metadatafields{'obsoletereplacement'}); |
$metadatafields{'obsoletereplacement'}); |
Line 1779 sub publishdirectory {
|
Line 1785 sub publishdirectory {
|
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('forceobsolete','make file(s) obsolete'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
} else { |
} else { |
Line 2003 sub handler {
|
Line 2009 sub handler {
|
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
unless ($env{'form.phase'} eq 'two') { |
|
|
|
# -------------------------------- File is there and owned, init lookup tables. |
# -------------------------------- File is there and owned, init lookup tables. |
|
|
%addid=(); |
%addid=(); |
|
|
{ |
{ |
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab'); |
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab'); |
while (<$fh>=~/(\w+)\s+(\w+)/) { |
while (<$fh>=~/(\w+)\s+(\w+)/) { |
$addid{$1}=$2; |
$addid{$1}=$2; |
} |
|
} |
} |
|
} |
|
|
%nokey=(); |
%nokey=(); |
|
|
{ |
{ |
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab'); |
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab'); |
while (<$fh>) { |
while (<$fh>) { |
my $word=$_; |
my $word=$_; |
chomp($word); |
chomp($word); |
$nokey{$word}=1; |
$nokey{$word}=1; |
} |
|
} |
} |
|
|
} |
} |
|
|
# ---------------------------------------------------------- Start page output. |
# ---------------------------------------------------------- Start page output. |
Line 2067 sub handler {
|
Line 2069 sub handler {
|
$thisfn=~/\.(\w+)$/; |
$thisfn=~/\.(\w+)$/; |
my $thistype=$1; |
my $thistype=$1; |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
|
if ($thistype eq 'page') { $thisembstyle = 'rat'; } |
$r->print('<h2>'.&mt('Publishing').' '. |
$r->print('<h2>'.&mt('Publishing').' '. |
&Apache::loncommon::filedescription($thistype).' <tt>'); |
&Apache::loncommon::filedescription($thistype).' <tt>'); |
|
|