@@ -1,11 +1,11 @@ #!/usr/bin/php <?php -require_once dirname(__FILE__) . '/../include/init.php'; +require_once dirname(__FILE__) . "/../include/init.php"; loadlib('dir'); # Get a list of posts and drafts -$tree = dir_rscandir(dirname(__FILE__) . '/../posts', true); +$tree = dir_rscandir(dirname(__FILE__) . "/../posts", true); $list = end(dir_flatten($tree)); # Narrow the list down to just drafts @@ -17,10 +17,9 @@ foreach ($list as $l) { # Print the list or an "all clear" if (sizeof($drafts)) { - $posts = realpath(dirname(__FILE__) . '/../posts'); + $posts = realpath(dirname(__FILE__) . "/../posts"); foreach ($drafts as $d) { echo "[drafts] $posts$d\n"; } -} else { - echo "[drafts] no drafts found\n"; } +else { err("[drafts] no drafts found\n"); } exit(0); bin/drafts @@ -1,30 +1,32 @@ #!/usr/bin/env php <?php -require_once dirname(__FILE__) . '/../include/init.php'; -loadlib('url'); +require_once dirname(__FILE__) . "/../include/init.php"; # Post title in URI form if (2 != sizeof($argv)) { - echo "Usage: {$argv[0]} <title>\n"; + err("Usage: {$argv[0]} <title>\n"); exit(1); } + +loadlib('url'); + $title = url_sanitize($argv[1]); -if ('' == $title) { - echo "[new] post title resulted in an empty URI\n"; +if ("" == $title) { + err("[new] post title resulted in an empty URI\n"); exit(1); } -$posts = dirname(__FILE__) . '/../posts'; +$posts = dirname(__FILE__) . "/../posts"; if (!is_dir($posts)) { mkdir($posts); } if (file_exists("$posts/$y/$m/$d/$title")) { - echo "[new] there is already a post by that name today\n"; + err("[new] there is already a post by that name today\n"); exit(1); } # Date directories -$y = date('Y'); -$m = date('m'); -$d = date('d'); +$y = date("Y"); +$m = date("m"); +$d = date("d"); if (!is_dir("$posts/$y")) { mkdir("$posts/$y", 0755); } if (!is_dir("$posts/$y/$m")) { mkdir("$posts/$y/$m", 0755); } if (!is_dir("$posts/$y/$m/$d")) { mkdir("$posts/$y/$m/$d", 0755); } @@ -32,7 +34,6 @@ file_put_contents("$posts/$y/$m/$d/$title", "{$argv[1]}\n\n[tags]\n\n<p>[body]</p>"); # Great success! -echo "[new] post has been created and can be edited in:\n[new] ", - realpath("$posts/$y/$m/$d/$title"), "\n"; - +err("[new] post has been created and can be edited in:\n[new] ", + realpath("$posts/$y/$m/$d/$title"), "\n"); exit(0); bin/new @@ -6,21 +6,22 @@ # TODO: Make sure it's a draft # +require_once dirname(__FILE__) . "/../include/init.php"; + if (2 != sizeof($argv)) { - echo "Usage: {$argv[0]} <post>\n"; + err("Usage: {$argv[0]} <post>\n"); exit(1); } if (!file_exists($argv[1])) { - echo "[publish] can't find a post at {$argv[1]}\n"; + err("[publish] can't find a post at {$argv[1]}\n"); exit(1); } -$base = realpath(dirname(__FILE__) . '/../posts'); +$base = realpath(dirname(__FILE__) . "/../posts"); if ($base != substr(realpath($argv[1]), 0, strlen($base))) { - echo "[publish] can only publish from the posts/ directory\n"; + err("[publish] can only publish from the posts/ directory\n"); exit(1); } -require_once dirname(__FILE__) . '/../include/init.php'; loadlib('blog_publish'); @@ -30,8 +31,8 @@ loadlib('blog_publish'); # # Get the path to the post -$parts = explode('/', str_replace( - realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($argv[1]))); +$parts = explode("/", str_replace( + realpath(dirname(__FILE__) . "/../posts") . "/", "", realpath($argv[1]))); $file = array_pop($parts); $path = blog_publish_dir("{$smarty->template_dir}/.posts", $parts); @@ -42,12 +43,12 @@ $tags = preg_split('!\s+!', $tags); $body = input_footnoterize($body, end($parts)); blog_publish_smarty($path, "$file.preview", time(), $title, $tags, $body, false); -echo "[publish] created a preview of the post's Smarty template\n"; +err("[publish] created a preview of the post's Smarty template\n"); # Great success! $hash = sha1_file($argv[1]); -echo "[publish] previewed the post at\n", - "[publish] http://$FQDN$path/$file/$hash\n"; +err("[publish] previewed the post at\n", + "[publish] http://$FQDN$path/$file/$hash\n"); exit(0); bin/preview @@ -1,25 +1,27 @@ #!/usr/bin/env php <?php -require_once dirname(__FILE__) . '/../include/init.php'; +require_once dirname(__FILE__) . "/../include/init.php"; -if (3 == sizeof($argv) && '-c' == $argv[1]) { +if (3 == sizeof($argv) && "-c" == $argv[1]) { $comments = false; $arg = $argv[2]; -} else if (2 == sizeof($argv)) { +} +else if (2 == sizeof($argv)) { $comments = $COMMENTS; $arg = $argv[1]; -} else { - echo "Usage: {$argv[0]} [-c] <post>\n"; +} +else { + err("Usage: {$argv[0]} [-c] <post>\n"); exit(1); } if (!file_exists($arg)) { - echo "[publish] can't find a post at $arg\n"; + err("[publish] can't find a post at $arg\n"); exit(1); } -$base = realpath(dirname(__FILE__) . '/../posts'); +$base = realpath(dirname(__FILE__) . "/../posts"); if ($base != substr(realpath($arg), 0, strlen($base))) { - echo "[publish] can only publish from the posts/ directory\n"; + err("[publish] can only publish from the posts/ directory\n"); exit(1); } @@ -28,20 +30,20 @@ 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'), '', +$path = str_replace(realpath(dirname(__FILE__) . "/../posts"), "", realpath($arg)); if (file_exists("{$smarty->template_dir}/.posts$path.html")) { - echo "[publish] can't republish $arg\n[publish] try bin/republish\n"; + err("[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($arg))); +$parts = explode("/", str_replace( + realpath(dirname(__FILE__) . "/../posts") . "/", "", realpath($arg))); $file = array_pop($parts); -if (date('Y-m-d') != implode('-', $parts)) { - $path = blog_publish_dir(dirname(__FILE__) . '/../posts', - array(date('Y'), date('m'), date('d'))); +if (date('Y-m-d') != implode("-", $parts)) { + $path = blog_publish_dir(dirname(__FILE__) . "/../posts", + array(date("Y"), date("m"), date("d"))); rename($argv[1], dirname(__FILE__) . "/../posts$path/$file"); # Delete empty directories in the date hierarchy to keep things tidy @@ -54,8 +56,8 @@ if (date('Y-m-d') != implode('-', $parts)) { } # Create directories for the <year>/<month>/<day> -$parts = explode('/', str_replace( - realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($arg))); +$parts = explode("/", str_replace( + realpath(dirname(__FILE__) . "/../posts") . "/", "", realpath($arg))); $file = array_pop($parts); $path = blog_publish_dir("{$smarty->template_dir}/.posts", $parts); @@ -90,36 +92,37 @@ $tags = preg_split('!\s+!', $tags); $body = input_footnoterize($body, end($parts)); blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body, $comments); -echo "[publish] created the post's Smarty template\n"; +err("[publish] created the post's Smarty template\n"); # Update the homepage -prepend('/.index', 5); -echo "[publish] updated the homepage\n"; +prepend("/.index", 5); +err("[publish] updated the homepage\n"); # Update the Atom feed blog_publish_feed($path, $file, $timestamp, $title, $body, false); -echo "[publish] updated the Atom feed\n"; +err("[publish] updated the Atom feed\n"); # Prepend to archive pages -$archive = '/.posts'; +$archive = "/.posts"; foreach ($parts as $p) { $archive .= "/$p"; prepend($archive); } -echo "[publish] added this post to the archives\n"; +err("[publish] added this post to the archives\n"); # Prepend to tag pages if (!is_dir("{$smarty->template_dir}/.tags")) { mkdir("{$smarty->template_dir}/.tags", 0755); } foreach ($tags as $t) { prepend("/.tags/$t"); } -echo "[publish] added this post to the tag pages\n"; +err("[publish] added this post to the tag pages\n"); function prepend($tpl, $count = 0) { $tpl = "{$GLOBALS['smarty']->template_dir}$tpl.html"; if (file_exists($tpl)) { $lines = explode("\n", file_get_contents($tpl)); - } else { $lines = array(); } + } + else { $lines = array(); } global $path, $file; array_unshift($lines, "{include file=\".posts$path/$file.html\"}"); if (0 < $count) { $lines = array_slice($lines, 0, $count); } @@ -129,10 +132,10 @@ function prepend($tpl, $count = 0) { # Update the archive indices blog_publish_months(); blog_publish_tags($tags); -echo "[publish] updated archive pages\n"; +err("[publish] updated archive pages\n"); # Great success! -echo "[publish] published the post at\n[publish] http://$FQDN$path/$file\n"; +err("[publish] published the post at\n[publish] http://$FQDN$path/$file\n"); exit(0); bin/publish @@ -1,25 +1,27 @@ #!/usr/bin/php <?php -require_once dirname(__FILE__) . '/../include/init.php'; +require_once dirname(__FILE__) . "/../include/init.php"; -if (3 == sizeof($argv) && '-c' == $argv[1]) { +if (3 == sizeof($argv) && "-c" == $argv[1]) { $comments = false; $arg = $argv[2]; -} else if (2 == sizeof($argv)) { +} +else if (2 == sizeof($argv)) { $comments = $COMMENTS; $arg = $argv[1]; -} else { - echo "Usage: {$argv[0]} [-c] <post>\n"; +} +else { + err("Usage: {$argv[0]} [-c] <post>\n"); exit(1); } if (!file_exists($arg)) { - echo "[republish] can't find a post at $arg\n"; + err("[republish] can't find a post at $arg\n"); exit(1); } -$base = realpath(dirname(__FILE__) . '/../posts'); +$base = realpath(dirname(__FILE__) . "/../posts"); if ($base != substr(realpath($arg), 0, strlen($base))) { - echo "[republish] can only publish from the posts/ directory\n"; + err("[republish] can only publish from the posts/ directory\n"); exit(1); } @@ -32,27 +34,27 @@ loadlib('blog_publish'); # # Get the path to the post -$parts = explode('/', str_replace( - realpath(dirname(__FILE__) . '/../posts') . '/', '', realpath($arg))); +$parts = explode("/", str_replace( + realpath(dirname(__FILE__) . "/../posts") . "/", "", realpath($arg))); $file = array_pop($parts); -$path = '/' . implode('/', $parts); +$path = "/" . implode("/", $parts); # Get the date stored at original publishing time $timestamp = strtotime(file_get_contents( "{$smarty->template_dir}/.posts$path/$file.date")); # Rewrite the post's Smarty template -list($title, $tags, $body) = preg_split("!\r?\n\r?\n!", +list($title, $tags, $body) = preg_split('!\r?\n\r?\n!', file_get_contents($arg), 3); $tags = preg_split('!\s+!', $tags); $body = input_footnoterize($body, end($parts)); blog_publish_smarty($path, $file, $timestamp, $title, $tags, $body, $comments); -echo "[republish] recreated the post's Smarty template\n"; +err("[republish] recreated the post's Smarty template\n"); # Rewrite the post in the feed, if it's there blog_publish_feed($path, $file, $timestamp, $title, $body, true); -echo "[republish] updated the Atom feed\n"; +err("[republish] updated the Atom feed\n"); # TODO: Update the tag pages #echo "[republish] updated archive pages\n"; @@ -60,6 +62,6 @@ echo "[republish] updated the Atom feed\n"; # Great success! -echo "[republish] republished the post at\n", - "[republish] http://$FQDN$path/$file\n"; +err("[republish] republished the post at\n", + "[republish] http://$FQDN$path/$file\n"); exit(0); bin/republish @@ -1,29 +1,29 @@ #!/usr/bin/env php <?php +require_once dirname(__FILE__) . "/../include/init.php"; + # Needs a post and a number as arguments if (3 != sizeof($argv)) { - echo "Usage: {$argv[0]} <id(s)> <post>\n", - "<id(s)> is a comma-separated list of numbers or hyphenated ranges\n"; + err("Usage: {$argv[0]} <id(s)> <post>\n", + "<id(s)> is a comma-separated list of numbers or hyphenated ranges\n"); exit(1); } if (!file_exists($argv[2])) { - echo "[rmcomment] can't find a post at {$argv[2]}\n"; + err("[rmcomment] can't find a post at {$argv[2]}\n"); exit(1); } -$base = realpath(dirname(__FILE__) . '/../posts'); +$base = realpath(dirname(__FILE__) . "/../posts"); if ($base != substr(realpath($argv[2]), 0, strlen($base))) { - echo "[rmcomment] posts live in the posts/ directory\n"; + err("[rmcomment] posts live in the posts/ directory\n"); exit(1); } -require_once dirname(__FILE__) . '/../include/init.php'; - # Make sure this post has been published -$path = str_replace(realpath(dirname(__FILE__) . '/../posts'), '', +$path = str_replace(realpath(dirname(__FILE__) . "/../posts"), "", realpath($argv[2])); if (!file_exists("{$smarty->template_dir}/.posts$path.html")) { - echo "[rmcomment] {$argv[2]} isn't published\n"; + err("[rmcomment] {$argv[2]} isn't published\n"); exit(1); } @@ -31,23 +31,26 @@ if (!file_exists("{$smarty->template_dir}/.posts$path.html")) { $count = filesize("{$smarty->template_dir}/.posts$path.count"); # Parse the 2nd parameter to see which comments need to be deleted -$ranges = explode(',', $argv[1]); +$ranges = explode(",", $argv[1]); $ids = array(); foreach ($ranges as $r) { if (preg_match('!^\d+$!', $r)) { $ids[] = $r; - } else if (preg_match('!^-(\d+)$!', $r, $match)) { + } + else if (preg_match('!^-(\d+)$!', $r, $match)) { $ids = array_merge($ids, range(0, $match[1])); - } else if (preg_match('!^(\d+)-$!', $r, $match)) { + } + else if (preg_match('!^(\d+)-$!', $r, $match)) { $ids = array_merge($ids, range($match[1], $count)); - } else if (preg_match('!^(\d+)-(\d+)$!', $r, $match)) { + } + else if (preg_match('!^(\d+)-(\d+)$!', $r, $match)) { $ids = array_merge($ids, range($match[1], $match[2])); } } $ids = array_unique($ids); sort($ids, SORT_NUMERIC); if (!sizeof($ids)) { - echo "[rmcomment] no comments marked for removal\n"; + err("[rmcomment] no comments marked for removal\n"); exit(1); } if (0 == $ids[0]) { array_shift($ids); } @@ -58,14 +61,14 @@ if ($index = array_search($count, $ids)) { # Delete comments $comments = explode("\n\n", file_get_contents( "{$smarty->template_dir}/.posts$path.comments.html")); -array_unshift($comments, ''); +array_unshift($comments, ""); foreach ($ids as $id) { unset($comments[$id]); } array_shift($comments); file_put_contents("{$smarty->template_dir}/.posts$path.comments.html", implode("\n\n", $comments), LOCK_EX); file_put_contents("{$smarty->template_dir}/.posts$path.count", - str_repeat('.', sizeof($comments) - 1), LOCK_EX); + str_repeat(".", sizeof($comments) - 1), LOCK_EX); # Great success! -echo "[rmcomment] comments removed\n"; +err("[rmcomment] comments removed\n"); exit(0); bin/rmcomment @@ -1,21 +1,22 @@ #!/usr/bin/env php <?php +require_once dirname(__FILE__) . "/../include/init.php"; + # Check out the arguments if (5 != sizeof($argv)) { - echo "Usage: {$argv[0]} <db-host> <db-user> <db-pass> <db-name>\n"; + err("Usage: {$argv[0]} <db-host> <db-user> <db-pass> <db-name>\n"); exit(1); } list(, $db_host, $db_user, $db_pass, $db_name) = $argv; -require_once dirname(__FILE__) . '/../include/init.php'; loadlib('blog_publish'); loadlib('blog_comment'); # Open a database connection $link = mysql_connect($db_host, $db_user, $db_pass); if (!is_resource($link)) { - echo "[wordpress] error connecting to database\n"; + err("[wordpress] error connecting to database\n"); exit(1); } mysql_select_db($db_name, $link); @@ -34,9 +35,9 @@ while ($post = mysql_fetch_assoc($posts_q)) { # Create directories for the <year>/<month>/<day> $parts = array( - date('Y', $timestamp), - date('m', $timestamp), - date('d', $timestamp) + date("Y", $timestamp), + date("m", $timestamp), + date("d", $timestamp), ); $path = blog_publish_dir("{$smarty->template_dir}/.posts", $parts); @@ -71,15 +72,15 @@ while ($post = mysql_fetch_assoc($posts_q)) { # Write the post's date into the .date file file_put_contents("{$smarty->template_dir}/.posts$path/$file.date", - date('r', $timestamp), LOCK_EX); + date("r", $timestamp), LOCK_EX); # Write the post's Smarty template blog_publish_smarty($path, $file, $timestamp, $title, $tags, - "<p>" . implode("</p>\n<p>", preg_split("!(?:\r?\n){2,}!", + "<p>" . implode("</p>\n<p>", preg_split('!(?:\r?\n){2,}!', $body)) . "</p>\n"); # Append to archive and tag pages - $archive = ''; + $archive = ""; foreach ($parts as $p) { $archive .= "/$p"; file_put_contents("{$smarty->template_dir}/.posts$archive.html", @@ -100,7 +101,7 @@ while ($post = mysql_fetch_assoc($posts_q)) { # Note that this works in the opposite direction as bin/publish blog_publish_pointers($parts, false); - echo "[wordpress] published $path/$file\n"; + err("[wordpress] published $path/$file\n"); } -echo "[wordpress] done\n"; +err("[wordpress] done\n"); exit(0); bin/wordpress @@ -1,4 +1,4 @@ -php_value include_path /work/www/bashpress/include:/usr/share/php/smarty +php_value include_path /work/www/bashpress/include:/usr/share/php php_value magic_quotes_gpc Off php_value error_reporting 2047 httpd.conf @@ -1,18 +1,18 @@ <?php # Site parameters -$TITLE = 'Richard Crowley&#8217;s blog'; -$FQDN = 'bashpress.rcrowley.org'; -$AUTHOR = 'Richard Crowley'; -$MAIL = 'r@rcrowley.org'; -$COMMENTS = false; +$TITLE = "Richard Crowley&#8217;s blog"; +$FQDN = "dev.rcrowley.org"; +$AUTHOR = "Richard Crowley"; +$MAIL = "r@rcrowley.org"; +$COMMENTS = true;#false; # Expose some site parameters to the templates -assign('TITLE'); -assign('FQDN'); -assign('AUTHOR'); -assign('COMMENTS'); +assign("TITLE"); +assign("FQDN"); +assign("AUTHOR"); +assign("COMMENTS"); # Date formats -$DATEFORMAT_POST = 'Y/m/d'; -$DATEFORMAT_COMMENT = 'Y/m/d g:i a'; +$DATEFORMAT_POST = "Y/m/d"; +$DATEFORMAT_COMMENT = "Y/m/d g:i a"; include/config.php @@ -1,14 +1,19 @@ <?php -require_once '/usr/share/php/smarty/Smarty.class.php'; +require_once "smarty/Smarty.class.php"; $smarty = new Smarty; -$smarty->template_dir = realpath(dirname(__FILE__) . '/../templates'); -$smarty->compile_dir = realpath(dirname(__FILE__) . '/../.templates'); +$smarty->template_dir = realpath(dirname(__FILE__) . "/../templates"); +$smarty->compile_dir = realpath(dirname(__FILE__) . "/../.templates"); function loadlib($name) { require_once dirname(__FILE__) . "/lib_$name.php"; } +function err() { + $arr = func_get_args(); + fwrite(STDERR, implode("", $arr)); +} + function assign() { $args = func_get_args(); $key = array_shift($args); @@ -25,11 +30,14 @@ function display($name = false) { # Send proper Content-Type header if ('xml' == $GLOBALS['FORMAT']) { header("Content-Type: text/xml\r\n"); - } else if ('rss' == $GLOBALS['FORMAT']) { + } + else if ('rss' == $GLOBALS['FORMAT']) { header("Content-Type: application/rss+xml\r\n"); - } else if ('atom' == $GLOBALS['FORMAT']) { + } + else if ('atom' == $GLOBALS['FORMAT']) { header("Content-Type: application/atom+xml\r\n"); - } else if ('json' == $GLOBALS['FORMAT']) { + } + else if ('json' == $GLOBALS['FORMAT']) { header("Content-Type: application/json\r\n"); } @@ -37,12 +45,12 @@ function display($name = false) { if (false === $name) { $smarty->display(reset(explode('.', $GLOBALS['FILE'])) . '.' . $GLOBALS['FORMAT']); - } else { + } + else { if (false === strpos($name, '.')) { $smarty->display($name . '.' . $GLOBALS['FORMAT']); - } else { - $smarty->display($name); } + else { $smarty->display($name); } } exit; } @@ -51,9 +59,9 @@ function redirect($url) { header("Location: $url\r\n"); echo <<<EOD <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://w3.org/TR/xhtml1/DTD/xhtml1.1.dtd"> -<html><head></head><body><p><a href="$url">302, ur leavin&rsquo; here.</a></p></body></html> +<html><head></head><body><p><a href="$url">302, ur leavin&#8217; here.</a></p></body></html> EOD; exit; } -require_once dirname(__FILE__) . '/config.php'; +require_once dirname(__FILE__) . "/config.php"; include/init.php @@ -17,7 +17,8 @@ function blog_comment_save($name, $website, $text, $date = false) { # If they gave a website, show that with their name if (preg_match('!^https?://.!', $website)) { $link = "<a href=\"$website\">$name</a>"; - } else { $link = $name; } + } + else { $link = $name; } # Take either the passed date or now $date = date($GLOBALS['DATEFORMAT_COMMENT'], @@ -32,10 +33,10 @@ function blog_comment_save($name, $website, $text, $date = false) { # Email the site owner global $FQDN; - mail($GLOBALS['MAIL'], 'New comment!', + mail($GLOBALS['MAIL'], "New comment!", "Post: http://$FQDN{$GLOBALS['URL']}\r\n\r\n" . "Name: $name\r\nWebsite: $website\r\n\r\n$mail\r\n", - "From: Bashpress <bashpress@$FQDN>\r\n"); + "From: Bashpress <noreply@$FQDN>\r\n"); } @@ -44,16 +45,17 @@ $GLOBALS['smarty']->register_function( 'blog_comment_count', 'blog_comment_count'); function blog_comment_count($params = false, $smarty = false) { if (isset($params['tpl'])) { - $parts = explode('/', $params['tpl']); + $parts = explode("/", $params['tpl']); array_unshift($parts, $GLOBALS['smarty']->template_dir); $file = array_pop($parts); - $parts[] = substr($file, 0, strrpos($file, '.')) . '.count'; - return filesize(implode('/', $parts)); - } else { return filesize(_blog_comment_base() . '.count'); } + $parts[] = substr($file, 0, strrpos($file, ".")) . ".count"; + return filesize(implode("/", $parts)); + } + else { return filesize(_blog_comment_base() . ".count"); } } # Get the base of comment file names function _blog_comment_base() { - return $GLOBALS['smarty']->template_dir . '/.posts/' . - implode('/', $GLOBALS['URL_PARTS']); + return $GLOBALS['smarty']->template_dir . "/.posts/" . + implode("/", $GLOBALS['URL_PARTS']); } include/lib_blog_comment.php @@ -17,14 +17,14 @@ function blog_publish_smarty($path, $file, $timestamp, $title, $tags, assign('comments', $comments); global $smarty; file_put_contents("{$smarty->template_dir}/.posts$path/$file.html", - $smarty->fetch('post.smarty'), LOCK_EX); + $smarty->fetch("post.smarty"), LOCK_EX); } # Create directories from the publishing directory for this post function blog_publish_dir($base, $dirs) { if (!is_array($dirs)) { return false; } if (!is_dir($base)) { mkdir($base, 0755); } - $path = ''; + $path = ""; foreach ($dirs as $d) { $path .= "/$d"; if (!is_dir("$base$path")) { mkdir("$base$path", 0755); } @@ -43,7 +43,7 @@ function blog_publish_pointers($parts, $new = true) { $tree = dir_rscandir("{$smarty->template_dir}/.posts", false); $list = dir_flatten($tree); $depth = 0; - $path = ''; + $path = ""; foreach ($parts as $p) { ++$depth; $path .= "/$p"; @@ -51,12 +51,13 @@ function blog_publish_pointers($parts, $new = true) { if ($new && $i || !$new && $i < sizeof($list[$depth]) - 1) { if ($new) { --$i; - $a = 'older'; - $b = 'newer'; - } else { + $a = "older"; + $b = "newer"; + } + else { ++$i; - $a = 'newer'; - $b = 'older'; + $a = "newer"; + $b = "older"; } file_put_contents("{$smarty->template_dir}/.posts$path/$a", $list[$depth][$i]); @@ -82,7 +83,7 @@ function blog_publish_months() { $li[] = "\t<li><a href=\"$m\">" . substr($m, 1) . "</a></li>\n"; } file_put_contents("{$GLOBALS['smarty']->template_dir}/.months.html", - "<ul id=\"months\">\n" . implode('', $li) . "</ul>\n", LOCK_EX); + "<ul id=\"months\">\n" . implode("", $li) . "</ul>\n", LOCK_EX); } # Update the tag listing @@ -101,7 +102,7 @@ function blog_publish_tags($tags) { $li[] = "\t<li><a href=\"/tags/$t\">$t</a></li>\n"; } file_put_contents("{$smarty->template_dir}/.tags.html", - "<ul id=\"tags\">\n" . implode('', $li) . "</ul>\n", LOCK_EX); + "<ul id=\"tags\">\n" . implode("", $li) . "</ul>\n", LOCK_EX); } # Prepend a post to the Atom feed, either bumping an old post off the @@ -112,22 +113,26 @@ function blog_publish_feed($path, $file, $timestamp, $title, $body, $replace_only = false) { global $smarty; $permalink = "http://{\$FQDN}$path/$file"; - $date_published = date('c', $timestamp); + $date_published = date("c", $timestamp); # Get the DOM of the feed $dom = new DOMDocument; if (file_exists("{$smarty->template_dir}/.feed.atom")) { $dom->load("{$smarty->template_dir}/.feed.atom"); - } else { - $dom->loadXML('<?xml version="1.0" encoding="utf-8"?> - <feed xmlns="http://www.w3.org/2005/Atom"> - <title>{$TITLE}</title> - <link href="http://{$FQDN}/feed" rel="self"/> - <link href="http://{$FQDN}/" rel="alternate"/> - <id>http://{$FQDN}/feed</id> - <updated>2008-09-03T23:17:43-07:00</updated> - <author><name>{$AUTHOR}</name></author> - </feed>'); + } + else { + $dom->loadXML(<<<EOD +<?xml version="1.0" encoding="utf-8"?> +<feed xmlns="http://www.w3.org/2005/Atom"> + <title>{\$TITLE}</title> + <link href="http://{\$FQDN}/feed" rel="self"/> + <link href="http://{\$FQDN}/" rel="alternate"/> + <id>http://{\$FQDN}/feed</id> + <updated>2008-09-03T23:17:43-07:00</updated> + <author><name>{\$AUTHOR}</name></author> +</feed> +EOD + ); } $feed = $dom->documentElement; @@ -142,7 +147,7 @@ function blog_publish_feed($path, $file, $timestamp, $title, $body, ->firstChild->nodeValue == $permalink) { $index = $i; $feed->removeChild($entry); - $date_updated = date('c'); + $date_updated = date("c"); break; } } @@ -168,13 +173,13 @@ function blog_publish_feed($path, $file, $timestamp, $title, $body, htmlspecialchars(input_sanitize_smarty($title)))); $link = $dom->createElement('link'); $link->setAttribute('href', $permalink); - $link->setAttribute('rel', 'alternate'); + $link->setAttribute('rel', "alternate"); $entry->appendChild($link); $entry->appendChild($dom->createElement('id', $permalink)); $entry->appendChild($dom->createElement('published', $date_published)); $entry->appendChild($dom->createElement('updated', $date_updated)); $author = $dom->createElement('author'); - $author->appendChild($dom->createElement('name', '{$AUTHOR}')); + $author->appendChild($dom->createElement('name', "{\$AUTHOR}")); $entry->appendChild($author); $content = $dom->createElement('content', htmlspecialchars(input_sanitize_smarty($body))); include/lib_blog_publish.php @@ -4,7 +4,7 @@ # This special rscandir function will return a tree of only directories # TODO: Don't count directories that only contain *.preview.html files function dir_rscandir($dir, $all = true) { - $ls = array_diff(scandir($dir), array('.', '..')); + $ls = array_diff(scandir($dir), array(".", "..")); $out = array(); foreach ($ls as $l) { if (is_dir("$dir/$l")) { $out[$l] = dir_rscandir("$dir/$l", $all); } @@ -14,7 +14,7 @@ function dir_rscandir($dir, $all = true) { } # Flatten the walked directory tree at every depth -function dir_flatten($tree, $path = '', $depth = 1) { +function dir_flatten($tree, $path = "", $depth = 1) { $list = array(); foreach ($tree as $dir => $subtree) { $list[$depth][] = "$path/$dir"; include/lib_dir.php @@ -4,8 +4,8 @@ # The argument should be a string or an array function input_sanitize_smarty($dirty) { return str_replace( - array('{', '}', '<<<---THIS-IS-SPECIAL--->>>'), - array('<<<---THIS-IS-SPECIAL--->>>', '{rdelim}', '{ldelim}'), + array("{", "}", "<<<---THIS-IS-SPECIAL--->>>"), + array("<<<---THIS-IS-SPECIAL--->>>", "{rdelim}", "{ldelim}"), $dirty ); } @@ -14,7 +14,7 @@ function input_sanitize_smarty($dirty) { # Turn blocks of text into paragraphs, preserve single-line breaks, # convert URLs to links and strip all other tags # The URL-to-link code is basically how Wordpress does it -function input_htmlize($text, $begin = '') { +function input_htmlize($text, $begin = "") { # Break into regular and <pre> sections $sections = preg_split('!(<pre>.*?</pre>)!is', $text, -1, @@ -23,17 +23,17 @@ function input_htmlize($text, $begin = '') { # Strip and HTML encode <pre> blocks if (preg_match('!^<pre>(.*)</pre>$!i', $text, $match)) { - $sections[$i] = '<pre>' . htmlentities(strip_tags($match[1])) . + $sections[$i] = "<pre>" . htmlentities(strip_tags($match[1])) . "</pre>\n"; } # HTML encode and markup paragraphs and line breaks else { - $paragraphs = preg_split("!(?:\r?\n){2,}!", + $paragraphs = preg_split('!(?:\r?\n){2,}!', htmlentities(strip_tags($text))); foreach ($paragraphs as $j => $text) { $paragraphs[$j] = implode("\n$begin<br />", - preg_split("!\r?\n!", $text)); + preg_split('!\r?\n!', $text)); } $sections[$i] = "$begin<p>" . implode("</p>\n$begin<p>", $paragraphs) . "</p>\n"; @@ -41,33 +41,32 @@ function input_htmlize($text, $begin = '') { } - return input_htmlize_links(implode('', $sections)); + return input_htmlize_links(implode("", $sections)); } # Turn URLs to links function input_htmlize_links($text) { return trim(preg_replace( - '!(<a( [^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>!i', '$1$3</a>', + '!(<a( [^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>!i', "$1$3</a>", preg_replace_callback( - '#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/\-=?@\[\](+]|[.,;:](?![\s<])|(?(1)\)(?![\s<])|\)))*)#is', + '#(?<=[\s>])(\()?([\w]+?://(?:[\\w\\x80-\\xff\#$%&~/\-=?@\[\](+]|[.,;:](?![\s<])|(?(1)\)(?![\s<])|\)))*)#is', '_input_htmlize_links', " $text"))); - } function _input_htmlize_links($matches) { $url = _input_htmlize_cleanurl($matches[2]); - if(empty($url)) { return $matches[0]; } + if (empty($url)) { return $matches[0]; } else { return "{$matches[1]}<a href=\"$url\">$url</a>"; } } function _input_htmlize_cleanurl($url) { - if ('' == $url) { return $url; } - $url = str_replace(array('%0d', '%0a'), '', str_replace(';//', '://', - preg_replace("|[^a-z0-9-~+_.?#=!&;,/:%@$*'()x80-xff]|i", '', $url))); - if (false === strpos($url, ':') && '/' != substr($url, 0, 1) - && !preg_match('!^[a-z0-9-]+?\.php!i', $url)) { + if ("" == $url) { return $url; } + $url = str_replace(array("%0d", "%0a"), "", str_replace(";//", "://", + preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$*\'()x80-xff]|i', "", $url))); + if (false === strpos($url, ":") && "/" != substr($url, 0, 1) + && !preg_match('!^[a-z0-9-]+?\\.php!i', $url)) { $url = "http://$url"; } - return str_replace("'", '&#039;', - preg_replace('|&([^#])(?![a-z]{2,8};)|', '&#038;$1', $url)); + return str_replace("'", "&#039;", + preg_replace('|&([^#])(?![a-z]{2,8};)|', "&#038;$1", $url)); } # Turn IEEE-style footnote links into links with links from the footnotes @@ -89,7 +88,8 @@ function input_footnoterize($text, $slug) { } if (sizeof($footnotes)) { $footnotes = "\n\n<ol class=\"footnote\">\n" . - implode('', $footnotes) . "</ol>\n"; - } else { $footnotes = ''; } - return implode('', $parts) . $footnotes; + implode("", $footnotes) . "</ol>\n"; + } + else { $footnotes = ""; } + return implode("", $parts) . $footnotes; } include/lib_input.php @@ -2,10 +2,10 @@ # Strip down an arbitrary string, permalink-style function url_sanitize($s) { - return implode('-', array_map('_url_sanitize', explode(' ', + return implode('-', array_map('_url_sanitize', explode(" ", strtolower($s)))); } function _url_sanitize($s) { preg_match_all('![a-z0-9_-]+!', $s, $match); - return implode('', $match[0]); + return implode("", $match[0]); } include/lib_url.php @@ -7,23 +7,22 @@ $routes = array( # Individual posts and secret previews - '/(\d{4})/(\d{2})/(\d{2})/([^./]+)/([^./]+)' => 'post.php', - '/(\d{4})/(\d{2})/(\d{2})/([^./]+)' => 'post.php', + '/(\d{4})/(\d{2})/(\d{2})/([^./]+)/([^./]+)' => "post.php", + '/(\d{4})/(\d{2})/(\d{2})/([^./]+)' => "post.php", # Tags - '/tags/([^.]+)' => 'tags.php', + '/tags/([^.]+)' => "tags.php", # Date archives - '/(\d{4})/(\d{2})/(\d{2})' => 'archives.php', - '/(\d{4})/(\d{2})' => 'archives.php', - '/(\d{4})' => 'archives.php', + '/(\d{4})/(\d{2})/(\d{2})' => "archives.php", + '/(\d{4})/(\d{2})' => "archives.php", + '/(\d{4})' => "archives.php", # Atom feed - '/feed' => 'feed.php', + '/feed' => "feed.php", + '/' => "index.php", - '/' => 'index.php', - - '' => '404.php' + '' => "404.php", ); include/routes.php @@ -1,10 +1,10 @@ <?php -require_once dirname(__FILE__) . '/../include/init.php'; +require_once dirname(__FILE__) . "/../include/init.php"; # Find the proper route to use -require_once dirname(__FILE__) . '/../include/routes.php'; -if ('' == $_GET['__url__']) { $_GET['__url__'] = '/'; } +require_once dirname(__FILE__) . "/../include/routes.php"; +if ("" == $_GET['__url__']) { $_GET['__url__'] = "/"; } foreach ($routes as $pattern => $FILE) { if (preg_match( "!^$pattern(?:/|\.(html|xml|json|rss|rdf|atom|php))?(?:\?.*)?$!", @@ -16,7 +16,7 @@ foreach ($routes as $pattern => $FILE) { } } if (!isset($URL)) { - $FILE = '404.php'; + $FILE = "404.php"; $URL = $_GET['__url__']; $URL_PARTS = array(); $FORMAT = 'html'; public/__banzai__.php @@ -10,4 +10,5 @@ if (file_exists("{$smarty->template_dir}/.posts/$date.html")) { assign('older', @file_get_contents( "{$smarty->template_dir}/.posts/$date/older")); display(); -} else { display('404'); } +} +else { display('404'); } public/archives.php @@ -2,7 +2,8 @@ if ($current = @file_get_contents("{$smarty->template_dir}/.posts/current")) { header("Location: $current\r\n"); -} else { +} +else { loadlib('blog_comment'); display(); } public/index.php @@ -3,4 +3,5 @@ $page = $URL_PARTS[0]; if (file_exists("{$smarty->template_dir}/$page.html")) { display($page); -} else { display('404'); } +} +else { display('404'); } public/page.php @@ -27,4 +27,5 @@ else { $post = implode('/', $URL_PARTS) . ".$FORMAT"; } if (file_exists("{$smarty->template_dir}/.posts/$post")) { assign('page', true); display(".posts/$post"); -} else { display('404'); } +} +else { display('404'); } public/post.php @@ -6,4 +6,5 @@ $tag = $URL_PARTS[0]; if (file_exists("{$smarty->template_dir}/.tags/$tag.html")) { assign('tag'); display(); -} else { display('404'); } +} +else { display('404'); } public/tags.php @@ -1,6 +1,6 @@ {if $COMMENTS} <form id="comment" action="{$URL}" method="post"> -<p><label for="test">Type &ldquo;qwerty&rdquo;:</label><br /> +<p><label for="test">Type &#8220;qwerty&#8221;:</label><br /> <input id="test" name="test" type="text" size="32" class="text" /></p> <p><label for="name">Name:</label><br /> <input id="name" name="name" type="text" value="{$smarty.post.name}" size="32" class="text" /></p> templates/_comment.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<title>{if $title}{$title} &mdash; {/if}{$TITLE}</title> +<title>{if $title}{$title} &#8212; {/if}{$TITLE}</title> <link type="application/atom+xml" rel="alternate" title="{$TITLE}" href="/feed" /> </head> <body> templates/_head.html @@ -1,6 +1,6 @@ {assign var="title" value="$tag"} {include file="_head.html"} -<h1>Posts tagged &ldquo;{$tag}&rdquo;</h1> +<h1>Posts tagged &#8220;{$tag}&#8221;</h1> {include file=".tags/$tag.html"} </div> <div class="nav"> templates/tags.html fc7fcc4da5d0bba43677681b9bd20067ed3fe162 Richard Crowley r@rcrowley.org http://github.com/rcrowley/bashpress/commit/98999252c396576b54f96e548bd24657fc7b3355 98999252c396576b54f96e548bd24657fc7b3355 2009-09-05T11:06:11-07:00 2009-09-05T11:06:11-07:00 Cleaning up coding style and reacquainting myself with this codebase. 89890ef650f9c5be3e288380757512d2c232a618 Richard Crowley r@rcrowley.org