shithub: werc

Info  •  Files  •  Log  •  Branches

New req_path var

--- a/bin/controller.rc

+++ b/bin/controller.rc

@@ -247,10 +247,10 @@

         perm_redirect `{ echo $REQUEST_URI | sed 's,/index$,/,' }

     pageTitle=`{echo $args | sed -e 's/ / - /g' -e 's/_/ /g'}

-    body=$uri

+    req_path=$uri

 }

 if not {

-    body='/'

+    req_path='/'

 }

 fpath=$sitedir

@@ -257,7 +257,7 @@

 for (i in ('' $args)) {

     fpath = $fpath/$i

     # We don't want blog settings to cascade into posts, note that we are inBlog instead

-    if (! ~ $#blogDirs 0 && ! ~ $body */index.rss */[bB]log */[bB]log/) {

+    if (! ~ $#blogDirs 0 && ! ~ $req_path */index.rss */[bB]log */[bB]log/) {

         inBlog = $blogDirs

         blogDirs = () 

     }

@@ -290,7 +290,7 @@

 	pageTitle=$"pageTitle^' | '^$"siteTitle^' '^$"siteSubTitle

-body=$sitedir/$body

+body=$sitedir/$req_path

 if (test -d $body) {

     if(! ~ $body */)

     	perm_redirect $REQUEST_URI^'/'