diff --git a/apps/blagh/app.rc b/apps/blagh/app.rc index 8ae26fa..0c11985 100644 --- a/apps/blagh/app.rc +++ b/apps/blagh/app.rc @@ -4,8 +4,13 @@ fn conf_enable_blog { if(~ $#blagh_dirs 0) blagh_dirs=( . ) conf_enable_app blagh + + if(~ $"conf_blog_editors '') + conf_blog_editors=blog-editors + + if(~ $"conf_max_posts_per_page '') + conf_max_posts_per_page=32 } -conf_blog_editors=blog-editors fn blagh_init { if(~ $#blagh_dirs 0 && ~ $req_path */[bB]log/*) { @@ -67,16 +72,18 @@ fn blagh_body { echo '
(RSS Feed|Atom Feed)
' + { # XXX Not sure why this fixes issues with blog setup, probably bug in fltr_cache! for(p in `{get_post_list $blagh_root^$blagh_dirs}) { l=`{echo -n $p|sed 's!'$sitedir^'/?(.*)([0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9])(/[^/]+/)!\2 /\1\2\3!'} sed '1s!.*![&]('^$l(2)^') ('^$l(1)^')!' < $p/index.md + } } | $formatter } fn get_post_list { # /./->/|/ done to sort -t| and order by date # Note: $paths in blagh_dirs should not contain '/./' or '|' - ls -F $*^/./[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]/ >[2]/dev/null | sed -n '/'^$forbidden_uri_chars^'/d; s,/\./,/|/,; /\/$/p' | sort -r '-t|' +1 | sed 's,/+\|/+,/,' + ls -F $*^/./[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]/ >[2]/dev/null | sed -n '/'^$forbidden_uri_chars^'/d; s,/\./,/|/,; /\/$/p' | sort -r '-t|' +1 | sed -e 's,/+\|/+,/,' -e $conf_max_posts_per_page^'q' } fn mkbpost { @@ -114,3 +121,7 @@ fn mkbpost { } status=$_status } + +fn strip_title_from_md_file { + sed '1N; /^.*\n===*$/N; /.*\n===*\n$/d' +} diff --git a/apps/blagh/atom.tpl b/apps/blagh/atom.tpl index 49ecbe1..8a5a08b 100644 --- a/apps/blagh/atom.tpl +++ b/apps/blagh/atom.tpl @@ -14,7 +14,7 @@ fn statpost { #mdate=`{/bin/date -Rd `{mtime $f|awk '{print $1}' }} # Not used because it is unreliable by=$stat(2) #ifs=() { summary=`{cat $f/index.md | crop_text 1024 ... | $formatter } } - ifs=() { summary=`{cat $f/index.md | ifs=$difs {$formatter} } } + ifs=() { summary=`{cat $f/index.md | strip_title_from_md_file | ifs=$difs {$formatter} } } } updated = `{/bin/date --rfc-3339'=seconds' |sed 's/ /T/'} %} diff --git a/apps/blagh/rss20.tpl b/apps/blagh/rss20.tpl index 141e891..6a1ed58 100644 --- a/apps/blagh/rss20.tpl +++ b/apps/blagh/rss20.tpl @@ -13,7 +13,7 @@ fn statpost { #mdate=`{/bin/date -Rd $stat(1)} # Not used because it is unreliable post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!'}}^'/' by=$stat(2) - ifs=() {summary=`{ cat $f/index.md | ifs=$difs {$formatter | escape_html} }} + ifs=() {summary=`{ cat $f/index.md |strip_title_from_md_file| ifs=$difs {$formatter | escape_html} }} } %} diff --git a/apps/bridge/app.rc b/apps/bridge/app.rc index a1b4921..7348e59 100644 --- a/apps/bridge/app.rc +++ b/apps/bridge/app.rc @@ -73,7 +73,7 @@ fn mk_new_comment { if not if(check_user $groups_allowed_comments) u=$logged_user if not - _status='You are not a memeber of a group allowed to comment.' + _status='You are not a member of a group allowed to comment.' if(~ $#_status 0) { umask 002 diff --git a/apps/bridge/foot.tpl b/apps/bridge/foot.tpl index 20e6c1c..84d9b81 100644 --- a/apps/bridge/foot.tpl +++ b/apps/bridge/foot.tpl @@ -19,7 +19,7 @@
- Enter your desired user name/password and after your comment has been reviewed by an addmin it will be posted and your account will be enabled. If you are already registered please login before posting. + Enter your desired user name/password and after your comment has been reviewed by an admin it will be posted and your account will be enabled. If you are already registered please login before posting.
% } diff --git a/bin/corehandlers.rc b/bin/corehandlers.rc index e72b20f..ddcf8a9 100644 --- a/bin/corehandlers.rc +++ b/bin/corehandlers.rc @@ -47,7 +47,7 @@ fn link_bar { echo '' } -fn md_handler { $formatter < $1 } +fn md_handler { $formatter $1 } fn tpl_handler { template $* } @@ -92,8 +92,8 @@ fn setup_handlers { if not if(test -f $local_path.html) handler_body_main=(html_handler $local_path.html) # Global tpl (eg sitemap.tpl), should take precedence over txt handler! - if not if(test -f lib^$req_path^.tpl) - handler_body_main=(tpl_handler lib^$req_path^.tpl) + if not if(test -f tpl^$req_path^.tpl) + handler_body_main=(tpl_handler tpl^$req_path^.tpl) if not if(test -f $local_path.txt) handler_body_main=(txt_handler $local_path.txt) diff --git a/bin/fltr_cache.rc b/bin/fltr_cache.rc index f09c963..67e82bd 100755 --- a/bin/fltr_cache.rc +++ b/bin/fltr_cache.rc @@ -19,8 +19,10 @@ fn fltr_cache { a=$f f=/dev/null } - if not + if not { score=`{sha1sum $f || exit 1} + score=$score(1) + } } cachedir=/tmp/fltr_cache/$score mkdir -p $cachedir >[2]/dev/null diff --git a/bin/werc.rc b/bin/werc.rc index d1cfe6c..08ea7cc 100755 --- a/bin/werc.rc +++ b/bin/werc.rc @@ -41,7 +41,9 @@ fn werc_exec_request { current_date_time=`{date} # Note: $REQUEST_URI is not officially in CGI 1.1, but seems to be de-facto - req_path=`{echo -n $REQUEST_URI | sed 's/\?.*//; s!//+!/!g; s/'^$forbidden_uri_chars^'//g; s/\.\.*/./g; 1q'} + # Note: We only urldecode %5F->'_' because some sites (stackoverflow.com?) urlencode it in their links, + # perhaps we should completel urldecode the whole url. + req_path=`{echo -n $REQUEST_URI | sed 's/\?.*//; s!//+!/!g; s/%5[Ff]/_/g; s/'^$forbidden_uri_chars^'//g; s/\.\.*/./g; 1q'} req_url=$base_url^$req_path local_path=$sitedir$req_path ifs='/' { args=`{echo -n $req_path} } diff --git a/bin/werc_errlog_wrap.rc b/bin/werc_errlog_wrap.rc new file mode 100755 index 0000000..8a803cc --- /dev/null +++ b/bin/werc_errlog_wrap.rc @@ -0,0 +1,5 @@ +#!/usr/local/plan9/bin/rc + +# This is a wrapper script for broken http servers like recent lighttpd versions which throw away cgi's stderr. + +./werc.rc >>[2]/tmp/wlog.txt diff --git a/lib/feeds/atom.tpl b/lib/feeds/atom.tpl deleted file mode 100644 index 42add06..0000000 --- a/lib/feeds/atom.tpl +++ /dev/null @@ -1,141 +0,0 @@ -Content-Type: application/atom+xml - - - - -%{ -fn statpost { - f = $1 - - updated = `{/bin/date --rfc-3339'=seconds' -r $f |sed 's/ /T/'} - # XXX $post_uri is broken produces output that includes full file path (eg., /gsoc/www/...) - post_uri=$baseuri^`{cleanname `{echo $f | sed -e 's,^'$sitedir',,' -e 's/\.(md|tpl)$//g'}} - title=`{basename $f | sed 's/^[0-9\-]*_(.*)\.md$/\1/; s/_/ /g' } - # Not used: date=`{/bin/date -Rd `{basename $f |sed 's/(^[0-9\-]*).*/\1/; s/-[0-9]$//'}} - # TODO: use mtime(1) and ls(1) instead of lunix's stat(1) - stat=`{stat -c '%Y %U' $f} - #mdate=`{/bin/date -Rd `{mtime $f|awk '{print $1}' }} # Not used because it is unreliable - by=$stat(2) - ifs=() { summary=`{cat $f | crop_text 512 ... | $formatter } } -} -updated = `{/bin/date --rfc-3339'=seconds' |sed 's/ /T/'} -%} - - - - - %($uri%) - /favicon.ico - - %($siteTitle%) - %($siteSubTitle%) - - - %($updated%) - - -%{ - for(f in `{sortedBlogPostList $blogDirs}) { - statpost $f -%} - - - %($post_uri%) - - %($title%) - - - %($by%) - - - -
- %($summary%) -
- - %($updated%) - - - -% } - - - -% exit - - - - http://intertwingly.net/blog/index.atom - ../favicon.ico - - Sam Ruby - It’s just data - - Sam Ruby - rubys@intertwingly.net - /blog/ - - 2008-09-24T12:47:00-04:00 - - - - - tag:intertwingly.net,2004:2899 - - - RubyConf 2008 -
- -

My proposal has been accepted for RubyConf 2008.  Because of the presence of Ruby implementers, this is going to be a bit challenging as it will likely turn into two talks at once.  One sharing experiences with fellow developers concerning things they may need to watch out for, and another with language designers about the impact of their changes.  It also is likely to be true, as it was at OSCON, that there will be members of the audience who know way more about this subject than I do.

-

I had originally requested a slot on Saturday.  My current slot requires me to shave a day off of ApacheCon.  I’ve again asked that the slot be changed, but even if it doesn’t move, I can manage this.  At least we are only talking about a short hop from New Orleans to Orlando.

- -
- 2008-09-11T06:51:36-04:00 - - - - tag:intertwingly.net,2004:2898 - - - Small Updates -
- -

Alf Eaton: Aside: if you’re reading a Planet that contains HubLog, those posts will all jump to the top - sorry! (I wish Planets dealt better with small updates so I didn’t have to worry about it).

-

I don’t know what publishing software you use, but I see you provide an Atom feed, and Planet 2.0 and Venus both implement atom:updated as specified in RFC 4287.

- -
-
- -

Alf Eaton: Aside: if you’re reading a Planet that contains HubLog, those posts will all jump to the top - sorry! (I wish Planets dealt better with small updates so I didn’t have to worry about it).

-

I don’t know what publishing software you use, but I see you provide an Atom feed, and Planet 2.0 and Venus both implement atom:updated as specified in RFC 4287.

-

More specifically, if you have a minor update and leave the updated date alone, the posts will not jump to the top.  The next release of WordPress, for example, will contain the necessary hooks for a plugin to provide a simple checkbox for indicating that the change constitutes a minor edit.

- -
- 2008-09-10T10:18:47-04:00 - - - - tag:intertwingly.net,2004:2897 - - - SVG via CSS -
- -

Now that I have my weblog looking reasonably consistent between Gecko and WebKit based browsers, I’ve taken another look at Opera.  Opera doesn’t have support for border-radius, but does have support for background images in SVG, which can be used to provide the same effect.  My Nav Bar on my test site now employs this technique, and it requires two separate images: 039 on CCD and CCD on FFF.

-

Frankly, my first reaction to this was mixed.  The pluses for SVG in CSS is that it doesn’t require either adjusting your markup or JavaScript to achieve these effects, a desirable characteristic that generally the other techniques don’t share.

- -
- -
- -

Now that I have my weblog looking reasonably consistent between Gecko and WebKit based browsers, I’ve taken another look at Opera.  Opera doesn’t have support for border-radius, but does have support for background images in SVG, which can be used to provide the same effect.  My Nav Bar on my test site now employs this technique, and it requires two separate images: 039 on CCD and CCD on FFF.

-

Meanwhile, Robert O’Callahan has been exploring other ways to integrate these technologies.

- -
- 2008-09-07T11:12:29-04:00 - - - - diff --git a/lib/feeds/html.tpl b/lib/feeds/html.tpl deleted file mode 100644 index 31ecccc..0000000 --- a/lib/feeds/html.tpl +++ /dev/null @@ -1,22 +0,0 @@ -% if (! ~ $blogTitle '') -% echo '

'$"blogTitle'

' - -
(RSS Feed|Atom Feed)
- -%{ -for (f in `{ sortedBlogPostList $blogDirs }) { - gen_blog_post_title $f - cat $f - echo ' ' # XXX I have no clue why the ' ' is needed, a echo without args breaks markdown.pl?!? -} | $formatter - -# TODO Should check if user has perms and so on -get_user -if(~ $#logged_user 1) { -%} -
- - -
-% } -
diff --git a/lib/feeds/rss20.tpl b/lib/feeds/rss20.tpl deleted file mode 100644 index 7b0ea74..0000000 --- a/lib/feeds/rss20.tpl +++ /dev/null @@ -1,61 +0,0 @@ -Content-Type: text/xml; charset=utf-8 - - - -%{ -fn statpost { - f = $1 - uri = `{echo $f | sed 's,^'$sitedir',,'} - title=`{basename $f | sed 's/^[0-9\-]*_(.*)\.md$/\1/; s/_/ /g' } - date=`{/bin/date -Rd `{basename $f |sed 's/(^[0-9\-]*).*/\1/; s/-[0-9]$//'}} - # TODO: use mtime(1) and ls(1) instead of lunix's stat(1) - stat=`{stat -c '%Y %U' $f} - #mdate=`{/bin/date -Rd $stat(1)} # Not used because it is unreliable - uri=$baseuri^`{cleanname `{echo -n $uri | sed 's/\.(md|tpl)//g'}} - by=$stat(2) - ifs=() { - summary=`{awk -v max'='1024 '{ - nc += 1 + length; - if(nc > max) { - print substr($0, 1, nc - max) "..." - exit - } - print - }' $f |fmt -j| sed 's/\]\]>/Fucking goddamn XML garbage/g'} - } -} - -%} - - - - - %($siteTitle%) - %($uri%) - %($blogDesc%) - en-us - Tom Duff's rc, and Kris Maglione's clever hackery -%{ - # uriel99+rss@gmail.com (Uriel) - for(f in `{sortedBlogPostList $blogDirs}) { - statpost $f - # Hack to aproximate the last build date - #(use the mdate from last posted item) - # Commented out for now because maybe a wrong value is worse than no value - #if(~ $#last_build_date 0) { - #last_build_date=''^$"mdate'' - #echo $last_build_date - #} -%} - - %($title%) - %($by%)@noreply.cat-v.org (%($by%)) - %($uri%) - %($uri%) - %($date%) - %($summary%)]]> - -% } - - - diff --git a/lib/_debug.tpl b/tpl/_debug.tpl similarity index 100% rename from lib/_debug.tpl rename to tpl/_debug.tpl diff --git a/lib/_users/login.tpl b/tpl/_users/login.tpl similarity index 100% rename from lib/_users/login.tpl rename to tpl/_users/login.tpl diff --git a/lib/sitemap.tpl b/tpl/sitemap.tpl similarity index 100% rename from lib/sitemap.tpl rename to tpl/sitemap.tpl