Merge remote-tracking branch 'origin/master' into video-audio

Conflicts:
	inc/parser/xhtml.php

17 files changed, 754 insertions, 9 deletions

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index 732fef9ed..4f0d5efaa 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -15,7 +15,8 @@ require_once DOKU_UNITTEST.'core/TestUtils.php';
 define('SIMPLE_TEST', true);
 
 // basic behaviours
-error_reporting(E_ALL);
+define('DOKU_E_LEVEL',E_ALL ^ E_NOTICE);
+error_reporting(DOKU_E_LEVEL);
 set_time_limit(0);
 ini_set('memory_limit','2048M');
 
@@ -68,6 +69,13 @@ $default_server_vars = array(
     'REQUEST_TIME' => time(),
 );
 
+// fixup for $_SERVER when run from CLI,
+// some values should be mocked for use by inc/init.php which is called here
+// [ $_SERVER is also mocked in TestRequest::execute() ]
+if (php_sapi_name() == 'cli') {
+  $_SERVER = array_merge($default_server_vars, $_SERVER);
+}
+
 // create temp directories
 mkdir(TMP_DIR);
 
diff --git a/_test/data/meta/mailinglist.changes b/_test/data/meta/mailinglist.changes
new file mode 100644
index 000000000..348f8258f
--- /dev/null
+++ b/_test/data/meta/mailinglist.changes
@@ -0,0 +1,24 @@
+1360110636	127.0.0.1	C	mailinglist	pubcie	aangemaakt	
+1361901536	127.0.0.1	E	mailinglist	pubcie		
+1362524799	127.0.0.1	E	mailinglist	pubcie		
+1362525145	127.0.0.1	E	mailinglist	pubcie		
+1362525359	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362525899	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362525926	127.0.0.1	E	mailinglist	pubcie		
+1362526039	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362526119	127.0.0.1	E	mailinglist	pubcie		
+1362526167	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362526767	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362526861	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362527046	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1362527164	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1363436892	127.0.0.1	E	mailinglist	pubcie		
+1368575634	127.0.0.1	E	mailinglist	pubcie		
+1368609772	127.0.0.1	E	mailinglist	pubcie		
+1368612506	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1368612599	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1368622152	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1368622195	127.0.0.1	E	mailinglist	pubcie		
+1368622240	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	
+1371579614	127.0.0.1	E	mailinglist	pubcie		
+1374261194	127.0.0.1	E	mailinglist	pubcie		
diff --git a/_test/data/pages/mailinglist.txt b/_test/data/pages/mailinglist.txt
new file mode 100644
index 000000000..3fbe91b67
--- /dev/null
+++ b/_test/data/pages/mailinglist.txt
@@ -0,0 +1,11 @@
+====== Mailing Lists ======
+
+[[DokuWiki]]'s development is coordinated through multiple Mailinglists hosted by [[http://www.freelists.org|freelists.org]].
+
+===== Using the lists =====
+
+First you should subscribe to one or several of the mailing lists presented below. After subscribing you can send emails to the list(s) by using the mailing list address stated in its description. If you rather want to use the mailing list through a news group interface, please read the section [[#News group interface]].
+
+If you are new to mailing lists in general, please read [[rfc>1855|RFC 1855 - Netiquette Guidelines]], especially the sections 3.1.1 and 3.1.2. Before you ask any questions you should also have a look at [[http://www.catb.org/~esr/faqs/smart-questions.html|How To Ask Questions The Smart Way]].
+
+:!: Please note that these documents are linked here solely for the purpose of information. Their respective authors have nothing do to with [[DokuWiki]] and in **no case** should you send email to them, asking for help related to [[DokuWiki]]! 
diff --git a/_test/tests/inc/auth_loadacl.test.php b/_test/tests/inc/auth_loadacl.test.php
new file mode 100644
index 000000000..e8d9f6696
--- /dev/null
+++ b/_test/tests/inc/auth_loadacl.test.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ *  auth_loadACL carries out the user & group substitutions
+ *
+ * @author     Chris Smith <chris@jalakai.co.uk>
+ */
+
+class auth_loadacl_test extends DokuWikiTest {
+
+    function setUp() {
+        global $USERINFO;
+        parent::setUp();
+        $_SERVER['REMOTE_USER'] = 'testuser';
+        $USERINFO['grps'] = array('foo','bar');
+    }
+
+    function tearDown() {
+        parent::tearDown();
+    }
+
+    function auth_loadACL_testwrapper($acls) {
+        global $config_cascade;
+        $acl_file = $config_cascade['acl']['default'];
+
+        $config_cascade['acl']['default'] .= '.test';
+        file_put_contents($config_cascade['acl']['default'],$acls);
+
+        $result = auth_loadACL();
+
+        unlink($config_cascade['acl']['default']);
+        $config_cascade['acl']['default'] = $acl_file;
+
+        return $result;
+    }
+
+    function test_simple() {
+        $acls = <<<ACL
+* @ALL 2
+ACL;
+        $expect = array("*\t@ALL 2");
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    function test_user_substitution() {
+        $acls = <<<ACL
+%USER% %USER% 2
+ACL;
+        $expect = array(
+            "testuser\ttestuser 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    function test_group_substitution() {
+        $acls = <<<ACL
+%GROUP% %GROUP% 2
+ACL;
+        $expect = array(
+            "foo\t@foo 2",
+            "bar\t@bar 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    function test_both_substitution() {
+        $acls = <<<ACL
+%GROUP%:%USER% %USER% 2
+%GROUP%:%USER% %GROUP% 2
+ACL;
+        $expect = array(
+            "foo:testuser\ttestuser 2",
+            "bar:testuser\ttestuser 2",
+            "foo:testuser\t@foo 2",
+            "bar:testuser\t@bar 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    // put it all together - read the standard acl provided with the test suite
+    function test_standardtestacls(){
+        $expect = array(
+            "*\t@ALL        8",
+            "private:*\t@ALL        0",
+            "users:*\t@ALL         1",
+            "users:testuser:*\ttestuser       16",
+            "groups:*\t@ALL         1",
+            "groups:foo:*\t@foo      16",
+            "groups:bar:*\t@bar      16",
+        );
+        $this->assertEquals($expect, auth_loadACL());
+    }
+
+    // FS#2867, '\s' in php regular expressions may match non-space characters utf8 strings
+    // this is due to locale setting on the server, which may match bytes '\xA0' and '\x85'
+    // these two bytes are present in valid multi-byte UTF-8 characters.
+    // this test will use one, 'ठ' (DEVANAGARI LETTER TTHA, e0 a4 a0).  There are many others. 
+    function test_FS2867() {
+        global $USERINFO;
+
+        $old_locale = setlocale(LC_ALL, '0');
+        setlocale(LC_ALL, "English_United States.1252");  // should only succeed on windows systems
+        setlocale(LC_ALL, "en_US.UTF-8");                 // should succeed on other systems
+
+        // no point continuing with this test if \s doesn't match A0
+        if (!preg_match('/\s/',"\xa0")) {
+            setlocale(LC_ALL, $old_locale);
+            $this->markTestSkipped('Unable to change locale.');
+        }
+
+        $_SERVER['REMOTE_USER'] = 'utfठ8';
+        $USERINFO['grps'] = array('utfठ16','utfठa');
+
+        $acls = <<<ACL
+%GROUP%:%USER% %USER% 2
+%GROUP%:* %GROUP% 4
+devangariठttha @ALL 2
+ACL;
+        $expect = array(
+            "utfठ16:utfठ8\tutfठ8 2",
+            "utfठa:utfठ8\tutfठ8 2",
+            "utfठ16:*\t@utfठ16 4",
+            "utfठa:*\t@utfठa 4",
+            "devangariठttha\t@ALL 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+        setlocale(LC_ALL, $old_locale);
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/auth_nameencode.test.php b/_test/tests/inc/auth_nameencode.test.php
index da9f31f90..86db843d6 100644
--- a/_test/tests/inc/auth_nameencode.test.php
+++ b/_test/tests/inc/auth_nameencode.test.php
@@ -19,6 +19,18 @@ class auth_nameencode_test extends DokuWikiTest {
         $this->assertEquals(auth_nameencode($in),$out);
     }
 
+    function test_apostrophe(){
+        $in  = 'hey\'you';
+        $out = 'hey%27you';
+        $this->assertEquals(auth_nameencode($in),$out);
+    }
+
+    function test_backslash(){
+        $in  = 'hey\\you';
+        $out = 'hey%5cyou';
+        $this->assertEquals(auth_nameencode($in),$out);
+    }
+
     function test_complex(){
         $in  = 'hey $ you !$%! foo ';
         $out = 'hey%20%24%20you%20%21%24%25%21%20foo%20';
@@ -42,6 +54,22 @@ class auth_nameencode_test extends DokuWikiTest {
         $out = '%40hey%24you';
         $this->assertEquals(auth_nameencode($in),$out);
     }
+
+    // include a two byte utf8 character which shouldn't be encoded
+    function test_hebrew(){
+        $in = 'nun-נ8';
+        $expect = 'nun%2dנ8';
+
+        $this->assertEquals($expect, auth_nameencode($in));
+    }
+
+    // include a three byte utf8 character which shouldn't be encoded
+    function test_devanagiri(){
+        $in = 'ut-fठ8';
+        $expect = 'ut%2dfठ8';
+
+        $this->assertEquals($expect, auth_nameencode($in));
+    }
 }
 
 //Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/changelog_getrevisioninfo.test.php b/_test/tests/inc/changelog_getrevisioninfo.test.php
new file mode 100644
index 000000000..9637d21c8
--- /dev/null
+++ b/_test/tests/inc/changelog_getrevisioninfo.test.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * Tests for requesting revisioninfo of a revision of a page with getRevisionInfo()
+ *
+ * This class uses the files:
+ * - data/pages/mailinglist.txt
+ * - data/meta/mailinglist.changes
+ */
+class changelog_getrevisionsinfo_test extends DokuWikiTest {
+
+    private $logline = "1362525899	127.0.0.1	E	mailinglist	pubcie	[Data entry] 	\n";
+    private $firstlogline = "1374261194	127.0.0.1	E	mailinglist	pubcie		\n";
+    private $pageid = 'mailinglist';
+
+    function setup() {
+        parent::setup();
+        global $cache_revinfo;
+        $cache =& $cache_revinfo;
+        if(isset($cache['nonexist'])) {
+            unset($cache['nonexist']);
+        }
+        if(isset($cache['mailinglist'])) {
+            unset($cache['nonexist']);
+        }
+    }
+
+    /**
+     * no nonexist.changes meta file available
+     */
+    function test_changemetadatanotexists() {
+        $rev          = 1362525899;
+        $id           = 'nonexist';
+        $revsexpected = false;
+
+        $revs = getRevisionInfo($id, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * request existing rev
+     */
+    function test_requestrev() {
+        $rev          = 1362525899;
+        $infoexpected = parseChangelogLine($this->logline);
+
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals($infoexpected, $info);
+        //returns cached value
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals($infoexpected, $info);
+    }
+
+    /**
+     * request existing rev with chucked reading
+     */
+    function test_requestrev_chuncked() {
+        $rev          = 1362525899;
+        $infoexpected = parseChangelogLine($this->logline);
+
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 512, $media = false);
+        $this->assertEquals($infoexpected, $info);
+    }
+
+    /**
+     * request current version
+     */
+    function test_requestrecentestlogline() {
+        $rev          = 1374261194;
+        $infoexpected = parseChangelogLine($this->firstlogline);
+
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals($infoexpected, $info);
+        //returns cached value
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals($infoexpected, $info);
+    }
+
+    /**
+     * request current version, with chuncked reading
+     */
+    function test_requestrecentestlogline_chuncked() {
+        $rev          = 1374261194;
+        $infoexpected = parseChangelogLine($this->firstlogline);
+
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 512, $media = false);
+        $this->assertEquals($infoexpected, $info);
+    }
+
+    /**
+     * request negative revision
+     */
+    function test_negativerev() {
+        $rev = -10;
+
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals(false, $info);
+    }
+
+    /**
+     * request non existing revision somewhere between existing revisions
+     */
+    function test_notexistingrev() {
+        $rev = 1362525890;
+
+        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $this->assertEquals(false, $info);
+    }
+
+    /**
+     * sometimes chuncksize is set to true
+     */
+    function test_chuncksizetrue() {
+        $rev          = 1362525899;
+        $infoexpected = parseChangelogLine($this->logline);
+
+        $info = getRevisionInfo($this->pageid, $rev, true);
+        $this->assertEquals($infoexpected, $info);
+    }
+}
\ No newline at end of file
diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php
new file mode 100644
index 000000000..a9be26dae
--- /dev/null
+++ b/_test/tests/inc/changelog_getrevisions.test.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Tests for requesting revisions of a page with getRevisions()
+ *
+ * This class uses the files:
+ * - data/pages/mailinglist.txt
+ * - data/meta/mailinglist.changes
+ */
+class changelog_getrevisions_test extends DokuWikiTest {
+
+    /**
+     * $first counts inclusive zero, after the current page
+     */
+    private $revsexpected = array(
+        1374261194, //current page
+        1371579614, 1368622240, // revisions, corresponds to respectively $first = 0 and 1
+        1368622195, 1368622152,
+        1368612599, 1368612506,
+        1368609772, 1368575634,
+        1363436892, 1362527164,
+        1362527046, 1362526861, //10 and 11
+        1362526767, 1362526167,
+        1362526119, 1362526039,
+        1362525926, 1362525899,
+        1362525359, 1362525145,
+        1362524799, 1361901536, //20 and 21
+        1360110636
+    );
+    private $pageid = 'mailinglist';
+
+    function setup() {
+        parent::setup();
+        global $cache_revinfo;
+        $cache =& $cache_revinfo;
+        if(isset($cache['nonexist'])) {
+            unset($cache['nonexist']);
+        }
+        if(isset($cache['mailinglist'])) {
+            unset($cache['nonexist']);
+        }
+    }
+
+    /**
+     * no nonexist.changes meta file available
+     */
+    function test_changemetadatanotexists() {
+        $first = 0;
+        $num   = 1;
+        $id    = 'nonexist';
+
+        $revs         = getRevisions($id, $first, $num, $chunk_size = 8192, $media = false);
+        $revsexpected = array();
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * request first recentest revision
+     * (so skips first line which belongs to the current existing page)
+     */
+    function test_requestlastrev() {
+        $first        = 0;
+        $num          = 1;
+        $revsexpected = array($this->revsexpected[1]);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * request first recentest revision
+     * (so skips first line which belongs to the current existing page)
+     */
+    function test_requestonebutlastrev() {
+        $first        = 1;
+        $num          = 1;
+        $revsexpected = array($this->revsexpected[2]);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * request first recentest revision
+     * (so skips first line of current existing page)
+     */
+    function test_requestrevswithoffset() {
+        $first        = 10;
+        $num          = 5;
+        $revsexpected = array_slice($this->revsexpected, $first + 1, $num);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * first = -1 requests recentest logline, without skipping
+     */
+    function test_requestrecentestlogline() {
+        $first        = -1;
+        $num          = 1;
+        $revsexpected = array($this->revsexpected[0]);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * chunck size = 0 skips chuncked loading
+     */
+    function test_wholefile() {
+        $first        = 0;
+        $num          = 1000;
+        $revsexpected = array_slice($this->revsexpected, 1);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 0, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * Negative range returns no result
+     */
+    function test_negativenum() {
+        $first        = 0;
+        $num          = -10;
+        $revsexpected = array();
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * Negative range returns no result
+     */
+    function test_negativennumoffset() {
+        $first        = 2;
+        $num          = -10;
+        $revsexpected = array();
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * zero range returns no result
+     */
+    function test_zeronum() {
+        $first        = 5;
+        $num          = 0;
+        $revsexpected = array();
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * get oldest revisions
+     */
+    function test_requestlargeoffset() {
+        $first        = 22;
+        $num          = 50;
+        $revsexpected = array_slice($this->revsexpected, $first + 1);
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * request with too large offset and range
+     */
+    function test_requesttoolargenumberrevs() {
+        $first        = 50;
+        $num          = 50;
+        $revsexpected = array();
+
+        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+}
\ No newline at end of file
diff --git a/_test/tests/inc/fulltext_backlinks.test.php b/_test/tests/inc/fulltext_backlinks.test.php
index 058e13498..b20a16ee1 100644
--- a/_test/tests/inc/fulltext_backlinks.test.php
+++ b/_test/tests/inc/fulltext_backlinks.test.php
@@ -8,7 +8,7 @@ if (!defined('DOKU_INC')) die();
  *
  * @author Michael Hamann <michael@content-space.de>
  */
-class fultext_backlinks_test extends DokuWikiTest {
+class fulltext_backlinks_test extends DokuWikiTest {
 
     public function test_internallink() {
         saveWikiText('test:internallinks', '[[internälLink]] [[..:internal link]]', 'Test initialization');
@@ -74,4 +74,12 @@ class fultext_backlinks_test extends DokuWikiTest {
         $this->assertEquals(array(), ft_backlinks('test:internallink'));
         $this->assertEquals(array(), ft_backlinks('internal_link'));
     }
+
+    function test_parameters() {
+        saveWikiText('test:links', '[[wiki:syntax?do=export_raw]] [[:web:scripts:add_vhost.sh?do=export_raw]]', 'Init tests');
+        idx_addPage('test:links');
+
+        $this->assertEquals(array('test:links'), ft_backlinks('wiki:syntax'));
+        $this->assertEquals(array('test:links'), ft_backlinks('web:scripts:add_vhost.sh'));
+    }
 }
diff --git a/_test/tests/inc/fulltext_mediause.test.php b/_test/tests/inc/fulltext_mediause.test.php
index 9d5b2dc84..503b8bc84 100644
--- a/_test/tests/inc/fulltext_mediause.test.php
+++ b/_test/tests/inc/fulltext_mediause.test.php
@@ -26,6 +26,13 @@ class fultext_mediause_test extends DokuWikiTest {
         $this->assertEquals(array('test:medialinks'), ft_mediause('test:example.png'));
     }
 
+    public function test_media_in_local_links() {
+        saveWikiText('test:locallinks', '[[#test|{{wiki:logolocal.png}}]]', 'Test init');
+        idx_addPage('test:locallinks');
+
+        $this->assertEquals(array('test:locallinks'), ft_mediause('wiki:logolocal.png'));
+    }
+
     public function test_media_in_footnotes() {
         saveWikiText('test:media_footnotes', '(({{footnote.png?20x50}} [[foonote|{{:footlink.png}}]]))', 'Test initialization');
         idx_addPage('test:media_footnotes');
diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index faa7a4280..4aa039fcc 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -1,7 +1,7 @@
 <?php
 
 class httpclient_http_proxy_test extends DokuWikiTest {
-    protected $url = 'http://www.dokuwiki.org/README';
+    protected $url = 'http://test.dokuwiki.org/README';
 
     /**
      * @group internet
@@ -13,7 +13,7 @@ class httpclient_http_proxy_test extends DokuWikiTest {
         $http->proxy_port = 8080;
 
         $data = $http->get($this->url);
-        $this->assertFalse($data === false, 'HTTP response');
+        $this->assertFalse($data === false, 'HTTP response '.$http->error);
         $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content');
     }
 
diff --git a/_test/tests/inc/indexer_indexing.test.php b/_test/tests/inc/indexer_indexing.test.php
new file mode 100644
index 000000000..628e82e00
--- /dev/null
+++ b/_test/tests/inc/indexer_indexing.test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Tests the indexing functionality of the indexer
+ *
+ * @author Michael Hamann <michael@content-space.de>
+ */
+class indexer_indexing_test extends DokuWikiTest {
+    public function setUp() {
+        parent::setUp();
+        saveWikiText('testpage', 'Foo bar baz.', 'Test initialization');
+        saveWikiText('notfound', 'Foon barn bazn.', 'Test initialization');
+        idx_addPage('testpage');
+        idx_addPage('notfound');
+    }
+
+    public function test_words() {
+        $indexer = idx_get_indexer();
+        $query = array('baz', 'foo');
+        $this->assertEquals(array('baz' => array('testpage' => 1), 'foo' => array('testpage' => 1)), $indexer->lookup($query));
+    }
+
+    public function test_numerically_identical_words() {
+        $indexer = idx_get_indexer();
+        $indexer->addPageWords('testpage', '0x1 002');
+        $indexer->addPageWords('notfound', '0x2');
+        $query = array('001', '002');
+        $this->assertEquals(array('001' => array(), '002' => array('testpage' => 1)), $indexer->lookup($query));
+    }
+
+    public function test_meta() {
+        $indexer = idx_get_indexer();
+        $indexer->addMetaKeys('testpage', 'testkey', 'testvalue');
+        $indexer->addMetaKeys('notfound', 'testkey', 'notvalue');
+        $query = 'testvalue';
+        $this->assertEquals(array('testpage'), $indexer->lookupKey('testkey', $query));
+    }
+
+    public function test_numerically_identical_meta_values() {
+        $indexer = idx_get_indexer();
+        $indexer->addMetaKeys('testpage', 'numkey', array('0001', '01'));
+        $indexer->addMetaKeys('notfound', 'numkey', array('00001', '000001'));
+        $query = array('001', '01');
+        $this->assertEquals(array('001' => array(), '01' => array('testpage')), $indexer->lookupKey('numkey', $query));
+    }
+}
\ No newline at end of file
diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index ef78692b3..bac0c39ba 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -50,8 +50,8 @@ class mailer_test extends DokuWikiTest {
         // set a bunch of test headers
         $mail->setHeader('test-header','bla');
         $mail->setHeader('to','A valid ASCII name <test@example.com>');
-        $mail->setHeader('from',"Thös ne\needs\x00serious cleaning$§%.");
-        $mail->setHeader('bad',"Thös ne\needs\x00serious cleaning$§%.",false);
+        $mail->setHeader('from',"Thös ne\needs\x00serious cleaning\$§%.");
+        $mail->setHeader('bad',"Thös ne\needs\x00serious cleaning\$§%.",false);
         $mail->setHeader("weird\n*+\x00foo.-_@bar?",'now clean');
 
         // are they set?
@@ -63,7 +63,7 @@ class mailer_test extends DokuWikiTest {
         $this->assertArrayHasKey('From',$headers);
         $this->assertEquals('Ths neeedsserious cleaning.',$headers['From']);
         $this->assertArrayHasKey('Bad',$headers);
-        $this->assertEquals("Thös ne\needs\x00serious cleaning$§%.",$headers['Bad']);
+        $this->assertEquals("Thös ne\needs\x00serious cleaning\$§%.",$headers['Bad']);
         $this->assertArrayHasKey('Weird+foo.-_@bar',$headers);
 
         // unset a header again
@@ -156,5 +156,68 @@ class mailer_test extends DokuWikiTest {
         $this->assertEquals(0, preg_match('/(^|\n)Bcc: (\n|$)/', $header), 'Bcc found in headers.');
         $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Bcc found in headers.');
     }
+
+    /**
+     * @group internet
+     */
+    function test_lint(){
+        // prepare a simple multipart message
+        $mail = new TestMailer();
+        $mail->to(array('Möp <moep@example.com> ',' foo <foo@example.com>'));
+        $mail->from('Me <test@example.com>');
+        $mail->subject('This is a töst');
+        $mail->setBody('Hello Wörld,
+
+        please don\'t burn, okay?
+        ');
+        $mail->attachContent('some test data', 'text/plain', 'a text.txt');
+        $msg = $mail->dump();
+        $msglines = explode("\n", $msg);
+
+        //echo $msg;
+
+        // ask message lint if it is okay
+        $html = new HTTPClient();
+        $results = $html->post('http://tools.ietf.org/tools/msglint/msglint', array('msg'=>$msg));
+        $this->assertTrue($results !== false);
+
+        // parse the result lines
+        $lines = explode("\n", $results);
+        $rows  = count($lines);
+        $i=0;
+        while(trim($lines[$i]) != '-----------' && $i<$rows) $i++; //skip preamble
+        for($i=$i+1; $i<$rows; $i++){
+            $line = trim($lines[$i]);
+            if($line == '-----------') break; //skip appendix
+
+            // get possible continuation of the line
+            while($lines[$i+1][0] == ' '){
+                $line .= ' '.trim($lines[$i+1]);
+                $i++;
+            }
+
+            // check the line for errors
+            if(substr($line,0,5) == 'ERROR' || substr($line,0,7) == 'WARNING'){
+                // ignore some errors
+                if(strpos($line, "missing mandatory header 'return-path'")) continue; #set by MDA
+                if(strpos($line, "bare newline in text body decoded")) continue; #seems to be false positive
+
+                // get the context in which the error occured
+                $errorin = '';
+                if(preg_match('/line (\d+)$/', $line, $m)){
+                    $errorin .= "\n".$msglines[$m[1] - 1];
+                }
+                if(preg_match('/lines (\d+)-(\d+)$/', $line, $m)){
+                    for($x=$m[1]-1; $x<$m[2]; $x++){
+                        $errorin .= "\n".$msglines[$x];
+                    }
+                }
+
+                // raise the error
+                throw new Exception($line.$errorin);
+            }
+        }
+
+    }
 }
 //Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/pageutils_clean_id.test.php b/_test/tests/inc/pageutils_clean_id.test.php
index 478fd2bc4..f67109ba3 100644
--- a/_test/tests/inc/pageutils_clean_id.test.php
+++ b/_test/tests/inc/pageutils_clean_id.test.php
@@ -43,6 +43,9 @@ 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---page','false','page---page');
+        $tests[] = array('page___page','false','page_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');
diff --git a/_test/tests/inc/parser/parser_table.test.php b/_test/tests/inc/parser/parser_table.test.php
index 96789c38c..542a307b8 100644
--- a/_test/tests/inc/parser/parser_table.test.php
+++ b/_test/tests/inc/parser/parser_table.test.php
@@ -270,6 +270,64 @@ def');
         );
         $this->assertEquals(array_map('stripbyteindex',$this->H->calls),$calls);
     }
+
+    function testCellRowSpanFirstRow() {
+        $this->P->addMode('table',new Doku_Parser_Mode_Table());
+        $this->P->parse('
+abc
+|::: ^  d:::^:::|  :::  |
+| b ^ e  | | ::: |
+|c  ^  ::: | |:::|
+def');
+
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('cdata',array("\n\nabc")),
+            array('p_close',array()),
+            array('table_open',array(4, 3, 6)),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array('')),
+            array('tablecell_close',array()),
+            array('tableheader_open',array(1,'right',1)),
+            array('cdata',array('  d:::')),
+            array('tableheader_close',array()),
+            array('tableheader_open',array(1,NULL,1)),
+            array('cdata',array('')),
+            array('tableheader_close',array()),
+            array('tablecell_open',array(1,NULL,3)),
+            array('cdata',array('')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' b ')),
+            array('tablecell_close',array()),
+            array('tableheader_open',array(1,'left',2)),
+            array('cdata',array(' e  ')),
+            array('tableheader_close',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' ')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,'left',1)),
+            array('cdata',array('c  ')),
+            array('tablecell_close',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' ')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+
+            array('table_close',array(69)),
+            array('p_open',array()),
+            array('cdata',array('def')),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $this->assertEquals(array_map('stripbyteindex',$this->H->calls),$calls);
+    }
     
     function testCellAlignmentFormatting() {
         $this->P->addMode('table',new Doku_Parser_Mode_Table());
diff --git a/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
index f08785ca2..18660553d 100644
--- a/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
+++ b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
@@ -80,7 +80,7 @@ class parserutils_set_metadata_during_rendering_test extends DokuWikiTest {
     }
 
     // wrapper function for the fake plugin controller, return $this for the fake syntax of this test
-    function &load($type,$name,$new=false,$disabled=false){
+    function load($type,$name,$new=false,$disabled=false){
         if ($name == 'parserutils_test') {
             return $this;
         } else {
diff --git a/_test/tests/inc/subscription.test.php b/_test/tests/inc/subscription.test.php
index 333400576..34a7b9e4b 100644
--- a/_test/tests/inc/subscription.test.php
+++ b/_test/tests/inc/subscription.test.php
@@ -237,7 +237,7 @@ class MockupSubscription extends Subscription {
         return parent::buildregex($user, $style, $data);
     }
 
-    protected function send($subscriber_mail, $subject, $id, $template, $trep, $hrep = null) {
+    protected function send($subscriber_mail, $subject, $id, $template, $trep, $hrep = null, $headers = array()) {
         $this->mails[] = $subscriber_mail;
         return true;
     }
diff --git a/_test/tests/lib/exe/css_css_compress.test.php b/_test/tests/lib/exe/css_css_compress.test.php
index a7c87b6a7..a614ea2fd 100644
--- a/_test/tests/lib/exe/css_css_compress.test.php
+++ b/_test/tests/lib/exe/css_css_compress.test.php
@@ -62,6 +62,46 @@ class css_css_compress_test extends DokuWikiTest {
         $this->assertEquals(css_compress($text), 'a{left:20px;top:20px}');
     }
 
+    function test_shortening() {
+        $input = array(
+            'margin:0em 0em 0em 0em ul.test margin:0em :0em div#FFFFFF {',
+            'margin:  1px 1px 1px 1px;',
+            'padding: 1px 2px 1px 2px;',
+            'margin:  1px 2px 3px 1px;',
+            'padding: 1px 2px 3px 4px;',
+            'margin:  00.00em 0em 01.00px 0em;',
+            'padding: 0010em 0010.00em 00.00em 00.00100em;',
+            'padding: 0010% 0010.00% 00.00% 00.00100xxx;',
+            'padding: 0.0em .0em 0.em 00.00em;',
+            'padding: 01.0em;',
+            'color:   #FFFFFF;',
+            'color:   #777777;',
+            'color:   #123456;',
+            'border:  01.0em solid #ffffff;',
+        );
+
+        $expected = array(
+            'margin:0em 0em 0em 0em ul.test margin:0em :0em div#FFFFFF{',
+            'margin:1px;',
+            'padding:1px 2px;',
+            'margin:1px 2px 3px 1px;',
+            'padding:1px 2px 3px 4px;',
+            'margin:0 0 1px 0;',
+            'padding:10em 10em 0 .001em;',
+            'padding:10% 10% 0 00.00100xxx;',
+            'padding:0;',
+            'padding:1em;',
+            'color:#FFF;',
+            'color:#777;',
+            'color:#123456;',
+            'border:1em solid #fff;',
+        );
+
+        $input = array_map('css_compress', $input);
+
+        $this->assertEquals($expected, $input);
+    }
+
 }
 
 //Setup VIM: ex: et ts=4 :