qbit/werc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename $baseuri to $base_url

Browse Source
This commit is contained in:
uriel 2008-12-28 20:20:48 +01:00
parent cfd4940d06
commit 08d6044274
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/werc.rc
View File

@ -157,7 +157,7 @@ fn select_handler {
uri=`{echo $uri | sed 's/index.(rss|atom)$//'} uri=`{echo $uri | sed 's/index.(rss|atom)$//'}
if(~ $#blogDirs 0) if(~ $#blogDirs 0)
blogDirs=$sitedir^'/'$uri blogDirs=$sitedir^'/'$uri
uri=$baseuri$"uri uri=$base_url$"uri
if(~ $REQUEST_URI */index.rss) if(~ $REQUEST_URI */index.rss)
master_template=feeds/rss20.tpl master_template=feeds/rss20.tpl
@ -170,7 +170,7 @@ fn select_handler {
if(~ $#blogDirs 0) if(~ $#blogDirs 0)
blogDirs=`{basename -d $body} 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 ^ \ extraHeaders=$"extraHeaders ^ \
'<link rel="alternate" type="application/rss+xml" title="RSS" href="'$"u'/index.rss" /> '<link rel="alternate" type="application/rss+xml" title="RSS" href="'$"u'/index.rss" />
<link rel="alternate" type="application/atom+xml" title="ATOM" href="'$"u'/index.atom" />' <link rel="alternate" type="application/atom+xml" title="ATOM" href="'$"u'/index.atom" />'
@ -210,7 +210,7 @@ site=$SERVER_NAME
headers=lib/headers.tpl headers=lib/headers.tpl
master_template=default_master.tpl master_template=default_master.tpl
sidebar=sidebar sidebar=sidebar
baseuri=http://$site/ base_url=http://$site/
current_date_time=`{date} current_date_time=`{date}
for(i in siteTitle siteSubTitle pageTitle extraHeaders) for(i in siteTitle siteSubTitle pageTitle extraHeaders)
$i = '' $i = ''

2
lib/sitemap.tpl
View File

@ -47,7 +47,7 @@ fn listDir {
desc=' - '$"desc desc=' - '$"desc
tit=`{echo /$i|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'} tit=`{echo /$i|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'}
echo '<li><a href="/'$i'">'^$"tit^'</a>' $"desc '</li>' echo '<li><a href="/'$i'">'^$"tit^'</a>' $"desc '</li>'
echo -n $baseuri^$i >> $tmpfile echo -n $base_url^$i >> $tmpfile
if(test -d $i) { if(test -d $i) {
echo / >> $tmpfile echo / >> $tmpfile
@{ listDir $i } @{ listDir $i }