Merge branch 'master' into stable

* master: (214 commits)
  release preparations
  postgresql auth plugin: correct function name
  parse AT parameter: first strtotime then timestamp remove config option
  move more strings to lang.php
  move strings to lang.php
  add placeholders for create page text
  phpdocs parserutils
  improve some scrutinizer issues
  visibility plugin methods
  use config cascade for loading of localizations
  reformatting config cascade
  add lang files to cascading
  work around missing gzopen on certain systems #865
  translation update
  fix scrutinizer issues
  fixed typos in docblock comments
  do not allow empty passwords
  clean user credentials from control chars
  added filter method to INPUT class
  translation update
  ...

8 files changed, 359 insertions, 2 deletions

diff --git a/_test/tests/inc/cache_use.test.php b/_test/tests/inc/cache_use.test.php
index c54a472a3..3ea212d50 100644
--- a/_test/tests/inc/cache_use.test.php
+++ b/_test/tests/inc/cache_use.test.php
@@ -18,14 +18,20 @@ class cache_use_test extends DokuWikiTest {
         $conf['cachetime'] = 0;  // ensure the value is not -1, which disables caching
 
         saveWikiText($ID, 'Content', 'Created');
-        // set the modification time a second in the past in order to ensure that the cache is newer than the page
-        touch($file, time()-1);
 
         $this->cache = new cache_renderer($ID, $file, 'xhtml');
         $this->cache->storeCache('Test');
+
+        // set the modification times explicitly (overcome Issue #694)
+        $time = time();
+        touch($file, $time-1);
+        touch($this->cache->cache, $time);
     }
 
     function test_use() {
+        $this->markTestSkipped('Disabled until Ticket #694 has been fixed');
+        return;
+
         $this->assertTrue($this->cache->useCache());
     }
 
diff --git a/_test/tests/inc/changelog_getlastrevisionat.test.php b/_test/tests/inc/changelog_getlastrevisionat.test.php
new file mode 100644
index 000000000..84b185ce8
--- /dev/null
+++ b/_test/tests/inc/changelog_getlastrevisionat.test.php
@@ -0,0 +1,127 @@
+<?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_getlastrevisionat_test extends DokuWikiTest {
+
+    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['mailinglist']);
+        }
+    }
+    
+
+    /**
+     * no nonexist.changes meta file available
+     */
+    function test_changemetadatanotexists() {
+        $rev = 1362525899;
+        $id = 'nonexist';
+        $revsexpected = false;
+
+        $pagelog = new PageChangeLog($id, $chunk_size = 8192);
+        $revs = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+    /**
+     * start at exact current revision of mailinglist page
+     *
+     */
+    function test_startatexactcurrentrev() {
+        $rev = 1385051947;
+        $revsexpected = '';
+
+        //set a known timestamp
+        touch(wikiFN($this->pageid), $rev);
+
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($revsexpected, $revs);
+
+    }
+    
+    /**
+     * test a future revision
+     *
+     */
+    function test_futurerev() {
+        $rev = 1385051947;
+        $revsexpected = '';
+
+        //set a known timestamp
+        touch(wikiFN($this->pageid), $rev);
+        
+        $rev +=1;
+
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($revsexpected, $revs);
+
+    }
+
+    /**
+     * start at exact last revision of mailinglist page
+     *
+     */
+    function test_exactlastrev() {
+        $rev = 1360110636;
+        $revsexpected = 1360110636;
+
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($revsexpected, $revs);
+    }
+
+
+    /**
+     * Request not existing revision
+     * 
+     */
+    function test_olderrev() {
+        $rev = 1;
+        $revexpected = false;
+
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($revexpected, $revfound);
+    }
+
+    /**
+     * Start at non existing revision somewhere between existing revisions
+     */
+    function test_notexistingrev() {
+        $rev = 1362525890;
+        $revexpected = 1362525359;
+
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($revexpected, $revfound);
+    }
+
+    /**
+     * request nonexisting page
+     *
+     */
+    function test_notexistingpage() {
+        $rev = 1385051947;
+        $currentexpected = false;
+
+        $pagelog = new PageChangeLog('nonexistingpage', $chunk_size = 8192);
+        $current = $pagelog->getLastRevisionAt($rev);
+        $this->assertEquals($currentexpected, $current);
+    }
+}
\ No newline at end of file
diff --git a/_test/tests/inc/cli_options.test.php b/_test/tests/inc/cli_options.test.php
new file mode 100644
index 000000000..ab03ee29b
--- /dev/null
+++ b/_test/tests/inc/cli_options.test.php
@@ -0,0 +1,56 @@
+<?php
+
+class cli_options extends DokuWikiTest {
+
+    function test_simpleshort() {
+        $options = new DokuCLI_Options();
+        $options->registerOption('exclude', 'exclude files', 'x', 'file');
+
+        $options->args = array('-x', 'foo', 'bang');
+        $options->parseOptions();
+
+        $this->assertEquals('foo', $options->getOpt('exclude'));
+        $this->assertEquals(array('bang'), $options->args);
+        $this->assertFalse($options->getOpt('nothing'));
+    }
+
+    function test_simplelong1() {
+        $options = new DokuCLI_Options();
+        $options->registerOption('exclude', 'exclude files', 'x', 'file');
+
+        $options->args = array('--exclude', 'foo', 'bang');
+        $options->parseOptions();
+
+        $this->assertEquals('foo', $options->getOpt('exclude'));
+        $this->assertEquals(array('bang'), $options->args);
+        $this->assertFalse($options->getOpt('nothing'));
+    }
+
+    function test_simplelong2() {
+        $options = new DokuCLI_Options();
+        $options->registerOption('exclude', 'exclude files', 'x', 'file');
+
+        $options->args = array('--exclude=foo', 'bang');
+        $options->parseOptions();
+
+        $this->assertEquals('foo', $options->getOpt('exclude'));
+        $this->assertEquals(array('bang'), $options->args);
+        $this->assertFalse($options->getOpt('nothing'));
+    }
+
+    function test_complex() {
+        $options = new DokuCLI_Options();
+
+        $options->registerOption('plugins', 'run on plugins only', 'p');
+        $options->registerCommand('status', 'display status info');
+        $options->registerOption('long', 'display long lines', 'l', false, 'status');
+
+        $options->args = array('-p', 'status', '--long', 'foo');
+        $options->parseOptions();
+
+        $this->assertEquals('status', $options->getCmd());
+        $this->assertTrue($options->getOpt('plugins'));
+        $this->assertTrue($options->getOpt('long'));
+        $this->assertEquals(array('foo'), $options->args);
+    }
+}
\ No newline at end of file
diff --git a/_test/tests/inc/common_ml.test.php b/_test/tests/inc/common_ml.test.php
index 415c0a88d..027dcaef2 100644
--- a/_test/tests/inc/common_ml.test.php
+++ b/_test/tests/inc/common_ml.test.php
@@ -146,4 +146,15 @@ class common_ml_test extends DokuWikiTest {
         $this->assertEquals($expect, ml($id, $args));
 
     }
+    
+    function test_ml_empty_rev() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = array('a' => 'b', 'c' => 'd', 'rev' => '');
+
+        $expect = DOKU_BASE . $this->script . '?a=b&amp;c=d&amp;media=some:img.jpg';
+        $this->assertEquals($expect, ml('some:img.jpg', $args));
+    }
 }
diff --git a/_test/tests/inc/common_wl.test.php b/_test/tests/inc/common_wl.test.php
index 2e34dcae3..4bfde3f39 100644
--- a/_test/tests/inc/common_wl.test.php
+++ b/_test/tests/inc/common_wl.test.php
@@ -142,6 +142,17 @@ class common_wl_test extends DokuWikiTest {
         $expect = DOKU_BASE . DOKU_SCRIPT . '/some/one?a=b&c=d';
         $this->assertEquals($expect, wl('some:one', 'a=b,c=d', false, '&'));
     }
+    
+    function test_wl_empty_rev() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = array('a' => 'b', 'c' => 'd', 'rev' => '');
+
+        $expect = DOKU_BASE . DOKU_SCRIPT . '?id=some:&amp;a=b&amp;c=d';
+        $this->assertEquals($expect, wl('some:', $args));
+    }
 
 
 
diff --git a/_test/tests/inc/init_checkssl.test.php b/_test/tests/inc/init_checkssl.test.php
new file mode 100644
index 000000000..c57d3c37e
--- /dev/null
+++ b/_test/tests/inc/init_checkssl.test.php
@@ -0,0 +1,81 @@
+<?php
+
+class init_checkssl_test extends DokuWikiTest {
+
+	/**
+	 * Running behind an SSL proxy, HTTP between server and proxy
+	 * HTTPS not set
+	 * HTTP_X_FORWARDED_PROTO
+	 * set to https
+	 */
+	function test1() {
+		$_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';
+
+		$this->assertEquals(is_ssl(), true);
+	}
+
+	/**
+	 * Running behind a plain HTTP proxy, HTTP between server and proxy
+	 * HTTPS not set
+	 * HTTP_X_FORWARDED_PROTO set to http
+	 */
+	function test2() {
+		$_SERVER['HTTP_X_FORWARDED_PROTO'] = 'http';
+
+		$this->assertEquals(is_ssl(), false);
+	}
+
+	/**
+	 * Running behind an SSL proxy, HTTP between server and proxy
+	 * HTTPS set to off,
+	 * HTTP_X_FORWARDED_PROTO set to https
+	 */
+	function test3() {
+		$_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';
+		$_SERVER['HTTPS'] = 'off';
+
+		$this->assertEquals(is_ssl(), true);
+	}
+
+	/**
+	 * Not running behind a proxy, HTTPS server
+	 * HTTPS set to on,
+	 * HTTP_X_FORWARDED_PROTO not set
+	 */
+	function test4() {
+		$_SERVER['HTTPS'] = 'on';
+
+		$this->assertEquals(is_ssl(), true);
+	}
+
+	/**
+	 * Not running behind a proxy, plain HTTP server
+	 * HTTPS not set
+	 * HTTP_X_FORWARDED_PROTO not set
+	 */
+	function test5() {
+		$this->assertEquals(is_ssl(), false);
+	}
+
+	/**
+	 * Not running behind a proxy, plain HTTP server
+	 * HTTPS set to off
+	 * HTTP_X_FORWARDED_PROTO not set
+	 */
+	function test6() {
+		$_SERVER['HTTPS'] = 'off';
+		$this->assertEquals(is_ssl(), false);
+	}
+
+	/**
+	 * Running behind an SSL proxy, SSL between proxy and HTTP server
+	 * HTTPS set to on,
+	 * HTTP_X_FORWARDED_PROTO set to https
+	 */
+	function test7() {
+		$_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';
+		$_SERVER['HTTPS'] = 'on';
+
+		$this->assertEquals(is_ssl(), true);
+	}
+}
diff --git a/_test/tests/inc/input.test.php b/_test/tests/inc/input.test.php
index cec0b80f6..4a8fb8d71 100644
--- a/_test/tests/inc/input.test.php
+++ b/_test/tests/inc/input.test.php
@@ -14,8 +14,58 @@ class input_test extends DokuWikiTest {
         'empty'  => '',
         'emptya' => array(),
         'do'     => array('save' => 'Speichern'),
+
     );
 
+    /**
+     * custom filter function
+     *
+     * @param $string
+     * @return mixed
+     */
+    public function myfilter($string) {
+        $string = str_replace('foo', 'bar', $string);
+        $string = str_replace('baz', '', $string);
+        return $string;
+    }
+
+    public function test_filter() {
+        $_GET     = array(
+            'foo'    => 'foo',
+            'zstring'=> "foo\0bar",
+            'znull'  => "\0",
+            'zint'   => '42'."\0".'42',
+            'zintbaz'=> "baz42",
+        );
+        $_POST    = $_GET;
+        $_REQUEST = $_GET;
+        $INPUT    = new Input();
+
+        $filter = array($this,'myfilter');
+
+        $this->assertNotSame('foobar', $INPUT->str('zstring'));
+        $this->assertSame('foobar', $INPUT->filter()->str('zstring'));
+        $this->assertSame('bar', $INPUT->filter($filter)->str('foo'));
+        $this->assertSame('bar', $INPUT->filter()->str('znull', 'bar', true));
+        $this->assertNotSame('foobar', $INPUT->str('zstring')); // make sure original input is unmodified
+
+        $this->assertNotSame('foobar', $INPUT->get->str('zstring'));
+        $this->assertSame('foobar', $INPUT->get->filter()->str('zstring'));
+        $this->assertSame('bar', $INPUT->get->filter($filter)->str('foo'));
+        $this->assertSame('bar', $INPUT->get->filter()->str('znull', 'bar', true));
+        $this->assertNotSame('foobar', $INPUT->get->str('zstring')); // make sure original input is unmodified
+
+        $this->assertNotSame(4242, $INPUT->int('zint'));
+        $this->assertSame(4242, $INPUT->filter()->int('zint'));
+        $this->assertSame(42, $INPUT->filter($filter)->int('zintbaz'));
+        $this->assertSame(42, $INPUT->filter()->str('znull', 42, true));
+
+        $this->assertSame(true, $INPUT->bool('znull'));
+        $this->assertSame(false, $INPUT->filter()->bool('znull'));
+
+        $this->assertSame('foobar', $INPUT->filter()->valid('zstring', array('foobar', 'bang')));
+    }
+
     public function test_str() {
         $_REQUEST      = $this->data;
         $_POST         = $this->data;
diff --git a/_test/tests/lib/exe/css_css_compress.test.php b/_test/tests/lib/exe/css_css_compress.test.php
index f0eb17968..807317ca6 100644
--- a/_test/tests/lib/exe/css_css_compress.test.php
+++ b/_test/tests/lib/exe/css_css_compress.test.php
@@ -53,6 +53,21 @@ class css_css_compress_test extends DokuWikiTest {
         $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
     }
 
+    function test_slcom6(){
+        $text = '#foo {
+                    background-image: url(//foo.bar/baz.jpg); // background-image: url(http://foo.bar/baz.jpg); this is all commented
+                }';
+        $this->assertEquals('#foo{background-image:url(//foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+    function test_slcom7(){
+        $text = '#foo a[href ^="https://"], #foo a[href ^=\'https://\'] {
+                    background-image: url(//foo.bar/baz.jpg); // background-image: url(http://foo.bar/baz.jpg); this is \'all\' "commented"
+                }';
+        $this->assertEquals('#foo a[href ^="https://"],#foo a[href ^=\'https://\']{background-image:url(//foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+
     function test_hack(){
         $text = '/* Mac IE will not see this and continue with inline-block */
                  /* \\*/