[Rt-commit] [svn] r817 - in RTx-Atom: . html/Atom/0.3 html/Atom/0.3/NoAuth html/Atom/0.3/Search

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Mon May  3 10:59:09 2004
New Revision: 817

Modified:
   RTx-Atom/   (props changed)
   RTx-Atom/html/Atom/0.3/NoAuth/autohandler
   RTx-Atom/html/Atom/0.3/Search/index
   RTx-Atom/html/Atom/0.3/autohandler
   RTx-Atom/html/Atom/0.3/dhandler
   RTx-Atom/html/Atom/0.3/index
Log:
 ----------------------------------------------------------------------
 r4421 at not:  autrijus | 2004-05-03T14:42:58.677472Z
 
 * Correct content type handling for noauth files.
 ----------------------------------------------------------------------
 r4422 at not:  autrijus | 2004-05-03T14:47:17.759302Z
 
 * Do not bother to probe introspection if type is empty.
 
 ----------------------------------------------------------------------
 r4423 at not:  autrijus | 2004-05-03T14:58:39.285594Z
 
 * fix URI displays.
 ----------------------------------------------------------------------


Modified: RTx-Atom/html/Atom/0.3/NoAuth/autohandler
==============================================================================
--- RTx-Atom/html/Atom/0.3/NoAuth/autohandler	(original)
+++ RTx-Atom/html/Atom/0.3/NoAuth/autohandler	Mon May  3 10:59:09 2004
@@ -1,4 +1,10 @@
-% $m->call_next;
+<%INIT>
+my $path = $m->base_comp->path;
+$r->content_type('text/css') if $path =~ /\.css$/i;
+$r->content_type('text/xml') if $path =~ /\.xsl$/i;
+$r->content_type('image/png') if $path =~ /\.png$/i;
+$m->call_next;
+</%INIT>
 <%FLAGS>
 inherit	=> undef
 </%FLAGS>

Modified: RTx-Atom/html/Atom/0.3/Search/index
==============================================================================
--- RTx-Atom/html/Atom/0.3/Search/index	(original)
+++ RTx-Atom/html/Atom/0.3/Search/index	Mon May  3 10:59:09 2004
@@ -29,9 +29,9 @@
     <summary mode="escaped"><% $entry->{Description} %></summary>
     <issued><% $entry->{Created} %></issued>
     <modified><% $entry->{LastUpdated} %></modified>
-    <id><% $entry->{URI} %></id>
-% if ($entry->{HTML_URL}) {
-    <& $Link, Type => 'text/html', URI => "$RT::WebURL$entry->{HTML_URL}", Title => $entry->{Name} &>
+    <id><% $entry->{URI} |u %></id>
+% if ($entry->{HTML_URI}) {
+    <& $Link, Type => 'text/html', URI => "$RT::WebURL$entry->{HTML_URI}", Title => $entry->{Name} &>
 % }
   </entry>
 % }

Modified: RTx-Atom/html/Atom/0.3/autohandler
==============================================================================
--- RTx-Atom/html/Atom/0.3/autohandler	(original)
+++ RTx-Atom/html/Atom/0.3/autohandler	Mon May  3 10:59:09 2004
@@ -1,15 +1,8 @@
 %# Forbid direct access in this directory -- everything goes thru dhandler
-% # If it's a noauth file, don't ask for auth.
-% my $path = $m->base_comp->path;
-% if ($path =~ $RT::WebNoAuthRegex ) {
-%     $r->content_type('text/css') if $path =~ /\.css$/i;
-%     $r->content_type('text/xml') if $path =~ /\.xsl$/i;
-%     $r->content_type('image/png') if $path =~ /\.png$/i;
-%     $m->call_next(%ARGS);
-%     $m->abort();
-% }
-% $r->content_type('text/html; charset=utf-8');
-% $m->abort(403);
-<%flags>
+<%INIT>
+$r->content_type('text/html; charset=utf-8');
+$m->abort(403);
+</%INIT>
+<%FLAGS>
 inherit	=> undef
-</%flags>
+</%FLAGS>

Modified: RTx-Atom/html/Atom/0.3/dhandler
==============================================================================
--- RTx-Atom/html/Atom/0.3/dhandler	(original)
+++ RTx-Atom/html/Atom/0.3/dhandler	Mon May  3 10:59:09 2004
@@ -163,7 +163,7 @@
     $verb = 'Update' if $verb eq 'Add';
 }
 
-my $map = $m->comp('Elements/Introspect', Want => 'CollectionToClass');
+my $map = $m->comp('Elements/Introspect', Want => 'CollectionToClass') if $type;
 my $class;
 foreach my $key (keys %$map) {
     $key =~ /\b\Q$type\E$/ or next;
@@ -172,7 +172,7 @@
     last;
 }
 
-if (!$class) {
+if (!$class and $type) {
     $map = $m->comp('Elements/Introspect', Want => 'RecordToCollection');
 
     foreach my $key (keys %$map) {

Modified: RTx-Atom/html/Atom/0.3/index
==============================================================================
--- RTx-Atom/html/Atom/0.3/index	(original)
+++ RTx-Atom/html/Atom/0.3/index	Mon May  3 10:59:09 2004
@@ -7,7 +7,7 @@
     <name><% $RT::Organization %></name>
     <url><% $RT::WebURL %></url>
   </author>
-  <id><% $RT::rtname %></id>
+  <id><% $RT::SystemUser->UserObj->URI |u %></id>
   <& $Link, Type => 'text/html', URI => $RT::WebURL, Title => loc("Homepage") &>
 % foreach my $type (@{$m->comp('Elements/Introspect', Want => 'TopLevelCollections')}) {
   <& $Link, Relation => 'service.feed', URI => "$BaseURI/$type", Title => loc($type), IsEntry => 1 &>