merge master in branch

25 files changed, 996 insertions, 14 deletions

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index 310b3627a..732fef9ed 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -27,6 +27,7 @@ define('DOKU_TMP_DATA', TMP_DIR.'/data/');
 
 // default plugins
 $default_plugins = array(
+    'authplain',
     'acl',
     'config',
     'info',
diff --git a/_test/conf/acl.auth.php b/_test/conf/acl.auth.php
index 8a1b01f23..495740720 100644
--- a/_test/conf/acl.auth.php
+++ b/_test/conf/acl.auth.php
@@ -19,6 +19,7 @@
 # delete 16
 
 *               @ALL        8
+private:*       @ALL        0
 
 # for testing wildcards:
 users:*            @ALL         1
diff --git a/_test/core/TestRequest.php b/_test/core/TestRequest.php
index 172821576..0a54910ed 100644
--- a/_test/core/TestRequest.php
+++ b/_test/core/TestRequest.php
@@ -18,6 +18,9 @@ function ob_start_callback($buffer) {
  */
 class TestRequest {
 
+    private $valid_scripts = array('/doku.php', '/lib/exe/fetch.php', '/lib/exe/detail.php');
+    private $script;
+
     private $server = array();
     private $session = array();
     private $get = array();
@@ -27,6 +30,7 @@ class TestRequest {
     public function getSession($key) { return $this->session[$key]; }
     public function getGet($key) { return $this->get[$key]; }
     public function getPost($key) { return $this->post[$key]; }
+    public function getScript() { return $this->script; }
 
     public function setServer($key, $value) { $this->server[$key] = $value; }
     public function setSession($key, $value) { $this->session[$key] = $value; }
@@ -70,13 +74,13 @@ class TestRequest {
         // now execute dokuwiki and grep the output
         header_remove();
         ob_start('ob_start_callback');
-        include(DOKU_INC.'doku.php');
+        include(DOKU_INC.$this->script);
         ob_end_flush();
 
         // create the response object
         $response = new TestResponse(
             $output_buffer,
-            headers_list()
+            (function_exists('xdebug_get_headers') ? xdebug_get_headers() : headers_list())   // cli sapi doesn't do headers, prefer xdebug_get_headers() which works under cli
         );
 
         // reset environment
@@ -102,14 +106,15 @@ class TestRequest {
      * @todo make this work with other end points
      */
     protected function setUri($uri){
-        if(substr($uri,0,9) != '/doku.php'){
-            throw new Exception("only '/doku.php' is supported currently");
+        if(!preg_match('#^('.join('|',$this->valid_scripts).')#',$uri)){
+            throw new Exception("$uri \n--- only ".join(', ',$this->valid_scripts)." are supported currently");
         }
 
         $params = array();
         list($uri, $query) = explode('?',$uri,2);
         if($query) parse_str($query, $params);
 
+        $this->script = substr($uri,1);
         $this->get  = array_merge($params, $this->get);
         if(count($this->get)){
             $query = '?'.http_build_query($this->get, '', '&');
@@ -129,7 +134,7 @@ class TestRequest {
      * Simulate a POST request with the given variables
      *
      * @param array $post  all the POST parameters to use
-     * @param string $url  end URL to simulate, needs to start with /doku.php currently
+     * @param string $url  end URL to simulate, needs to start with /doku.php, /lib/exe/fetch.php or /lib/exe/detail.php currently
      * @param return TestResponse
      */
     public function post($post=array(), $uri='/doku.php') {
@@ -141,8 +146,8 @@ class TestRequest {
     /**
      * Simulate a GET request with the given variables
      *
-     * @param array $GET  all the POST parameters to use
-     * @param string $url  end URL to simulate, needs to start with /doku.php currently
+     * @param array $GET   all the GET parameters to use
+     * @param string $url  end URL to simulate, needs to start with /doku.php, /lib/exe/fetch.php or /lib/exe/detail.php currently
      * @param return TestResponse
      */
     public function get($get=array(), $uri='/doku.php') {
diff --git a/_test/core/TestResponse.php b/_test/core/TestResponse.php
index 6d20afb28..7cc50ee4f 100644
--- a/_test/core/TestResponse.php
+++ b/_test/core/TestResponse.php
@@ -42,6 +42,44 @@ class TestResponse {
     }
 
     /**
+     * @param  $name   string, the name of the header without the ':', e.g. 'Content-Type', 'Pragma'
+     * @return mixed   if exactly one header, the header (string); otherwise an array of headers, empty when no headers
+     */
+    public function getHeader($name) {
+        $result = array();
+        foreach ($this->headers as $header) {
+            if (substr($header,0,strlen($name)+1) == $name.':') {
+                $result[] = $header;
+            }
+        }
+
+        return count($result) == 1 ? $result[0] : $result;
+    }
+
+    /**
+     * @return  int  http status code
+     *
+     * in the test environment, only status codes explicitly set by dokuwiki are likely to be returned
+     * this means succcessful status codes (e.g. 200 OK) will not be present, but error codes will be
+     */
+    public function getStatusCode() {
+        $headers = $this->getHeader('Status');
+        $code = null;
+
+        if ($headers) {
+            // if there is more than one status header, use the last one
+            $status = is_array($headers) ? array_pop($headers) : $headers;
+            $matches = array();
+            preg_match('/^Status: ?(\d+)/',$status,$matches);
+            if ($matches){
+                $code = $matches[1];
+            }
+         }
+
+         return $code;
+    }
+
+    /**
      * Query the response for a JQuery compatible CSS selector
      *
      * @link https://code.google.com/p/phpquery/wiki/Selectors
diff --git a/_test/tests/inc/PassHash.test.php b/_test/tests/inc/PassHash.test.php
new file mode 100644
index 000000000..b6cb07090
--- /dev/null
+++ b/_test/tests/inc/PassHash.test.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Class PassHash_test
+ *
+ * most tests are in auth_password.test.php
+ */
+class PassHash_test extends PHPUnit_Framework_TestCase {
+
+    function test_hmac(){
+        // known hashes taken from https://code.google.com/p/yii/issues/detail?id=1942
+        $this->assertEquals('df08aef118f36b32e29d2f47cda649b6', PassHash::hmac('md5','data','secret'));
+        $this->assertEquals('9818e3306ba5ac267b5f2679fe4abd37e6cd7b54', PassHash::hmac('sha1','data','secret'));
+
+        // known hashes from https://en.wikipedia.org/wiki/Hash-based_message_authentication_code
+        $this->assertEquals('74e6f7298a9c2d168935f58c001bad88', PassHash::hmac('md5','',''));
+        $this->assertEquals('fbdb1d1b18aa6c08324b7d64b71fb76370690e1d', PassHash::hmac('sha1','',''));
+        $this->assertEquals('80070713463e7749b90c2dc24911e275', PassHash::hmac('md5','The quick brown fox jumps over the lazy dog','key'));
+        $this->assertEquals('de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9', PassHash::hmac('sha1','The quick brown fox jumps over the lazy dog','key'));
+
+    }
+}
\ No newline at end of file
diff --git a/_test/tests/inc/auth_aclcheck.test.php b/_test/tests/inc/auth_aclcheck.test.php
index 8e5a04ff5..b128b7871 100644
--- a/_test/tests/inc/auth_aclcheck.test.php
+++ b/_test/tests/inc/auth_aclcheck.test.php
@@ -9,7 +9,7 @@ class auth_acl_test extends DokuWikiTest {
         global $AUTH_ACL;
         global $auth;
         $this->oldAuthAcl = $AUTH_ACL;
-        $auth = new auth_basic();
+        $auth = new DokuWiki_Auth_Plugin();
     }
 
     function tearDown() {
diff --git a/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php b/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
index 2f4821c2d..21b2cfdb0 100644
--- a/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
+++ b/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
@@ -1,6 +1,6 @@
 <?php
 
-class auth_acl_caseinsensitive_auth extends auth_basic {
+class auth_acl_caseinsensitive_auth extends DokuWiki_Auth_Plugin {
     function isCaseSensitive() {
         return false;
     }
diff --git a/_test/tests/inc/auth_admincheck.test.php b/_test/tests/inc/auth_admincheck.test.php
index 17424a08e..087be3810 100644
--- a/_test/tests/inc/auth_admincheck.test.php
+++ b/_test/tests/inc/auth_admincheck.test.php
@@ -1,6 +1,6 @@
 <?php
 
-class auth_admin_test_AuthInSensitive extends auth_basic {
+class auth_admin_test_AuthInSensitive extends DokuWiki_Auth_Plugin {
     function isCaseSensitive(){
         return false;
     }
@@ -18,7 +18,7 @@ class auth_admin_test extends DokuWikiTest {
 
     function setSensitive() {
         global $auth;
-        $auth = new auth_basic();
+        $auth = new DokuWiki_Auth_Plugin();
     }
 
     function setInSensitive() {
diff --git a/_test/tests/inc/auth_browseruid.test.php b/_test/tests/inc/auth_browseruid.test.php
new file mode 100644
index 000000000..d33552582
--- /dev/null
+++ b/_test/tests/inc/auth_browseruid.test.php
@@ -0,0 +1,30 @@
+<?php
+
+class auth_browseruid_test extends DokuWikiTest {
+
+
+    /**
+     * regression test to ensure correct browser id on IE9.
+     *
+     * IE9 send different HTTP_ACCEPT_LANGUAGE header on ajax request.
+     */
+    function testIE9JsVsDefault() {
+
+        // javascript request
+        $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)';
+        $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate';
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'de';
+        unset($_SERVER['HTTP_ACCEPT_CHARSET']);
+        $javascriptId = auth_browseruid();
+
+        // default request
+        $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)';
+        $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate';
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'de-DE';
+        $normalId = auth_browseruid();
+
+        $this->assertEquals($normalId, $javascriptId);
+
+    }
+
+}
\ No newline at end of file
diff --git a/_test/tests/inc/common_basicinfo.test.php b/_test/tests/inc/common_basicinfo.test.php
new file mode 100644
index 000000000..0369474c9
--- /dev/null
+++ b/_test/tests/inc/common_basicinfo.test.php
@@ -0,0 +1,64 @@
+<?php
+
+class common_infofunctions_test extends DokuWikiTest {
+ 
+    function setup(){
+        parent::setup();
+
+        global $USERINFO; 
+        $USERINFO = array(
+           'pass' => '179ad45c6ce2cb97cf1029e212046e81',
+           'name' => 'Arthur Dent',
+           'mail' => 'arthur@example.com',
+           'grps' => array ('admin','user'),
+        );
+        $_SERVER['REMOTE_USER'] = 'testuser';
+        $_SERVER['REMOTE_ADDR'] = '1.2.3.4';
+    }
+    
+    function _get_info() {
+        global $USERINFO;
+        $info = array (

+          'isadmin' => true,

+          'ismanager' => true,
+          'userinfo' => $USERINFO,

+          'perm' => 255,

+          'namespace' => false,

+          'ismobile' => false,
+          'client' => 'testuser',
+        );
+      
+        return $info;
+    }
+
+    /**
+     * Its important to have the correct set of keys.
+     * Other functions provide the values
+     */
+    function test_basicinfo(){
+        // test with REMOTE_USER set and the user an admin user
+        $info = $this->_get_info();
+        $this->assertEquals(basicinfo($ID,true),$info);
+        
+        // with $httpclient parameter set to false 
+        unset($info['ismobile']);
+        $this->assertEquals(basicinfo($ID,false),$info);
+        
+        // with anonymous user
+        unset($_SERVER['REMOTE_USER']);
+        global $USERINFO; $USERINFO = array();
+
+        $info = array(
+          'isadmin' => false,
+          'ismanager' => false,
+          'perm' => 8,
+          'namespace' => false,
+          'ismobile' => false,
+          'client' => '1.2.3.4',
+        );
+        $this->assertEquals(basicinfo($ID,true),$info);
+    }
+    
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/common_mediainfo.test.php b/_test/tests/inc/common_mediainfo.test.php
new file mode 100644
index 000000000..0e67fbcd9
--- /dev/null
+++ b/_test/tests/inc/common_mediainfo.test.php
@@ -0,0 +1,49 @@
+<?php
+
+class common_basicinfo_test extends DokuWikiTest {
+ 
+    function setup(){
+        parent::setup();
+
+        global $USERINFO; 
+        $USERINFO = array(
+           'pass' => '179ad45c6ce2cb97cf1029e212046e81',
+           'name' => 'Arthur Dent',
+           'mail' => 'arthur@example.com',
+           'grps' => array ('admin','user'),
+        );
+        $_SERVER['REMOTE_USER'] = 'testuser';
+        $_SERVER['REMOTE_ADDR'] = '1.2.3.4';
+    }
+    
+    function _get_info() {
+        global $USERINFO;
+        $info = array (

+          'isadmin' => true,

+          'ismanager' => true,
+          'userinfo' => $USERINFO,

+          'perm' => 255,

+          'namespace' => false,

+          'ismobile' => false,
+          'client' => 'testuser',
+        );
+      
+        return $info;
+    }
+    
+    /**
+     * We're interested in the extra keys for $INFO when its a media request
+     */
+    function test_mediainfo(){
+        global $NS, $IMG;
+        $NS = '';
+        $IMG = 'testimage.png';
+         
+        $info = $this->_get_info();
+        $info['image'] = 'testimage.png';
+        
+        $this->assertEquals(mediainfo(),$info);
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/common_ml.test.php b/_test/tests/inc/common_ml.test.php
new file mode 100644
index 000000000..6f3b71db4
--- /dev/null
+++ b/_test/tests/inc/common_ml.test.php
@@ -0,0 +1,114 @@
+<?php
+
+class common_ml_test extends DokuWikiTest {
+
+    private $script = 'lib/exe/fetch.php';
+
+    function test_ml_empty() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+        $conf['start'] = 'start';
+
+        $this->assertEquals(DOKU_BASE . $this->script . '?media=' , ml());
+    }
+
+    function test_ml_args_array() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = array('a' => 'b', 'c' => 'd', 'q' => '&ä');
+
+        $expect = DOKU_BASE . $this->script . '?a=b&amp;c=d&amp;q=%26%C3%A4&amp;media=some:img.jpg';
+        $this->assertEquals($expect, ml('some:img.jpg', $args));
+    }
+
+    function test_ml_args_string() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = 'a=b&c=d';
+
+        $expect = DOKU_BASE . $this->script . '?a=b&c=d&amp;media=some:img.png';
+        $this->assertEquals($expect, ml('some:img.png', $args));
+    }
+
+    function test_ml_args_comma_string() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = 'a=b,c=d';
+
+        $expect = DOKU_BASE . $this->script . '?a=b&amp;c=d&amp;media=some:img.gif';
+        $this->assertEquals($expect, ml('some:img.gif', $args));
+    }
+
+
+    function test_ml_imgresize_array() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $id = 'some:img.png';
+        $w = 80;
+        $args = array('w' => $w);
+        $tok = media_get_token($id,$w,0);
+
+        $expect = DOKU_BASE . $this->script . '?w='.$w.'&amp;tok='.$tok.'&amp;media='.$id;
+        $this->assertEquals($expect, ml($id, $args));
+    }
+
+    function test_ml_imgresize_string() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $id = 'some:img.png';
+        $w = 80;
+        $args = 'w='.$w;
+        $tok = media_get_token($id,$w,0);
+
+        $expect = DOKU_BASE . $this->script . '?w='.$w.'&amp;tok='.$tok.'&amp;media='.$id;
+        $this->assertEquals($expect, ml($id, $args));
+    }
+
+    function test_ml_imgresize_array_rootid() {
+        global $conf;
+        $conf['useslash']   = 0;
+        $conf['userewrite'] = 0;
+
+        $id      = ':wiki:dokuwiki-128.png';
+        $cleanid = 'wiki:dokuwiki-128.png';
+        $w       = 80;
+        $args    = array('w' => $w);
+        $tok     = media_get_token($cleanid, $w, 0);
+
+        $expect = DOKU_BASE.$this->script.'?w='.$w.'&amp;tok='.$tok.'&amp;media='.$cleanid;
+        $this->assertEquals($expect, ml($id, $args));
+    }
+
+    function test_ml_imgresize_array_external() {
+        global $conf;
+        $conf['useslash']   = 0;
+        $conf['userewrite'] = 0;
+
+        $ids  = array(
+            'https://example.com/lib/tpl/dokuwiki/images/logo.png',
+            'http://example.com/lib/tpl/dokuwiki/images/logo.png',
+            'ftp://example.com/lib/tpl/dokuwiki/images/logo.png'
+        );
+        $w    = 80;
+        $args = array('w' => $w);
+
+        foreach($ids as $id) {
+            $tok = media_get_token($id, $w, 0);
+            $hash = substr(PassHash::hmac('md5', $id, auth_cookiesalt()), 0, 6);
+
+            $expect = DOKU_BASE.$this->script.'?hash='.$hash.'&amp;w='.$w.'&amp;tok='.$tok.'&amp;media='.rawurlencode($id);
+            $this->assertEquals($expect, ml($id, $args));
+        }
+    }
+}
diff --git a/_test/tests/inc/common_pageinfo.test.php b/_test/tests/inc/common_pageinfo.test.php
new file mode 100644
index 000000000..c54fbce26
--- /dev/null
+++ b/_test/tests/inc/common_pageinfo.test.php
@@ -0,0 +1,299 @@
+<?php
+/**
+ * Unit Test for inc/common.php - pageinfo()
+ *
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ */
+class common_pageinfo_test extends DokuWikiTest {
+
+    function setup(){
+        parent::setup();
+
+        global $USERINFO;
+        $USERINFO = array(
+           'pass' => '179ad45c6ce2cb97cf1029e212046e81',
+           'name' => 'Arthur Dent',
+           'mail' => 'arthur@example.com',
+           'grps' => array ('admin','user'),
+        );
+        $_SERVER['REMOTE_USER'] = 'testuser';
+        $_SERVER['REMOTE_ADDR'] = '1.2.3.4';
+    }
+
+    function _get_expected_pageinfo() {
+        global $USERINFO;
+        $info = array (
+          'isadmin' => true,
+          'ismanager' => true,
+          'userinfo' => $USERINFO,
+          'perm' => 255,
+          'namespace' => false,
+          'ismobile' => false,
+          'client' => 'testuser',
+        );
+        $info['rev'] = null;

+        $info['subscribed'] = false;

+        $info['locked'] = false;

+        $info['exists'] = false;

+        $info['writable'] = true;

+        $info['editable'] = true;

+        $info['lastmod'] = false;

+        $info['meta'] = array();

+        $info['ip'] = null;

+        $info['user'] = null;

+        $info['sum'] = null;

+        $info['editor'] = null;

+
+        return $info;
+    }
+
+    /**
+     *  check info keys and values for a non-existent page & admin user
+     */
+    function test_basic_nonexistentpage(){
+        global $ID,$conf;
+        $ID = 'wiki:start';
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:start';
+        $info['namespace'] = 'wiki';
+        $info['filepath'] = $conf['datadir'].'/wiki/start.txt';
+
+        $this->assertEquals($info, pageinfo());
+    }
+
+    /**
+     *  check info keys and values for a existing page & admin user
+     */
+    function test_basic_existingpage(){
+        global $ID,$conf;
+        $ID = 'wiki:syntax';
+        $filename = $conf['datadir'].'/wiki/syntax.txt';
+        $rev = filemtime($filename);
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:syntax';

+        $info['namespace'] = 'wiki';
+        $info['filepath'] = $filename;
+        $info['exists'] = true;

+        $info['lastmod'] = $rev;

+        $info['meta'] = p_get_metadata($ID);

+
+        $this->assertEquals($info, pageinfo());
+    }

+
+    /**
+     *  check info keys and values for anonymous user
+     */
+    function test_anonymoususer(){
+        global $ID,$conf,$REV;
+
+        unset($_SERVER['REMOTE_USER']);

+        global $USERINFO; $USERINFO = array();

+
+        $ID = 'wiki:syntax';
+        $filename = $conf['datadir'].'/wiki/syntax.txt';
+        $rev = filemtime($filename);
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:syntax';
+        $info['namespace'] = 'wiki';
+        $info['filepath'] = $filename;
+        $info['exists'] = true;
+        $info['lastmod'] = $rev;
+        $info['meta'] = p_get_metadata($ID);
+        $info['rev'] = '';
+
+        $info = array_merge($info, array(

+          'isadmin' => false,

+          'ismanager' => false,

+          'perm' => 8,

+          'client' => '1.2.3.4',

+        ));
+        unset($info['userinfo']);
+        $this->assertEquals($info, pageinfo());
+    }

+
+    /**
+     *  check info keys and values with $REV
+     *  (also see $RANGE tests)
+     */
+    function test_rev(){
+        global $ID,$conf,$REV;
+
+        $ID = 'wiki:syntax';
+        $filename = $conf['datadir'].'/wiki/syntax.txt';
+        $rev = filemtime($filename);
+        $REV = $rev - 100;
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:syntax';
+        $info['namespace'] = 'wiki';
+        $info['meta'] = p_get_metadata($ID);
+        $info['rev'] = $REV;
+        $info['filepath'] = str_replace('pages','attic',substr($filename,0,-3).$REV.'.txt.gz');
+
+        $this->assertEquals($info, pageinfo());
+        $this->assertEquals($rev-100, $REV);
+    }

+
+    /**
+     *  check info keys and values with $RANGE
+     */
+    function test_range(){
+        global $ID,$conf,$REV,$RANGE;
+
+        $ID = 'wiki:syntax';
+        $filename = $conf['datadir'].'/wiki/syntax.txt';
+        $rev = filemtime($filename);
+        $range = '1000-2000';

+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:syntax';
+        $info['namespace'] = 'wiki';
+        $info['exists'] = true;
+        $info['lastmod'] = $rev;
+        $info['meta'] = p_get_metadata($ID);
+        $info['filepath'] = $filename;
+
+        // check $RANGE without $REV
+        // expected result $RANGE unchanged
+        $RANGE = $range;
+
+        $this->assertEquals($info, pageinfo());

+        $this->assertFalse(isset($REV));
+        $this->assertEquals($range,$RANGE);

+
+        // check $RANGE with $REV = current
+        // expected result: $RANGE unchanged, $REV cleared
+        $REV = $rev;
+        $info['rev'] = '';

+
+        $this->assertEquals($info, pageinfo());

+        $this->assertEquals('',$REV);
+        $this->assertEquals($range,$RANGE);

+
+        // check with a real $REV
+        // expected result: $REV and $RANGE are cleared
+        $REV = $rev - 100;
+
+        $this->assertEquals($info, pageinfo());
+        $this->assertEquals('',$REV);
+        $this->assertEquals('',$RANGE);
+    }
+
+    /**
+     *  test editor entry and external edit
+     */
+    function test_editor_and_externaledits(){
+        global $ID,$conf;
+        $ID = 'wiki:syntax';
+        $filename = $conf['datadir'].'/wiki/syntax.txt';
+        $rev = filemtime($filename);
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:syntax';
+        $info['namespace'] = 'wiki';
+        $info['filepath'] = $filename;
+        $info['exists'] = true;
+        $info['lastmod'] = $rev;
+        $info['meta'] = p_get_metadata($ID);  // need $INFO set correctly for addLogEntry()
+
+        global $INFO;
+        $INFO = $info;
+
+        // add an editor for the current version of $ID
+        addLogEntry($rev, $ID);
+
+        $info['meta'] = p_get_metadata($ID);
+        $info['editor'] = $_SERVER['REMOTE_USER'];
+        $info['user'] = $_SERVER['REMOTE_USER'];
+        $info['ip'] = $_SERVER['REMOTE_ADDR'];
+        $info['sum'] = '';
+
+        // with an editor ...
+        $this->assertEquals($info, pageinfo());
+
+        // clear the meta['last_change'] value, pageinfo should restore it
+        p_set_metadata($ID,array('last_change' => false));
+
+        $this->assertEquals($info, pageinfo());
+        $this->assertEquals($info['meta']['last_change'], p_get_metadata($ID,'last_change'));

+
+        // fake an external edit, pageinfo should clear the last change from meta data
+        // and not return any editor data
+        $now = time()+10;
+        touch($filename,$now);
+
+        $info['lastmod'] = $now;
+        $info['meta']['last_change'] = false;
+        $info['ip'] = null;
+        $info['user'] = null;
+        $info['sum'] = null;
+        $info['editor'] = null;
+
+        $this->assertEquals($info, pageinfo());
+        $this->assertEquals($info['meta'], p_get_metadata($ID));   // check metadata has been updated correctly
+    }
+
+    /**
+     *  check draft
+     */
+    function test_draft(){
+        global $ID,$conf;
+        $ID = 'wiki:syntax';
+        $filename = $conf['datadir'].'/wiki/syntax.txt';
+        $rev = filemtime($filename);
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:syntax';
+        $info['namespace'] = 'wiki';
+        $info['filepath'] = $filename;
+        $info['exists'] = true;
+        $info['lastmod'] = $rev;
+        $info['meta'] = p_get_metadata($ID);
+
+        // setup a draft, make it more recent than the current page
+        // - pageinfo should recognise it and keep it
+        $draft = getCacheName($info['client'].$ID,'.draft');
+        touch($draft,$rev + 10);
+
+        $info['draft'] = $draft;
+
+        $this->assertEquals($info, pageinfo());
+        $this->assertFileExists($draft);
+
+        // make the draft older than the current page
+        // - pageinfo should remove it and not return the 'draft' key
+        touch($draft,$rev - 10);
+        unset($info['draft']);
+
+        $this->assertEquals($info, pageinfo());
+        $this->assertFalse(file_exists($draft));
+    }
+
+    /**
+     *  check ismobile
+     */
+    function test_ismobile(){
+        global $ID,$conf;
+        $ID = 'wiki:start';
+
+        $info = $this->_get_expected_pageinfo();
+        $info['id'] = 'wiki:start';
+        $info['namespace'] = 'wiki';
+        $info['filepath'] = $conf['datadir'].'/wiki/start.txt';
+
+        // overkill, ripped from clientismobile() as we aren't testing detection - but forcing it
+        $_SERVER['HTTP_X_WAP_PROFILE'] = 'a fake url';
+        $_SERVER['HTTP_ACCEPT'] .= ';wap';
+        $_SERVER['HTTP_USER_AGENT'] = 'blackberry,symbian,hand,mobi,phone';
+
+        $info['ismobile'] = clientismobile();
+
+        $this->assertTrue(clientismobile());     // ensure THIS test fails if clientismobile() returns false
+        $this->assertEquals($info, pageinfo());  // it would be a test failure not a pageinfo failure.
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php
index 9959a1f06..387eb53aa 100644
--- a/_test/tests/inc/httpclient_http.test.php
+++ b/_test/tests/inc/httpclient_http.test.php
@@ -134,6 +134,19 @@ class httpclient_http_test extends DokuWikiTest {
     /**
      * @group internet
      */
+    function test_maxbodyok(){
+        $http = new HTTPClient();
+        $http->max_bodysize = 500*1024;
+        $data = $http->get($this->server.'/stream/5');
+        $this->assertTrue($data !== false, 'HTTP response');
+        $http->max_bodysize_abort = false;
+        $data = $http->get($this->server.'/stream/5');
+        $this->assertTrue($data !== false, 'HTTP response');
+    }
+
+    /**
+     * @group internet
+     */
     function test_basicauth(){
         $http = new HTTPClient();
         $http->user = 'user';
@@ -191,5 +204,16 @@ class httpclient_http_test extends DokuWikiTest {
         $this->assertFalse($data === false, 'HTTP response');
         $this->assertEquals(2550,strlen($data));
     }
+
+    /**
+     * This address caused trouble with stream_select()
+     *
+     * @group internet
+     */
+    function test_wikimatrix(){
+        $http = new HTTPClient();
+        $data = $http->get('http://www.wikimatrix.org/cfeed/dokuwiki/-/-');
+        $this->assertTrue($data !== false, $http->error);
+    }
 }
 //Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/media_get_from_url.test.php b/_test/tests/inc/media_get_from_url.test.php
new file mode 100644
index 000000000..3903b8a05
--- /dev/null
+++ b/_test/tests/inc/media_get_from_url.test.php
@@ -0,0 +1,80 @@
+<?php
+
+class media_get_from_url_test extends DokuWikiTest {
+
+    /**
+     * @group internet
+     */
+    public function test_cache(){
+        global $conf;
+        $conf['fetchsize'] = 500*1024; //500kb
+
+
+        $local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',-1);
+        $this->assertTrue($local !== false);
+        $this->assertFileExists($local);
+
+        // remember time stamp
+        $time = filemtime($local);
+        clearstatcache(false, $local);
+        sleep(1);
+
+        // fetch again and make sure we got a cache file
+        $local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',-1);
+        clearstatcache(false, $local);
+        $this->assertTrue($local !== false);
+        $this->assertFileExists($local);
+        $this->assertEquals($time, filemtime($local));
+
+        unlink($local);
+    }
+
+    /**
+     * @group internet
+     */
+    public function test_nocache(){
+        global $conf;
+        $conf['fetchsize'] = 500*1024; //500kb
+
+        $local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',0);
+        $this->assertFalse($local);
+    }
+
+    /**
+     * @group internet
+     * @group slow
+     */
+    public function test_recache(){
+        global $conf;
+        $conf['fetchsize'] = 500*1024; //500kb
+
+
+        $local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',5);
+        $this->assertTrue($local !== false);
+        $this->assertFileExists($local);
+
+        // remember time stamp
+        $time = filemtime($local);
+        clearstatcache(false, $local);
+        sleep(1);
+
+        // fetch again and make sure we got a cache file
+        $local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',5);
+        clearstatcache(false, $local);
+        $this->assertTrue($local !== false);
+        $this->assertFileExists($local);
+        $this->assertEquals($time, filemtime($local));
+
+        clearstatcache(false, $local);
+        sleep(6);
+
+        // fetch again and make sure we got a new file
+        $local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',5);
+        clearstatcache(false, $local);
+        $this->assertTrue($local !== false);
+        $this->assertFileExists($local);
+        $this->assertNotEquals($time, filemtime($local));
+
+        unlink($local);
+    }
+}
\ No newline at end of file
diff --git a/_test/tests/inc/media_isexternal.test.php b/_test/tests/inc/media_isexternal.test.php
new file mode 100644
index 000000000..cf5f793e4
--- /dev/null
+++ b/_test/tests/inc/media_isexternal.test.php
@@ -0,0 +1,22 @@
+<?php
+
+class media_isexternal_test extends DokuWikiTest {
+
+
+    public function test_external(){
+        $this->assertTrue(media_isexternal('http://www.example.com/foo.png'));
+        $this->assertTrue(media_isexternal('https://www.example.com/foo.png'));
+        $this->assertTrue(media_isexternal('ftp://www.example.com/foo.png'));
+        $this->assertTrue(media_isexternal('hTTp://www.example.com/foo.png'));
+        $this->assertTrue(media_isexternal('hTTps://www.example.com/foo.png'));
+        $this->assertTrue(media_isexternal('Ftp://www.example.com/foo.png'));
+    }
+
+    public function test_internal(){
+        $this->assertFalse(media_isexternal('wiki:logo.png'));
+        $this->assertFalse(media_isexternal('private:logo.png'));
+        $this->assertFalse(media_isexternal('ftp:private:logo.png'));
+
+    }
+
+}
\ No newline at end of file
diff --git a/_test/tests/inc/media_ispublic.test.php b/_test/tests/inc/media_ispublic.test.php
new file mode 100644
index 000000000..307c64654
--- /dev/null
+++ b/_test/tests/inc/media_ispublic.test.php
@@ -0,0 +1,18 @@
+<?php
+
+class media_ispublic_test extends DokuWikiTest {
+
+
+    public function test_external(){
+        $this->assertTrue(media_ispublic('http://www.example.com/foo.png'));
+        $this->assertTrue(media_ispublic('https://www.example.com/foo.png'));
+        $this->assertTrue(media_ispublic('hTTp://www.example.com/foo.png'));
+        $this->assertTrue(media_ispublic('hTTps://www.example.com/foo.png'));
+    }
+
+    public function test_internal(){
+        $this->assertTrue(media_ispublic('wiki:logo.png'));
+        $this->assertFalse(media_ispublic('private:logo.png'));
+    }
+
+}
\ No newline at end of file
diff --git a/_test/tests/inc/pageutils_clean_id.test.php b/_test/tests/inc/pageutils_clean_id.test.php
index 9c5781b24..478fd2bc4 100644
--- a/_test/tests/inc/pageutils_clean_id.test.php
+++ b/_test/tests/inc/pageutils_clean_id.test.php
@@ -43,6 +43,10 @@ class init_clean_id_test extends DokuWikiTest {
         $tests[] = array('ns._#!ns:page','false','ns._ns:page');
         $tests[] = array('ns_:page',false,'ns:page');
         $tests[] = array('page...page','false','page...page');
+        $tests[] = array(':page',false,'page');
+        $tests[] = array(':ns:page',false,'ns:page');
+        $tests[] = array('page:',false,'page');
+        $tests[] = array('ns:page:',false,'ns:page');
 
         $conf['useslash'] = 0;
         $tests[] = array('page/page',false,'page_page');
diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php
index 611e1ab0f..d0d4eb7ce 100644
--- a/_test/tests/inc/remote.test.php
+++ b/_test/tests/inc/remote.test.php
@@ -1,6 +1,6 @@
 <?php
 
-class MockAuth extends auth_basic {
+class MockAuth extends DokuWiki_Auth_Plugin {
     function isCaseSensitive() { return true; }
 }
 
diff --git a/_test/tests/inc/search/search.test.php b/_test/tests/inc/search/search.test.php
index 9c854a661..33d4e9d8d 100644
--- a/_test/tests/inc/search/search.test.php
+++ b/_test/tests/inc/search/search.test.php
@@ -22,9 +22,9 @@ class search_test extends DokuWikiTest {
       search($data, dirname(__FILE__) . '/data', 'search_allpages',  array('depth' => 1), 'ns1/ns3');
       $this->assertEquals(0, count($data));
 
-      //depth is 1 so I should get only pages from ns1
+      //depth is 2 so I should get only pages from ns1
       $data = array();
-      search($data, dirname(__FILE__) . '/data', 'search_allpages', array('depth' => 1), 'ns1');
+      search($data, dirname(__FILE__) . '/data', 'search_allpages', array('depth' => 2), 'ns1');
       $this->assertEquals(2, count($data));
     }
 
diff --git a/_test/tests/inc/tar.test.php b/_test/tests/inc/tar.test.php
index e8805a75d..90bc2e49e 100644
--- a/_test/tests/inc/tar.test.php
+++ b/_test/tests/inc/tar.test.php
@@ -316,4 +316,48 @@ class Tar_TestCase extends DokuWikiTest {
 
         TestUtils::rdelete($out);
     }
+
+    /**
+     * A single zero file should be just a header block + the footer
+     */
+    public function test_zerofile(){
+        $dir = dirname(__FILE__).'/tar';
+        $tar = new Tar();
+        $tar->create();
+        $tar->addFile("$dir/zero.txt", 'zero.txt');
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*3, strlen($file)); // 1 header block + 2 footer blocks
+    }
+
+    public function test_zerodata(){
+        $tar = new Tar();
+        $tar->create();
+        $tar->addData('zero.txt','');
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*3, strlen($file)); // 1 header block + 2 footer blocks
+    }
+
+    /**
+     * A file of exactly one block should be just a header block + data block + the footer
+     */
+    public function test_blockfile(){
+        $dir = dirname(__FILE__).'/tar';
+        $tar = new Tar();
+        $tar->create();
+        $tar->addFile("$dir/block.txt", 'block.txt');
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*4, strlen($file)); // 1 header block + data block + 2 footer blocks
+    }
+
+    public function test_blockdata(){
+        $tar = new Tar();
+        $tar->create();
+        $tar->addData('block.txt', str_pad('', 512, 'x'));
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*4, strlen($file)); // 1 header block + data block + 2 footer blocks
+    }
 }
\ No newline at end of file
diff --git a/_test/tests/inc/tar/block.txt b/_test/tests/inc/tar/block.txt
new file mode 100644
index 000000000..9b2f53080
--- /dev/null
+++ b/_test/tests/inc/tar/block.txt
@@ -0,0 +1 @@
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
\ No newline at end of file
diff --git a/_test/tests/inc/tar/zero.txt b/_test/tests/inc/tar/zero.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/tests/inc/tar/zero.txt
diff --git a/_test/tests/lib/exe/fetch_imagetoken.test.php b/_test/tests/lib/exe/fetch_imagetoken.test.php
new file mode 100644
index 000000000..9e5b6e4a2
--- /dev/null
+++ b/_test/tests/lib/exe/fetch_imagetoken.test.php
@@ -0,0 +1,99 @@
+<?php
+
+class fetch_imagetoken_test extends DokuWikiTest {
+ 
+    private $media = 'wiki:dokuwiki-128.png';
+    private $width = 200;
+    private $height = 0;
+
+    function setUp() {
+        // check we can carry out these tests
+        if (!file_exists(mediaFN($this->media))) {
+            $this->markTestSkipped('Source image required for test');
+        }
+
+        header('X-Test: check headers working');
+        $header_check = function_exists('xdebug_get_headers') ? xdebug_get_headers() : headers_list();
+        if (empty($header_check)) {
+            $this->markTestSkipped('headers not returned, perhaps your sapi does not return headers, try xdebug');
+        } else {
+            header_remove('X-Test');
+        }
+
+        parent::setUp();
+
+        global $conf;
+        $conf['sendfile'] = 0;
+
+        global $MIME, $EXT, $CACHE, $INPUT;    // variables fetch creates in global scope -- should this be in fetch?
+    }

+
+    function getUri() {
+       $w = $this->width ? 'w='.$this->width.'&' : '';
+       $h = $this->height ? 'h='.$this->height.'&' : '';
+
+       return '/lib/exe/fetch.php?'.$w.$h.'{%token%}media='.$this->media;
+    }
+
+    function fetchResponse($token){
+        $request = new TestRequest();
+        return $request->get(array(),str_replace('{%token%}',$token,$this->getUri()));
+    }
+

+    /**

+     *  modified image request with valid token
+     *  expect: header with mime-type
+     *  expect: content
+     *  expect: no error response
+     */

+    function test_valid_token(){

+        $valid_token = 'tok='.media_get_token($this->media, $this->width, $this->height).'&';
+        $response = $this->fetchResponse($valid_token);
+        $this->assertTrue((bool)$response->getHeader('Content-Type'));
+        $this->assertTrue((bool)($response->getContent()));
+        
+        $status_code = $response->getStatusCode();
+        $this->assertTrue(is_null($status_code) || (200 == $status_code));
+    }

+    

+    /**

+     *  modified image request with invalid token
+     *  expect: 412 status code

+     */

+    function test_invalid_token(){

+        $invalid_token = 'tok='.media_get_token('junk',200,100).'&';

+        $this->assertEquals(412,$this->fetchResponse($invalid_token)->getStatusCode());

+    }

+    

+    /**

+     *  modified image request with no token

+     *  expect: 412 status code
+     */

+    function test_missing_token(){

+        $no_token = '';

+        $this->assertEquals(412,$this->fetchResponse($notoken)->getStatusCode());
+    }
+
+    /**
+     *  native image request which doesn't require a token
+     *  try: with a token & without a token
+     *  expect: (for both) header with mime-type, content matching source image filesize & no error response
+     */
+    function test_no_token_required(){
+        $this->width = $this->height = 0;   // no width & height, means image request at native dimensions
+        $any_token = 'tok='.media_get_token('junk',200,100).'&';
+        $no_token = '';
+        $bytes = filesize(mediaFN($this->media));
+
+        foreach(array($any_token, $no_token) as $token) {
+            $response = $this->fetchResponse($token);
+            $this->assertTrue((bool)$response->getHeader('Content-Type'));
+            $this->assertEquals(strlen($response->getContent()), $bytes);
+
+            $status_code = $response->getStatusCode();
+            $this->assertTrue(is_null($status_code) || (200 == $status_code));
+        }
+    }
+
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/test/basic.test.php b/_test/tests/test/basic.test.php
index a0ea48a3a..05778ccf9 100644
--- a/_test/tests/test/basic.test.php
+++ b/_test/tests/test/basic.test.php
@@ -4,6 +4,24 @@
  * @group integration
  */
 class InttestsBasicTest extends DokuWikiTest {
+
+    private $some_headers =  array(
+          'Content-Type: image/png',
+          'Date: Fri, 22 Mar 2013 16:10:01 GMT',
+          'X-Powered-By: PHP/5.3.15',
+          'Expires: Sat, 23 Mar 2013 17:03:46 GMT',
+          'Cache-Control: public, proxy-revalidate, no-transform, max-age=86400',
+          'Pragma: public',
+          'Last-Modified: Fri, 22 Mar 2013 01:48:28 GMT',
+          'ETag: "63daab733b38c30c337229b2e587f8fb"',
+          'Content-Disposition: inline; filename="fe389b0db8c1088c336abb502d2f9ae7.media.200x200.png',
+          'Accept-Ranges: bytes',
+          'Content-Type: image/png',
+          'Content-Length: 62315',
+          'Status: 200 OK',
+          'Status: 404 Not Found',
+     );
+
     /**
      * Execute the simplest possible request and expect
      * a dokuwiki page which obviously has the word "DokuWiki"
@@ -101,5 +119,54 @@ class InttestsBasicTest extends DokuWikiTest {
         $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') >= 0);
     }
 
+    function testScripts() {
+        $request = new TestRequest();
+
+        // doku
+        $response = $request->get();

+        $this->assertEquals('doku.php',$request->getScript());

+
+        $response = $request->get(array(),'/doku.php?id=wiki:dokuwiki&test=foo');

+        $this->assertEquals('doku.php',$request->getScript());

+
+        // fetch
+        $response = $request->get(array(),'/lib/exe/fetch.php?media=wiki:dokuwiki-128.png');
+        $this->assertEquals('lib/exe/fetch.php',$request->getScript());
+
+        // detail
+        $response = $request->get(array(),'/lib/exe/detail.php?id=start&media=wiki:dokuwiki-128.png');
+        $this->assertEquals('lib/exe/detail.php',$request->getScript());
+    }
+
+    function testHeaders(){
+        header('X-Test: check headers working');
+        $header_check = function_exists('xdebug_get_headers') ? xdebug_get_headers() : headers_list();
+        if (empty($header_check)) {
+            $this->markTestSkipped('headers not returned, perhaps your sapi does not return headers, try xdebug');
+        } else {
+            header_remove('X-Test');
+        }
+
+        $request = new TestRequest();
+        $response = $request->get(array(),'/lib/exe/fetch.php?media=wiki:dokuwiki-128.png');
+        $headers = $response->getHeaders();

+        $this->assertTrue(!empty($headers));

+    }
+
+    function testGetHeader(){
+        $response = new TestResponse('',$this->some_headers);
+
+        $this->assertEquals('Pragma: public', $response->getHeader('Pragma'));
+        $this->assertEmpty($response->getHeader('Junk'));
+        $this->assertEquals(array('Content-Type: image/png','Content-Type: image/png'), $response->getHeader('Content-Type'));
+    }
+
+    function testGetStatus(){
+       $response = new TestResponse('',$this->some_headers);
+       $this->assertEquals(404, $response->getStatusCode());
+
+       $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());
+    }
 
 }