4 files changed, 5 insertions, 5 deletions
diff --git a/gorillanest b/gorillanest
index ea85128..2d26d7f 100755
--- a/gorillanest
+++ b/gorillanest
@@ -81,7 +81,7 @@ try {
         if ($method eq 'HEAD') {
             $head = 1;
         } elsif ($method eq 'GET') {
-            ($data{username}, $data{repository}) = $uri =~ m{/([a-zA-Z0-9_]+?)/(?:([a-zA-Z0-9_.]+))?}; # [[:alnum:]] didn't work
+            ($data{username}, $data{repository}) = $uri =~ m{^/([a-zA-Z0-9_]+)(?:/([a-zA-Z0-9_\.]+))?$}; # [[:alnum:]] didn't work
             info("name:", $data{username} || '', "repo:", $data{repository} || '');
             if ($uri eq '/') {
                 %data = %{GN::index($public, \%data)};
diff --git a/template/index.tt b/template/index.tt
index a2048a7..6c018d8 100644
--- a/template/index.tt
+++ b/template/index.tt
@@ -5,7 +5,7 @@
 <body>
 <h1>[% title %]</h1>
 <h2>[% description %]</h2>
-<ul>[% FOR i IN directories %]<li><a href="/[% i %]/">/[% i %]</a></li>[% END %]</ul>
+<ul>[% FOR i IN directories %]<li><a href="/[% i %]">/[% i %]</a></li>[% END %]</ul>
 </body>
 [% INCLUDE foot.tt %]
 </html>
diff --git a/template/index_user.tt b/template/index_user.tt
index e27fb35..908acc7 100644
--- a/template/index_user.tt
+++ b/template/index_user.tt
@@ -1,9 +1,9 @@
 <html>
-[% title = "${name} Index" %]
+[% title = "${username} Index" %]
 [% INCLUDE head.tt %]
 <body>
 <h1>[% title %]</h1>
-<ul>[% FOR i IN directories %]<li><a href="/[% name %]/[% i %]">/[% name %]/[% i %]</a></li>[% END %]</ul>
+<ul>[% FOR i IN directories %]<li><a href="/[% username %]/[% i %]">/[% username %]/[% i %]</a></li>[% END %]</ul>
 </body>
 [% INCLUDE foot.tt %]
 </html>
diff --git a/template/repository.tt b/template/repository.tt
index f11849a..c437075 100644
--- a/template/repository.tt
+++ b/template/repository.tt
@@ -1,5 +1,5 @@
 <html>
-[% title = "/${name}/${repository}" %]
+[% title = "/${username}/${repository}" %]
 [% INCLUDE head.tt %]
 <body>
   <h1>[% title %]</h1>