3 files changed, 70 insertions, 2 deletions
diff --git a/bin/dwpage.php b/bin/dwpage.php
index f664770bf..211bc5a9e 100755
--- a/bin/dwpage.php
+++ b/bin/dwpage.php
@@ -98,12 +98,12 @@ function usage($action) {
 #------------------------------------------------------------------------------
 function getUser() {
     $user = getenv('USER');
-    if (empty ($username)) {
+    if (empty ($user)) {
         $user = getenv('USERNAME');
     } else {
         return $user;
     }
-    if (empty ($username)) {
+    if (empty ($user)) {
         $user = 'admin';
     }
     return $user;
diff --git a/bin/indexer.php b/bin/indexer.php
index 55f3608d5..c95314d7c 100755
--- a/bin/indexer.php
+++ b/bin/indexer.php
@@ -152,6 +152,7 @@ function _clearindex(){
     _lock();
     _quietecho("Clearing index... ");
     io_saveFile($conf['indexdir'].'/page.idx','');
+    io_saveFile($conf['indexdir'].'/title.idx','');
     $dir = @opendir($conf['indexdir']);
     if($dir!==false){
         while(($f = readdir($dir)) !== false){
diff --git a/bin/render.php b/bin/render.php
new file mode 100755
index 000000000..d30ef2958
--- /dev/null
+++ b/bin/render.php
@@ -0,0 +1,67 @@
+#!/usr/bin/php
+<?php
+/**
+ * A simple commandline tool to render some DokuWiki syntax with a given
+ * renderer.
+ *
+ * This may not work for plugins that expect a certain environment to be
+ * set up before rendering, but should work for most or even all standard
+ * DokuWiki markup
+ *
+ * @license GPL2
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+if ('cli' != php_sapi_name()) die();
+
+ini_set('memory_limit','128M');
+if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+define('NOSESSION',1);
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/parserutils.php');
+require_once(DOKU_INC.'inc/cliopts.php');
+
+// handle options
+$short_opts = 'hr:';
+$long_opts  = array('help','renderer:');
+$OPTS = Doku_Cli_Opts::getOptions(__FILE__,$short_opts,$long_opts);
+if ( $OPTS->isError() ) {
+    fwrite( STDERR, $OPTS->getMessage() . "\n");
+    _usage();
+    exit(1);
+}
+$RENDERER = 'xhtml';
+foreach ($OPTS->options as $key => $val) {
+    switch ($key) {
+        case 'h':
+        case 'help':
+            _usage();
+            exit;
+        case 'r':
+        case 'renderer':
+            $RENDERER = $val;
+    }
+}
+
+
+// do the action
+$source = stream_get_contents(STDIN);
+$info = array();
+$result = p_render($RENDERER,p_get_instructions($source),$info);
+if(is_null($result)) die("No such renderer $RENDERER\n");
+echo $result;
+
+/**
+ * Print usage info
+ */
+function _usage(){
+    print "Usage: render.php <options>
+
+    Reads DokuWiki syntax from STDIN and renders it with the given renderer
+    to STDOUT
+
+    OPTIONS
+        -h, --help                 show this help and exit
+        -r, --renderer <renderer>  the render mode (default: xhtml)
+";
+}