@@ -3,13 +3,16 @@ NAME
SYNOPSIS
<bashpress>/bin/new <title>
- <bashpress>/bin/publish <path>
+ <bashpress>/bin/publish [-c] <path>
DESCRIPTION
Bashpress is a rebellion against browser-based blogging engines,
WYSIWYG editors, and relational databases. It is command-line only,
has no user accounts, and doesn't use a database. It loves Smarty.
+ -c This option, available to bin/publish and bin/republish
+ will disable commenting no matter the default state.
+
INSTALLATION
Download or checkout Bashpress. Use the included httpd.conf file to
setup a VirtualHost rooted at <bashpress>/public. Create
README
@@ -1,37 +1,43 @@
#!/usr/bin/env php
<?php
-# The only argument must be a valid and existing post
-if (2 != sizeof($argv)) {
- echo "Usage: {$argv[0]} <post>\n";
+require_once dirname(__FILE__) . '/../include/init.php';
+
+if (3 == sizeof($argv) && '-c' == $argv[1]) {
+ $comments = false;
+ $arg = $argv[2];
+} else if (2 == sizeof($argv)) {
+ $comments = $COMMENTS;
+ $arg = $argv[1];
+} else {
+ echo "Usage: {$argv[0]} [-c] <post>\n";
exit(1);
}
-if (!file_exists($argv[1])) {
- echo "[publish] can't find a post at {$argv[1]}\n";
+if (!file_exists($arg)) {
+ echo "[publish] can't find a post at $arg\n";
exit(1);
}
$base = realpath(dirname(__FILE__) . '/../posts');
-if ($base != substr(realpath($argv[1]), 0, strlen($base))) {
+if ($base != substr(realpath($arg), 0, strlen($base))) {
echo "[publish] can only publish from the posts/ directory\n";
exit(1);
}
-require_once dirname(__FILE__) . '/../include/init.php';
loadlib('blog_publish');
loadlib('input');
# Check if this post has already been published
# Don't allow republishing, instead, send them to the bin/republish script
$path = str_replace(realpath(dirname(__FILE__) . '/../posts'), '',
- realpath($argv[1]));
+ realpath($arg));
if (file_exists("{$smarty->template_dir}/.posts$path.html")) {
- echo "[publish] can't republish {$argv[1]}\n[publish] try bin/republish\n";
+ echo "[publish] can't republish $arg\n[publish] try bin/republish\n";
exit(1);
}
# Move this post up to today if necessary
$parts = explode('/', str_replace(
- realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($argv[1])));
+ realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($arg)));
$file = array_pop($parts);
if (date('Y-m-d') != implode('-', $parts)) {
$path = blog_publish_dir(dirname(__FILE__) . '/../posts',
@@ -41,15 +47,15 @@ if (date('Y-m-d') != implode('-', $parts)) {
# Delete empty directories in the date hierarchy to keep things tidy
$ii = sizeof($parts);
for ($i = 0; $i < $ii; ++$i) {
- if (!@rmdir($argv[1] = dirname($argv[1]))) { break; }
+ if (!@rmdir($arg = dirname($arg))) { break; }
}
- $argv[1] = dirname(__FILE__) . "/../posts/$path/$file";
+ $arg = dirname(__FILE__) . "/../posts/$path/$file";
}
# Create directories for the <year>/<month>/<day>
$parts = explode('/', str_replace(
- realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($argv[1])));
+ realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($arg)));
$file = array_pop($parts);
$path = blog_publish_dir("{$smarty->template_dir}/.posts", $parts);
@@ -79,9 +85,10 @@ file_put_contents("{$smarty->template_dir}/.posts$path/$file.date",
# Write the post's Smarty template
list($title, $tags, $body) = preg_split("!\r?\n\r?\n!",
- file_get_contents($argv[1]), 3);
+ file_get_contents($arg), 3);
$tags = preg_split('!\s+!', $tags);
-blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body);
+blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body,
+ $comments);
echo "[publish] created the post's Smarty template\n";
# Update the homepage
bin/publish
@@ -1,26 +1,28 @@
#!/usr/bin/php
<?php
-#
-# The only argument must be a valid and existing post
-# TODO: Make sure it was previously published
-#
+require_once dirname(__FILE__) . '/../include/init.php';
-if (2 != sizeof($argv)) {
- echo "Usage: {$argv[0]} <post>\n";
+if (3 == sizeof($argv) && '-c' == $argv[1]) {
+ $comments = false;
+ $arg = $argv[2];
+} else if (2 == sizeof($argv)) {
+ $comments = $COMMENTS;
+ $arg = $argv[1];
+} else {
+ echo "Usage: {$argv[0]} [-c] <post>\n";
exit(1);
}
-if (!file_exists($argv[1])) {
- echo "[publish] can't find a post at {$argv[1]}\n";
+if (!file_exists($arg)) {
+ echo "[publish] can't find a post at $arg\n";
exit(1);
}
$base = realpath(dirname(__FILE__) . '/../posts');
-if ($base != substr(realpath($argv[1]), 0, strlen($base))) {
+if ($base != substr(realpath($arg), 0, strlen($base))) {
echo "[publish] can only publish from the posts/ directory\n";
exit(1);
}
-require_once dirname(__FILE__) . '/../include/init.php';
loadlib('blog_publish');
@@ -31,7 +33,7 @@ loadlib('blog_publish');
# Get the path to the post
$parts = explode('/', str_replace(
- realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($argv[1])));
+ realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($arg)));
$file = array_pop($parts);
$path = '/' . implode('/', $parts);
@@ -41,9 +43,10 @@ $timestamp = strtotime(file_get_contents(
# Rewrite the post's Smarty template
list($title, $tags, $body) = preg_split("!\r?\n\r?\n!",
- file_get_contents($argv[1]), 3);
+ file_get_contents($arg), 3);
$tags = preg_split('!\s+!', $tags);
-blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body);
+blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body,
+ $comments);
echo "[publish] recreated the post's Smarty template\n";
bin/republish
@@ -5,11 +5,13 @@ $TITLE = 'Richard Crowley’s blog';
$FQDN = 'bashpress.rcrowley.org';
$AUTHOR = 'Richard Crowley';
$MAIL = 'r@rcrowley.org';
+$COMMENTS = false;
# Expose some site parameters to the templates
assign('TITLE');
assign('FQDN');
assign('AUTHOR');
+assign('COMMENTS');
# Date formats
$DATEFORMAT_POST = 'Y/m/d';
include/config.php
@@ -6,13 +6,15 @@ loadlib('input');
# Write the post's Smarty template
# The "special" string is safe because you should be escaping your
# HTML anyway
-function blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body) {
+function blog_publish_smarty($path, $file, $timestamp, $title, $tags,
+ $body, $comments) {
assign('path');
assign('file');
assign('date', date($GLOBALS['DATEFORMAT_POST'], $timestamp));
assign('title', input_sanitize_smarty($title));
assign('tags', input_sanitize_smarty($tags));
assign('body', input_sanitize_smarty($body));
+ assign('comments', $comments);
global $smarty;
file_put_contents("{$smarty->template_dir}/.posts$path/$file.html",
$smarty->fetch('post.smarty'), LOCK_EX);
include/lib_blog_publish.php
@@ -11,10 +11,15 @@
</ul>
{$body}
{ldelim}if !$page{rdelim}
+{if $comments}
<p><a href="{$path}/{$file}#comments">Comments ({ldelim}blog_comment_count tpl=$smarty.template{rdelim})</a></p>
+{else}
+<p><a href="{$path}/{$file}">#</a></p>
+{/if}
{ldelim}/if{rdelim}
</div>
{ldelim}if $page{rdelim}
+{if $comments}
{ldelim}if !$preview{rdelim}
<div id="comments">
<h1>Comments <small>({ldelim}blog_comment_count{rdelim})</small></h1>
@@ -22,7 +27,10 @@
{ldelim}include file=".posts{$path}/{$file}.comments.html"{rdelim}
</ol>
</div>
+{ldelim}if $COMMENTS{rdelim}
{ldelim}include file="_comment.html"{rdelim}
{ldelim}/if{rdelim}
+{ldelim}/if{rdelim}
+{/if}
{ldelim}include file="_foot.html"{rdelim}
{ldelim}/if{rdelim}
templates/post.smarty
1ba1ff2e1388b9f7ffb6a666cadb6799179c954d
Richard Crowley
r@rcrowley.org
http://github.com/rcrowley/bashpress/commit/d2d2483ac727a95746dd36219a14b0e15f5821a5
d2d2483ac727a95746dd36219a14b0e15f5821a5
2009-02-26T23:22:41-08:00
2009-02-26T23:22:41-08:00
Turn comments on and off.
1132ec430c28b0abfb400e7419b44c4e85c33a6b
Richard Crowley
r@rcrowley.org