6 files changed, 536 insertions, 148 deletions
diff --git a/_test/core/TestRequest.php b/_test/core/TestRequest.php
index 0a54910ed..060e37d28 100644
--- a/_test/core/TestRequest.php
+++ b/_test/core/TestRequest.php
@@ -44,13 +44,18 @@ class TestRequest {
      * @return TestResponse the resulting output of the request
      */
     public function execute($uri='/doku.php') {
+        global $INPUT;
+        global $ID;
+        global $INFO;
+
         // save old environment
         $server = $_SERVER;
         $session = $_SESSION;
         $get = $_GET;
         $post = $_POST;
         $request = $_REQUEST;
-
+        $input = $INPUT;
+        
         // prepare the right URI
         $this->setUri($uri);
 
@@ -74,6 +79,7 @@ class TestRequest {
         // now execute dokuwiki and grep the output
         header_remove();
         ob_start('ob_start_callback');
+        $INPUT = new Input();
         include(DOKU_INC.$this->script);
         ob_end_flush();
 
@@ -89,6 +95,7 @@ class TestRequest {
         $_GET = $get;
         $_POST = $post;
         $_REQUEST = $request;
+        $INPUT = $input;
 
         return $response;
     }
diff --git a/_test/tests/test/basic.test.php b/_test/tests/test/basic.test.php
index 86acef935..0639f0c5a 100644
--- a/_test/tests/test/basic.test.php
+++ b/_test/tests/test/basic.test.php
@@ -33,7 +33,7 @@ class InttestsBasicTest extends DokuWikiTest {
         $response = $request->execute();
 
         $this->assertTrue(
-            strpos($response->getContent(), 'DokuWiki') >= 0,
+            strpos($response->getContent(), 'DokuWiki') !== false,
             'DokuWiki was not a word in the output'
         );
     }
@@ -60,7 +60,7 @@ class InttestsBasicTest extends DokuWikiTest {
         $this->assertEquals('wiki:dokuwiki', $request->getPost('id'));
 
         // output check
-        $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') >= 0);
+        $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') !== false);
     }
 
     function testPostGet() {
@@ -84,7 +84,7 @@ class InttestsBasicTest extends DokuWikiTest {
         $this->assertEquals('wiki:dokuwiki', $request->getGet('id'));
 
         // output check
-        $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') >= 0);
+        $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') !== false);
     }
 
     function testGet() {
@@ -116,7 +116,7 @@ class InttestsBasicTest extends DokuWikiTest {
         $this->assertEquals('bar', $request->getGet('test'));
 
         // output check
-        $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') >= 0);
+        $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') !== false);
     }
 
     function testScripts() {
@@ -168,5 +168,13 @@ class InttestsBasicTest extends DokuWikiTest {
        $response = new TestResponse('',array_slice($this->some_headers,0,-2));  // slice off the last two headers to leave no status header
        $this->assertNull($response->getStatusCode());
     }
+    
+    function testINPUT() {
+        $request = new TestRequest();
+        $response = $request->get(array('id' => 'mailinglist'), '/doku.php');
+
+        // output check
+        $this->assertTrue(strpos($response->getContent(), 'Netiquette') !== false);
+    }
 
 }
diff --git a/bin/gittool.php b/bin/gittool.php
new file mode 100755
index 000000000..f9f68ac94
--- /dev/null
+++ b/bin/gittool.php
@@ -0,0 +1,340 @@
+#!/usr/bin/php
+<?php
+
+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');
+
+$GitToolCLI = new GitToolCLI();
+
+array_shift($argv);
+$command = array_shift($argv);
+
+switch($command) {
+    case '':
+    case 'help':
+        $GitToolCLI->cmd_help();
+        break;
+    case 'clone':
+        $GitToolCLI->cmd_clone($argv);
+        break;
+    case 'install':
+        $GitToolCLI->cmd_install($argv);
+        break;
+    case 'repo':
+    case 'repos':
+        $GitToolCLI->cmd_repos();
+        break;
+    default:
+        $GitToolCLI->cmd_git($command, $argv);
+}
+
+/**
+ * Easily manage DokuWiki git repositories
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+class GitToolCLI {
+    private $color = true;
+
+    public function cmd_help() {
+        echo <<<EOF
+Usage: gittool.php <command> [parameters]
+
+Manage git repositories for DokuWiki and its plugins and templates.
+
+EXAMPLE
+
+$> ./bin/gittool.php clone gallery template:ach
+$> ./bin/gittool.php repos
+$> ./bin/gittool.php origin -v
+
+COMMANDS
+
+help
+    This help screen
+
+clone <extensions>
+    Tries to install a known plugin or template (prefix with template:) via
+    git. Uses the DokuWiki.org plugin repository to find the proper git
+    repository. Multiple extensions can be given as parameters
+
+install <extensions>
+    The same as clone, but when no git source repository can be found, the
+    extension is installed via download
+
+repos
+    Lists all git repositories found in this DokuWiki installation
+
+<any>
+    Any unknown commands are assumed to be arguments to git and will be
+    executed in all repositories found within this DokuWiki installation
+
+EOF;
+    }
+
+    /**
+     * Tries to install the given extensions using git clone
+     *
+     * @param       $extensions
+     */
+    public function cmd_clone($extensions) {
+        $errors    = array();
+        $succeeded = array();
+
+        foreach($extensions as $ext) {
+            $repo = $this->getSourceRepo($ext);
+
+            if(!$repo) {
+                $this->msg_error("could not find a repository for $ext");
+                $errors[] = $ext;
+            } else {
+                if($this->cloneExtension($ext, $repo)) {
+                    $succeeded[] = $ext;
+                } else {
+                    $errors[] = $ext;
+                }
+            }
+        }
+
+        echo "\n";
+        if($succeeded) $this->msg_success('successfully cloned the following extensions: '.join(', ', $succeeded));
+        if($errors) $this->msg_error('failed to clone the following extensions: '.join(', ', $errors));
+    }
+
+    /**
+     * Tries to install the given extensions using git clone with fallback to install
+     *
+     * @param       $extensions
+     */
+    public function cmd_install($extensions) {
+        $errors    = array();
+        $succeeded = array();
+
+        foreach($extensions as $ext) {
+            $repo = $this->getSourceRepo($ext);
+
+            if(!$repo) {
+                $this->msg_info("could not find a repository for $ext");
+                if($this->downloadExtension($ext)) {
+                    $succeeded[] = $ext;
+                } else {
+                    $errors[] = $ext;
+                }
+            } else {
+                if($this->cloneExtension($ext, $repo)) {
+                    $succeeded[] = $ext;
+                } else {
+                    $errors[] = $ext;
+                }
+            }
+        }
+
+        echo "\n";
+        if($succeeded) $this->msg_success('successfully installed the following extensions: '.join(', ', $succeeded));
+        if($errors) $this->msg_error('failed to install the following extensions: '.join(', ', $errors));
+    }
+
+    /**
+     * Executes the given git command in every repository
+     *
+     * @param $cmd
+     * @param $arg
+     */
+    public function cmd_git($cmd, $arg) {
+        $repos = $this->findRepos();
+
+        $shell = array_merge(array('git', $cmd), $arg);
+        $shell = array_map('escapeshellarg', $shell);
+        $shell = join(' ', $shell);
+
+        foreach($repos as $repo) {
+            if(!@chdir($repo)) {
+                $this->msg_error("Could not change into $repo");
+                continue;
+            }
+
+            echo "\n";
+            $this->msg_info("executing $shell in $repo");
+            $ret = 0;
+            system($shell, $ret);
+
+            if($ret == 0) {
+                $this->msg_success("git succeeded in $repo");
+            } else {
+                $this->msg_error("git failed in $repo");
+            }
+        }
+    }
+
+    /**
+     * Simply lists the repositories
+     */
+    public function cmd_repos() {
+        $repos = $this->findRepos();
+        foreach($repos as $repo) {
+            echo "$repo\n";
+        }
+    }
+
+    /**
+     * Install extension from the given download URL
+     *
+     * @param string $ext
+     * @return bool
+     */
+    private function downloadExtension($ext) {
+        /** @var helper_plugin_extension_extension $plugin */
+        $plugin = plugin_load('helper', 'extension_extension');
+        if(!$ext) die("extension plugin not available, can't continue");
+        $plugin->setExtension($ext);
+
+        $url = $plugin->getDownloadURL();
+        if(!$url) {
+            $this->msg_error("no download URL for $ext");
+            return false;
+        }
+
+        $ok = false;
+        try {
+            $this->msg_info("installing $ext via download from $url");
+            $ok = $plugin->installFromURL($url);
+        } catch(Exception $e) {
+            $this->msg_error($e->getMessage());
+        }
+
+        if($ok) {
+            $this->msg_success("installed $ext via download");
+            return true;
+        } else {
+            $this->msg_success("failed to install $ext via download");
+            return false;
+        }
+    }
+
+    /**
+     * Clones the extension from the given repository
+     *
+     * @param string $ext
+     * @param string $repo
+     * @return bool
+     */
+    private function cloneExtension($ext, $repo) {
+        if(substr($ext, 0, 9) == 'template:') {
+            $target = fullpath(tpl_incdir().'../'.substr($ext, 9));
+        } else {
+            $target = DOKU_PLUGIN.$ext;
+        }
+
+        $this->msg_info("cloning $ext from $repo to $target");
+        $ret = 0;
+        system("git clone $repo $target", $ret);
+        if($ret === 0) {
+            $this->msg_success("cloning of $ext succeeded");
+            return true;
+        } else {
+            $this->msg_error("cloning of $ext failed");
+            return false;
+        }
+    }
+
+    /**
+     * Returns all git repositories in this DokuWiki install
+     *
+     * Looks in root, template and plugin directories only.
+     *
+     * @return array
+     */
+    private function findRepos() {
+        $this->msg_info('Looking for .git directories');
+        $data = array_merge(
+            glob(DOKU_INC.'.git', GLOB_ONLYDIR),
+            glob(DOKU_PLUGIN.'*/.git', GLOB_ONLYDIR),
+            glob(fullpath(tpl_incdir().'../').'/*/.git', GLOB_ONLYDIR)
+        );
+
+        if(!$data) {
+            $this->msg_error('Found no .git directories');
+        } else {
+            $this->msg_success('Found '.count($data).' .git directories');
+        }
+        $data = array_map('fullpath', array_map('dirname', $data));
+        return $data;
+    }
+
+    /**
+     * Returns the repository for the given extension
+     *
+     * @param $extension
+     * @return bool|string
+     */
+    private function getSourceRepo($extension) {
+        /** @var helper_plugin_extension_extension $ext */
+        $ext = plugin_load('helper', 'extension_extension');
+        if(!$ext) die("extension plugin not available, can't continue");
+        $ext->setExtension($extension);
+
+        $repourl = $ext->getSourcerepoURL();
+        if(!$repourl) return false;
+
+        // match github repos
+        if(preg_match('/github\.com\/([^\/]+)\/([^\/]+)/i', $repourl, $m)) {
+            $user = $m[1];
+            $repo = $m[2];
+            return 'https://github.com/'.$user.'/'.$repo.'.git';
+        }
+
+        // match gitorious repos
+        if(preg_match('/gitorious.org\/([^\/]+)\/([^\/]+)?/i', $repourl, $m)) {
+            $user = $m[1];
+            $repo = $m[2];
+            if(!$repo) $repo = $user;
+
+            return 'https://git.gitorious.org/'.$user.'/'.$repo.'.git';
+        }
+
+        // match bitbucket repos - most people seem to use mercurial there though
+        if(preg_match('/bitbucket\.org\/([^\/]+)\/([^\/]+)/i', $repourl, $m)) {
+            $user = $m[1];
+            $repo = $m[2];
+            return 'https://bitbucket.org/'.$user.'/'.$repo.'.git';
+        }
+
+        return false;
+    }
+
+    /**
+     * Print an error message
+     *
+     * @param $string
+     */
+    private function msg_error($string) {
+        if($this->color) echo "\033[31m"; // red
+        echo "E: $string\n";
+        if($this->color) echo "\033[37m"; // reset
+    }
+
+    /**
+     * Print a success message
+     *
+     * @param $string
+     */
+    private function msg_success($string) {
+        if($this->color) echo "\033[32m"; // green
+        echo "S: $string\n";
+        if($this->color) echo "\033[37m"; // reset
+    }
+
+    /**
+     * Print an info message
+     *
+     * @param $string
+     */
+    private function msg_info($string) {
+        if($this->color) echo "\033[36m"; // cyan
+        echo "I: $string\n";
+        if($this->color) echo "\033[37m"; // reset
+    }
+}
+\ No newline at end of file
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 56c185db7..c07b8f975 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -134,7 +134,10 @@ function pickerInsert(text,edid){
  */
 function addBtnActionSignature($btn, props, edid) {
     if(typeof SIG != 'undefined' && SIG != ''){
-        $btn.bind('click', bind(insertAtCarret,edid,SIG));
+        $btn.bind('click', function (e) {
+            insertAtCarret(edid,SIG);
+            e.preventDefault();
+        });
         return edid;
     }
     return '';
diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
index e5cc73b49..95c632e45 100644
--- a/lib/scripts/qsearch.js
+++ b/lib/scripts/qsearch.js
@@ -6,165 +6,193 @@
  * @author   Adrian Lang <lang@cosmocode.de>
  * @author   Michal Rezler <m.rezler@centrum.cz>
  */
+jQuery.fn.dw_qsearch = function (overrides) {
 
-var dw_qsearch = {
-
-    $inObj: null,
-    $outObj: null,
-    timer: null,
-    curRequest: null,
-
-    /**
-     * initialize the quick search
-     *
-     * Attaches the event handlers
-     *
-     * @param input element (jQuery selector/DOM obj)
-     * @param output element (jQuery selector/DOM obj)
-     */
-    init: function (input, output) {
-        var do_qsearch;
-
-        dw_qsearch.$inObj  = jQuery(input);
-        dw_qsearch.$outObj = jQuery(output);
-
-        // objects found?
-        if (dw_qsearch.$inObj.length === 0 ||
-            dw_qsearch.$outObj.length === 0) {
-            return;
-        }
+    var dw_qsearch = {
 
-        // attach eventhandler to search field
-        do_qsearch = function () {
-            // abort any previous request
-            if (dw_qsearch.curRequest != null) {
-                dw_qsearch.curRequest.abort();
-            }
-            var value = dw_qsearch.$inObj.val();
-            if (value === '') {
-                dw_qsearch.clear_results();
+        output: '#qsearch__out',
+
+        $inObj: this,
+        $outObj: null,
+        timer: null,
+        curRequest: null,
+
+        /**
+         * initialize the quick search
+         *
+         * Attaches the event handlers
+         *
+         */
+        init: function () {
+            var do_qsearch;
+
+            dw_qsearch.$outObj = jQuery(dw_qsearch.output);
+
+            // objects found?
+            if (dw_qsearch.$inObj.length === 0 ||
+                dw_qsearch.$outObj.length === 0) {
                 return;
             }
-            dw_qsearch.curRequest = jQuery.post(
-                DOKU_BASE + 'lib/exe/ajax.php',
-                {
-                    call: 'qsearch',
-                    q: encodeURI(value)
-                },
-                dw_qsearch.onCompletion,
-                'html'
-            );
-        };
 
-        dw_qsearch.$inObj.keyup(
-            function() {
-                if(dw_qsearch.timer){
-                    window.clearTimeout(dw_qsearch.timer);
-                    dw_qsearch.timer = null;
+            // attach eventhandler to search field
+            do_qsearch = function () {
+                // abort any previous request
+                if (dw_qsearch.curRequest != null) {
+                    dw_qsearch.curRequest.abort();
                 }
-                dw_qsearch.timer = window.setTimeout(do_qsearch, 500);
-            }
-        );
-
-        // attach eventhandler to output field
-        dw_qsearch.$outObj.click(dw_qsearch.clear_results);
-    },
-
-    /**
-     * Empty and hide the output div
-     */
-    clear_results: function(){
-        dw_qsearch.$outObj.hide();
-        dw_qsearch.$outObj.text('');
-    },
-
-    /**
-     * Callback. Reformat and display the results.
-     *
-     * Namespaces are shortened here to keep the results from overflowing
-     * or wrapping
-     *
-     * @param data The result HTML
-     */
-    onCompletion: function(data) {
-        var max, $links, too_big;
-
-        dw_qsearch.curRequest = null;
-
-        if (data === '') {
-            dw_qsearch.clear_results();
-            return;
-        }
-
-        dw_qsearch.$outObj
-            .html(data)
-            .show()
-            .css('white-space', 'nowrap');
-
-        // disable overflow during shortening
-        dw_qsearch.$outObj.find('li').css('overflow', 'visible');
-
-        $links = dw_qsearch.$outObj.find('a');
-        max    = dw_qsearch.$outObj[0].clientWidth; // maximum width allowed (but take away paddings below)
-        if(document.documentElement.dir === 'rtl'){
-            max -= parseInt(dw_qsearch.$outObj.css('padding-left'));
-            too_big = function (l) { return l.offsetLeft < 0; };
-        }else{
-            max -= parseInt(dw_qsearch.$outObj.css('padding-right'));
-            too_big = function (l) { return l.offsetWidth + l.offsetLeft > max; };
-        }
-
-        $links.each(function () {
-            var start, length, replace, nsL, nsR, eli, runaway;
+                var value = dw_qsearch.getSearchterm();
+                if (value === '') {
+                    dw_qsearch.clear_results();
+                    return;
+                }
+                dw_qsearch.curRequest = jQuery.post(
+                    DOKU_BASE + 'lib/exe/ajax.php',
+                    {
+                        call: 'qsearch',
+                        q: encodeURI(value)
+                    },
+                    dw_qsearch.onCompletion,
+                    'html'
+                );
+            };
+
+            dw_qsearch.$inObj.keyup(
+                function () {
+                    if (dw_qsearch.timer) {
+                        window.clearTimeout(dw_qsearch.timer);
+                        dw_qsearch.timer = null;
+                    }
+                    dw_qsearch.timer = window.setTimeout(do_qsearch, 500);
+                }
+            );
 
-            if (!too_big(this)) {
+            // attach eventhandler to output field
+            dw_qsearch.$outObj.click(dw_qsearch.clear_results);
+        },
+
+        /**
+         * Read search term from input
+         */
+        getSearchterm: function() {
+            return dw_qsearch.$inObj.val();
+        },
+
+        /**
+         * Empty and hide the output div
+         */
+        clear_results: function () {
+            dw_qsearch.$outObj.hide();
+            dw_qsearch.$outObj.text('');
+        },
+
+        /**
+         * Callback. Reformat and display the results.
+         *
+         * Namespaces are shortened here to keep the results from overflowing
+         * or wrapping
+         *
+         * @param data The result HTML
+         */
+        onCompletion: function (data) {
+            var max, $links, too_big;
+
+            dw_qsearch.curRequest = null;
+
+            if (data === '') {
+                dw_qsearch.clear_results();
                 return;
             }
 
-            // make IE's innerText available to W3C conform browsers
-            if(this.textContent){
-                this.__defineGetter__('innerText', function(){ return this.textContent });
-                this.__defineSetter__('innerText', function(val){ this.textContent = val });
+            dw_qsearch.$outObj
+                .html(data)
+                .show()
+                .css('white-space', 'nowrap');
+
+            // disable overflow during shortening
+            dw_qsearch.$outObj.find('li').css('overflow', 'visible');
+
+            $links = dw_qsearch.$outObj.find('a');
+            max = dw_qsearch.$outObj[0].clientWidth; // maximum width allowed (but take away paddings below)
+            if (document.documentElement.dir === 'rtl') {
+                max -= parseInt(dw_qsearch.$outObj.css('padding-left'));
+                too_big = function (l) {
+                    return l.offsetLeft < 0;
+                };
+            } else {
+                max -= parseInt(dw_qsearch.$outObj.css('padding-right'));
+                too_big = function (l) {
+                    return l.offsetWidth + l.offsetLeft > max;
+                };
             }
 
-            nsL = this.innerText.indexOf('(');
-            nsR = this.innerText.indexOf(')');
-            eli = 0;
-            runaway = 0;
-
-            while((nsR - nsL > 3) && too_big(this) && runaway++ < 500) {
-                if(eli !== 0){
-                    // elipsis already inserted
-                    if( (eli - nsL) > (nsR - eli) ){
-                        // cut left
-                        start = eli - 2;
-                        length = 2;
-                    }else{
-                        // cut right
-                        start = eli + 1;
-                        length = 1;
-                    }
-                    replace = '';
-                }else{
-                    // replace middle with ellipsis
-                    start = Math.floor( nsL + ((nsR-nsL)/2) );
-                    length = 1;
-                    replace = '…';
+            $links.each(function () {
+                var start, length, replace, nsL, nsR, eli, runaway;
+
+                if (!too_big(this)) {
+                    return;
+                }
+
+                // make IE's innerText available to W3C conform browsers
+                if (this.textContent) {
+                    this.__defineGetter__('innerText', function () {
+                        return this.textContent
+                    });
+                    this.__defineSetter__('innerText', function (val) {
+                        this.textContent = val
+                    });
                 }
-                this.innerText = substr_replace(this.innerText,
-                                                replace, start, length);
 
-                eli = this.innerText.indexOf('…');
                 nsL = this.innerText.indexOf('(');
                 nsR = this.innerText.indexOf(')');
-            }
-        });
+                eli = 0;
+                runaway = 0;
+
+                while ((nsR - nsL > 3) && too_big(this) && runaway++ < 500) {
+                    if (eli !== 0) {
+                        // elipsis already inserted
+                        if ((eli - nsL) > (nsR - eli)) {
+                            // cut left
+                            start = eli - 2;
+                            length = 2;
+                        } else {
+                            // cut right
+                            start = eli + 1;
+                            length = 1;
+                        }
+                        replace = '';
+                    } else {
+                        // replace middle with ellipsis
+                        start = Math.floor(nsL + ((nsR - nsL) / 2));
+                        length = 1;
+                        replace = '…';
+                    }
+                    this.innerText = substr_replace(this.innerText,
+                        replace, start, length);
 
-        // reenable overflow
-        dw_qsearch.$outObj.find('li').css('overflow', 'hidden').css('text-overflow','ellipsis');
+                    eli = this.innerText.indexOf('…');
+                    nsL = this.innerText.indexOf('(');
+                    nsR = this.innerText.indexOf(')');
+                }
+            });
+
+            // reenable overflow
+            dw_qsearch.$outObj.find('li').css('overflow', 'hidden').css('text-overflow', 'ellipsis');
+        }
+
+
+    };
+
+    jQuery.extend(dw_qsearch, overrides);
+
+    if (!overrides.deferInit) {
+        dw_qsearch.init();
     }
+
+    return dw_qsearch;
 };
 
 jQuery(function () {
-    dw_qsearch.init('#qsearch__in','#qsearch__out');
+    jQuery('#qsearch__in').dw_qsearch({
+        output: '#qsearch__out'
+    });
 });
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 09c374bc4..1bb02b406 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -199,8 +199,9 @@ function addBtnActionPicker($btn, props, edid) {
     jQuery(picker).attr('aria-hidden', 'true');
 
     $btn.click(
-        function() {
+        function(e) {
             pickerToggle(pickerid,$btn);
+            e.preventDefault();
             return '';
         }
     );
@@ -219,9 +220,10 @@ function addBtnActionPicker($btn, props, edid) {
  */
 function addBtnActionLinkwiz($btn, props, edid) {
     dw_linkwiz.init(jQuery('#'+edid));
-    jQuery($btn).click(function(){
+    jQuery($btn).click(function(e){
         dw_linkwiz.val = props;
         dw_linkwiz.toggle();
+        e.preventDefault();
         return '';
     });
     return 'link__wiz';