From 08d60442740531eee8c28e66cd125fe8401e2111 Mon Sep 17 00:00:00 2001 From: uriel Date: Sun, 28 Dec 2008 20:20:48 +0100 Subject: [PATCH] Rename $baseuri to $base_url --- bin/werc.rc | 6 +++--- lib/sitemap.tpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/werc.rc b/bin/werc.rc index 584b6e1..2717409 100755 --- a/bin/werc.rc +++ b/bin/werc.rc @@ -157,7 +157,7 @@ fn select_handler { uri=`{echo $uri | sed 's/index.(rss|atom)$//'} if(~ $#blogDirs 0) blogDirs=$sitedir^'/'$uri - uri=$baseuri$"uri + uri=$base_url$"uri if(~ $REQUEST_URI */index.rss) master_template=feeds/rss20.tpl @@ -170,7 +170,7 @@ fn select_handler { if(~ $#blogDirs 0) blogDirs=`{basename -d $body} - u=`{cleanname $baseuri^`{basename -d '/'^$uri}|sed 's,:/,://,'} # Sed recovers '/' in 'http:/' stripped by cleanname + u=`{cleanname $base_url^`{basename -d '/'^$uri}|sed 's,:/,://,'} # Sed recovers '/' in 'http:/' stripped by cleanname extraHeaders=$"extraHeaders ^ \ ' ' @@ -210,7 +210,7 @@ site=$SERVER_NAME headers=lib/headers.tpl master_template=default_master.tpl sidebar=sidebar -baseuri=http://$site/ +base_url=http://$site/ current_date_time=`{date} for(i in siteTitle siteSubTitle pageTitle extraHeaders) $i = '' diff --git a/lib/sitemap.tpl b/lib/sitemap.tpl index fbd143f..f3336fd 100644 --- a/lib/sitemap.tpl +++ b/lib/sitemap.tpl @@ -47,7 +47,7 @@ fn listDir { desc=' - '$"desc tit=`{echo /$i|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'} echo '
  • '^$"tit^'' $"desc '
  • ' - echo -n $baseuri^$i >> $tmpfile + echo -n $base_url^$i >> $tmpfile if(test -d $i) { echo / >> $tmpfile @{ listDir $i }