Fixed rewriting rules for directory indexes.

[www.jankratochvil.net.git] / project / Lib.pm

diff --git a/project/Lib.pm b/project/Lib.pm
index e48b92a..c89683a 100644 (file)
--- a/project/Lib.pm
+++ b/project/Lib.pm
@@ -24,7 +24,6 @@ use strict;
 use warnings;
 
 use My::Web;
-require CGI;
 use Carp qw(cluck confess);
 
 use Exporter;
@@ -92,14 +91,14 @@ my($class,$ListItem)=@_;
                                                return "Download".$_[0];
                                                },
                                "format"=>sub ($) {
-                                               return a_href($_[0],CGI::escapeHTML(File::Basename::basename($_[0])),"size"=>2);
+                                               return a_href($_[0],escapeHTML(File::Basename::basename($_[0])),"size"=>2);
                                                }},
                {"key"=>qr(^link\b),"text"=>sub ($) {
                                                $_[0]=~s/^link-//;
                                                return $_[0];
                                                },
                                "format"=>sub ($) {
-                                               return($_[0]=~/^<a\b/ ? $_[0] : a_href($_[0],CGI::escapeHTML($_[0])));
+                                               return($_[0]=~/^<a\b/ ? $_[0] : a_href($_[0],escapeHTML($_[0])));
                                                }},
                {"key"=>qr(^cvs\b),"text"=>sub ($) {
                                                $_[0]=~s/^cvs//;
@@ -113,7 +112,7 @@ my($class,$ListItem)=@_;
                                                my $branch="";
                                                $branch=$1 if $val=~s/:(.*)//;
                                                return join("<br />\n\t\t",
-                                                               CGI::escapeHTML("cvs -d ".$W->{"pserver"}.":".$W->{"pserver_path"}." -z3"
+                                                               escapeHTML("cvs -d ".$W->{"pserver"}.":".$W->{"pserver_path"}." -z3"
                                                                                ." checkout".(!$branch ? "" : " -r $branch -kk")
                                                                                .($val!~m#/# ? "" : " -d ".File::Basename::basename($val))
                                                                                ." $val"),
@@ -128,9 +127,9 @@ my($class,$ListItem)=@_;
                {"key"=>"ownership","text"=>"Ownership"},
                {"key"=>"sponsorship","text"=>"Sponsorship"},
                {"key"=>"language","text"=>"Programming language","format"=>sub ($) {
-                               return a_href("http://java.sun.com/",CGI::escapeHTML($_[0]))
+                               return a_href("http://java.sun.com/",escapeHTML($_[0]))
                                                if $_[0]=~/^Java\b/;
-                               return a_href("http://www.php.net/",CGI::escapeHTML($_[0]))
+                               return a_href("http://www.php.net/",escapeHTML($_[0]))
                                                if $_[0]=~/^PHP\b/;
                                return undef();
                                }},
@@ -191,13 +190,11 @@ sub project_arrayref_to_hashref($$)
 {
 my($self,$arrayref)=@_;
 
-       Wuse 'My::Hash::Sub::Readonly';
-       my $r={};
-       tie %$r,"My::Hash::Sub::Readonly",(
-                       @$arrayref,
-                       "keys_array"=>[ hashlikearray_get_keys(@$arrayref) ],
-                       );
-       return $r;
+       Wrequire 'My::Hash';
+       return My::Hash->new({
+               @$arrayref,
+               "keys_array"=>[ hashlikearray_get_keys(@$arrayref) ],
+               },"My::Hash::Sub","My::Hash::Readonly");
 }
 
 sub title ($$)