q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New req_path var

Browse source
This commit is contained in:
Uriel 2008-10-21 16:37:16 +02:00
parent 34a99124a9
commit f24f05896d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/controller.rc
View file

@ -247,17 +247,17 @@ if (! ~ $args '') {
perm_redirect `{ echo $REQUEST_URI | sed 's,/index$,/,' } perm_redirect `{ echo $REQUEST_URI | sed 's,/index$,/,' }
pageTitle=`{echo $args | sed -e 's/ / - /g' -e 's/_/ /g'} pageTitle=`{echo $args | sed -e 's/ / - /g' -e 's/_/ /g'}
body=$uri req_path=$uri
} }
if not { if not {
body='/' req_path='/'
} }
fpath=$sitedir fpath=$sitedir
for (i in ('' $args)) { for (i in ('' $args)) {
fpath = $fpath/$i fpath = $fpath/$i
# We don't want blog settings to cascade into posts, note that we are inBlog instead # 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 inBlog = $blogDirs
blogDirs = () blogDirs = ()
} }
@ -290,7 +290,7 @@ if not
pageTitle=$"pageTitle^' | '^$"siteTitle^' '^$"siteSubTitle pageTitle=$"pageTitle^' | '^$"siteTitle^' '^$"siteSubTitle
body=$sitedir/$body body=$sitedir/$req_path
if (test -d $body) { if (test -d $body) {
if(! ~ $body */) if(! ~ $body */)
perm_redirect $REQUEST_URI^'/' perm_redirect $REQUEST_URI^'/'