summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_test/cases/inc/parser/.htaccess3
-rw-r--r--_test/cases/inc/parser/lexer.test.php98
-rw-r--r--_test/cases/inc/parser/parser.inc.php4
-rw-r--r--_test/lib/testmanager.php66
-rw-r--r--doku.php2
-rw-r--r--inc/html.php2
-rw-r--r--inc/infoutils.php3
-rw-r--r--inc/lang/fo/lang.php335
-rw-r--r--inc/lang/fo/subscr_digest.txt20
-rw-r--r--inc/lang/sk/lang.php3
-rw-r--r--inc/parser/handler.php23
-rw-r--r--inc/template.php161
-rw-r--r--inc/utf8.php2
-rw-r--r--lib/exe/ajax.php2
-rw-r--r--lib/plugins/config/lang/sk/lang.php1
-rw-r--r--lib/plugins/popularity/admin.php10
16 files changed, 399 insertions, 336 deletions
diff --git a/_test/cases/inc/parser/.htaccess b/_test/cases/inc/parser/.htaccess
deleted file mode 100644
index 38539a1a2..000000000
--- a/_test/cases/inc/parser/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-## no access to the inc directory
-order allow,deny
-allow from all
diff --git a/_test/cases/inc/parser/lexer.test.php b/_test/cases/inc/parser/lexer.test.php
index cbfce9ba9..e802277f1 100644
--- a/_test/cases/inc/parser/lexer.test.php
+++ b/_test/cases/inc/parser/lexer.test.php
@@ -19,24 +19,24 @@ class TestOfLexerParallelRegex extends UnitTestCase {
$this->UnitTestCase();
}
function testNoPatterns() {
- $regex = &new Doku_LexerParallelRegex(false);
+ $regex = new Doku_LexerParallelRegex(false);
$this->assertFalse($regex->match("Hello", $match));
$this->assertEqual($match, "");
}
function testNoSubject() {
- $regex = &new Doku_LexerParallelRegex(false);
+ $regex = new Doku_LexerParallelRegex(false);
$regex->addPattern(".*");
$this->assertTrue($regex->match("", $match));
$this->assertEqual($match, "");
}
function testMatchAll() {
- $regex = &new Doku_LexerParallelRegex(false);
+ $regex = new Doku_LexerParallelRegex(false);
$regex->addPattern(".*");
$this->assertTrue($regex->match("Hello", $match));
$this->assertEqual($match, "Hello");
}
function testCaseSensitive() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("abc");
$this->assertTrue($regex->match("abcdef", $match));
$this->assertEqual($match, "abc");
@@ -44,7 +44,7 @@ class TestOfLexerParallelRegex extends UnitTestCase {
$this->assertEqual($match, "abc");
}
function testCaseInsensitive() {
- $regex = &new Doku_LexerParallelRegex(false);
+ $regex = new Doku_LexerParallelRegex(false);
$regex->addPattern("abc");
$this->assertTrue($regex->match("abcdef", $match));
$this->assertEqual($match, "abc");
@@ -52,7 +52,7 @@ class TestOfLexerParallelRegex extends UnitTestCase {
$this->assertEqual($match, "ABC");
}
function testMatchMultiple() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("abc");
$regex->addPattern("ABC");
$this->assertTrue($regex->match("abcdef", $match));
@@ -62,7 +62,7 @@ class TestOfLexerParallelRegex extends UnitTestCase {
$this->assertFalse($regex->match("Hello", $match));
}
function testPatternLabels() {
- $regex = &new Doku_LexerParallelRegex(false);
+ $regex = new Doku_LexerParallelRegex(false);
$regex->addPattern("abc", "letter");
$regex->addPattern("123", "number");
$this->assertIdentical($regex->match("abcdef", $match), "letter");
@@ -71,7 +71,7 @@ class TestOfLexerParallelRegex extends UnitTestCase {
$this->assertEqual($match, "123");
}
function testMatchMultipleWithLookaheadNot() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("abc");
$regex->addPattern("ABC");
$regex->addPattern("a(?!\n).{1}");
@@ -84,37 +84,37 @@ class TestOfLexerParallelRegex extends UnitTestCase {
$this->assertFalse($regex->match("Hello", $match));
}
function testMatchSetOptionCaseless() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("a(?i)b(?i)c");
$this->assertTrue($regex->match("aBc", $match));
$this->assertEqual($match, "aBc");
}
function testMatchSetOptionUngreedy() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("(?U)\w+");
$this->assertTrue($regex->match("aaaaaa", $match));
$this->assertEqual($match, "a");
}
function testMatchLookaheadEqual() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("\w(?=c)");
$this->assertTrue($regex->match("xbyczd", $match));
$this->assertEqual($match, "y");
}
function testMatchLookaheadNot() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("\w(?!b|c)");
$this->assertTrue($regex->match("xbyczd", $match));
$this->assertEqual($match, "b");
}
function testMatchLookbehindEqual() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("(?<=c)\w");
$this->assertTrue($regex->match("xbyczd", $match));
$this->assertEqual($match, "z");
}
function testMatchLookbehindNot() {
- $regex = &new Doku_LexerParallelRegex(true);
+ $regex = new Doku_LexerParallelRegex(true);
$regex->addPattern("(?<!\A|x|b)\w");
$this->assertTrue($regex->match("xbyczd", $match));
$this->assertEqual($match, "c");
@@ -127,15 +127,15 @@ class TestOfLexerStateStack extends UnitTestCase {
$this->UnitTestCase();
}
function testStartState() {
- $stack = &new Doku_LexerStateStack("one");
+ $stack = new Doku_LexerStateStack("one");
$this->assertEqual($stack->getCurrent(), "one");
}
function testExhaustion() {
- $stack = &new Doku_LexerStateStack("one");
+ $stack = new Doku_LexerStateStack("one");
$this->assertFalse($stack->leave());
}
function testStateMoves() {
- $stack = &new Doku_LexerStateStack("one");
+ $stack = new Doku_LexerStateStack("one");
$stack->enter("two");
$this->assertEqual($stack->getCurrent(), "two");
$stack->enter("three");
@@ -167,24 +167,24 @@ class TestOfLexer extends UnitTestCase {
$this->UnitTestCase();
}
function testNoPatterns() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->expectNever("accept");
$handler->setReturnValue("accept", true);
- $lexer = &new Doku_Lexer($handler);
+ $lexer = new Doku_Lexer($handler);
$this->assertFalse($lexer->parse("abcdef"));
}
function testEmptyPage() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->expectNever("accept");
$handler->setReturnValue("accept", true);
$handler->expectNever("accept");
$handler->setReturnValue("accept", true);
- $lexer = &new Doku_Lexer($handler);
+ $lexer = new Doku_Lexer($handler);
$lexer->addPattern("a+");
$this->assertTrue($lexer->parse(""));
}
function testSinglePattern() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->expectArgumentsAt(0, "accept", array("aaa", DOKU_LEXER_MATCHED, 0));
$handler->expectArgumentsAt(1, "accept", array("x", DOKU_LEXER_UNMATCHED, 3));
$handler->expectArgumentsAt(2, "accept", array("a", DOKU_LEXER_MATCHED, 4));
@@ -195,13 +195,13 @@ class TestOfLexer extends UnitTestCase {
$handler->expectArgumentsAt(7, "accept", array("z", DOKU_LEXER_UNMATCHED, 13));
$handler->expectCallCount("accept", 8);
$handler->setReturnValue("accept", true);
- $lexer = &new Doku_Lexer($handler);
+ $lexer = new Doku_Lexer($handler);
$lexer->addPattern("a+");
$this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
$handler->tally();
}
function testMultiplePattern() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
$positions = array(0,1,2,3,5,6,7,8,14,15);
for ($i = 0; $i < count($target); $i++) {
@@ -209,7 +209,7 @@ class TestOfLexer extends UnitTestCase {
}
$handler->expectCallCount("accept", count($target));
$handler->setReturnValue("accept", true);
- $lexer = &new Doku_Lexer($handler);
+ $lexer = new Doku_Lexer($handler);
$lexer->addPattern("a+");
$lexer->addPattern("b+");
$this->assertTrue($lexer->parse("ababbxbaxxxxxxax"));
@@ -222,7 +222,7 @@ class TestOfLexerModes extends UnitTestCase {
$this->UnitTestCase();
}
function testIsolatedPattern() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->expectArgumentsAt(0, "a", array("a", DOKU_LEXER_MATCHED,0));
$handler->expectArgumentsAt(1, "a", array("b", DOKU_LEXER_UNMATCHED,1));
$handler->expectArgumentsAt(2, "a", array("aa", DOKU_LEXER_MATCHED,2));
@@ -233,14 +233,14 @@ class TestOfLexerModes extends UnitTestCase {
$handler->expectArgumentsAt(7, "a", array("x", DOKU_LEXER_UNMATCHED,15));
$handler->expectCallCount("a", 8);
$handler->setReturnValue("a", true);
- $lexer = &new Doku_Lexer($handler, "a");
+ $lexer = new Doku_Lexer($handler, "a");
$lexer->addPattern("a+", "a");
$lexer->addPattern("b+", "b");
$this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
$handler->tally();
}
function testModeChange() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->expectArgumentsAt(0, "a", array("a", DOKU_LEXER_MATCHED,0));
$handler->expectArgumentsAt(1, "a", array("b", DOKU_LEXER_UNMATCHED,1));
$handler->expectArgumentsAt(2, "a", array("aa", DOKU_LEXER_MATCHED,2));
@@ -258,7 +258,7 @@ class TestOfLexerModes extends UnitTestCase {
$handler->expectCallCount("b", 8);
$handler->setReturnValue("a", true);
$handler->setReturnValue("b", true);
- $lexer = &new Doku_Lexer($handler, "a");
+ $lexer = new Doku_Lexer($handler, "a");
$lexer->addPattern("a+", "a");
$lexer->addEntryPattern(":", "a", "b");
$lexer->addPattern("b+", "b");
@@ -266,7 +266,7 @@ class TestOfLexerModes extends UnitTestCase {
$handler->tally();
}
function testNesting() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->setReturnValue("a", true);
$handler->setReturnValue("b", true);
$handler->expectArgumentsAt(0, "a", array("aa", DOKU_LEXER_MATCHED,0));
@@ -282,7 +282,7 @@ class TestOfLexerModes extends UnitTestCase {
$handler->expectArgumentsAt(5, "a", array("b", DOKU_LEXER_UNMATCHED,15));
$handler->expectCallCount("a", 6);
$handler->expectCallCount("b", 5);
- $lexer = &new Doku_Lexer($handler, "a");
+ $lexer = new Doku_Lexer($handler, "a");
$lexer->addPattern("a+", "a");
$lexer->addEntryPattern("(", "a", "b");
$lexer->addPattern("b+", "b");
@@ -291,7 +291,7 @@ class TestOfLexerModes extends UnitTestCase {
$handler->tally();
}
function testSingular() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->setReturnValue("a", true);
$handler->setReturnValue("b", true);
$handler->expectArgumentsAt(0, "a", array("aa", DOKU_LEXER_MATCHED,0));
@@ -302,19 +302,19 @@ class TestOfLexerModes extends UnitTestCase {
$handler->expectArgumentsAt(1, "b", array("bbb", DOKU_LEXER_SPECIAL,7));
$handler->expectCallCount("a", 4);
$handler->expectCallCount("b", 2);
- $lexer = &new Doku_Lexer($handler, "a");
+ $lexer = new Doku_Lexer($handler, "a");
$lexer->addPattern("a+", "a");
$lexer->addSpecialPattern("b+", "a", "b");
$this->assertTrue($lexer->parse("aabaaxxbbbxx"));
$handler->tally();
}
function testUnwindTooFar() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->setReturnValue("a", true);
$handler->expectArgumentsAt(0, "a", array("aa", DOKU_LEXER_MATCHED,0));
$handler->expectArgumentsAt(1, "a", array(")", DOKU_LEXER_EXIT,2));
$handler->expectCallCount("a", 2);
- $lexer = &new Doku_Lexer($handler, "a");
+ $lexer = new Doku_Lexer($handler, "a");
$lexer->addPattern("a+", "a");
$lexer->addExitPattern(")", "a");
$this->assertFalse($lexer->parse("aa)aa"));
@@ -327,7 +327,7 @@ class TestOfLexerHandlers extends UnitTestCase {
$this->UnitTestCase();
}
function testModeMapping() {
- $handler = &new MockTestParser($this);
+ $handler = new MockTestParser($this);
$handler->setReturnValue("a", true);
$handler->expectArgumentsAt(0, "a", array("aa", DOKU_LEXER_MATCHED,0));
$handler->expectArgumentsAt(1, "a", array("(", DOKU_LEXER_ENTER,2));
@@ -337,7 +337,7 @@ class TestOfLexerHandlers extends UnitTestCase {
$handler->expectArgumentsAt(5, "a", array(")", DOKU_LEXER_EXIT,8));
$handler->expectArgumentsAt(6, "a", array("b", DOKU_LEXER_UNMATCHED,9));
$handler->expectCallCount("a", 7);
- $lexer = &new Doku_Lexer($handler, "mode_a");
+ $lexer = new Doku_Lexer($handler, "mode_a");
$lexer->addPattern("a+", "mode_a");
$lexer->addEntryPattern("(", "mode_a", "mode_b");
$lexer->addPattern("b+", "mode_b");
@@ -369,7 +369,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
function testIndex() {
$doc = "aaa<file>bcd</file>eee";
- $handler = &new MockTestParserByteIndex($this);
+ $handler = new MockTestParserByteIndex($this);
$handler->setReturnValue("ignore", true);
$handler->setReturnValue("caught", true);
@@ -400,7 +400,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
);
$handler->expectCallCount("caught", 5);
- $lexer = &new Doku_Lexer($handler, "ignore");
+ $lexer = new Doku_Lexer($handler, "ignore");
$lexer->addEntryPattern("<file>", "ignore", "caught");
$lexer->addExitPattern("</file>", "caught");
$lexer->addSpecialPattern('b','caught','special');
@@ -414,7 +414,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
function testIndexLookaheadEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = &new MockTestParserByteIndex($this);
+ $handler = new MockTestParserByteIndex($this);
$handler->setReturnValue("ignore", true);
$handler->setReturnValue("caught", true);
@@ -445,7 +445,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
);
$handler->expectCallCount("caught", 5);
- $lexer = &new Doku_Lexer($handler, "ignore");
+ $lexer = new Doku_Lexer($handler, "ignore");
$lexer->addEntryPattern('<file>(?=.*</file>)', "ignore", "caught");
$lexer->addExitPattern("</file>", "caught");
$lexer->addSpecialPattern('b','caught','special');
@@ -459,7 +459,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
function testIndexLookaheadNotEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = &new MockTestParserByteIndex($this);
+ $handler = new MockTestParserByteIndex($this);
$handler->setReturnValue("ignore", true);
$handler->setReturnValue("caught", true);
@@ -490,7 +490,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
);
$handler->expectCallCount("caught", 5);
- $lexer = &new Doku_Lexer($handler, "ignore");
+ $lexer = new Doku_Lexer($handler, "ignore");
$lexer->addEntryPattern('<file>(?!foo)', "ignore", "caught");
$lexer->addExitPattern("</file>", "caught");
$lexer->addSpecialPattern('b','caught','special');
@@ -504,7 +504,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
function testIndexLookbehindEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = &new MockTestParserByteIndex($this);
+ $handler = new MockTestParserByteIndex($this);
$handler->setReturnValue("ignore", true);
$handler->setReturnValue("caught", true);
@@ -535,7 +535,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
);
$handler->expectCallCount("caught", 5);
- $lexer = &new Doku_Lexer($handler, "ignore");
+ $lexer = new Doku_Lexer($handler, "ignore");
$lexer->addEntryPattern('<file>', "ignore", "caught");
$lexer->addExitPattern("(?<=d)</file>", "caught");
$lexer->addSpecialPattern('b','caught','special');
@@ -549,7 +549,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
function testIndexLookbehindNotEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = &new MockTestParserByteIndex($this);
+ $handler = new MockTestParserByteIndex($this);
$handler->setReturnValue("ignore", true);
$handler->setReturnValue("caught", true);
@@ -580,7 +580,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
);
$handler->expectCallCount("caught", 5);
- $lexer = &new Doku_Lexer($handler, "ignore");
+ $lexer = new Doku_Lexer($handler, "ignore");
$lexer->addEntryPattern('<file>', "ignore", "caught");
$lexer->addExitPattern("(?<!c)</file>", "caught");
$lexer->addSpecialPattern('b','caught','special');
@@ -599,7 +599,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
$doc = "ALL FOOLS ARE FOO";
$pattern = '\bFOO\b';
- $handler = &new MockTestParserByteIndex($this);
+ $handler = new MockTestParserByteIndex($this);
$handler->setReturnValue("ignore", true);
$handler->setReturnValue("caught", true);
@@ -613,7 +613,7 @@ class TestOfLexerByteIndices extends UnitTestCase {
);
$handler->expectCallCount("caught", 1);
- $lexer = &new Doku_Lexer($handler, "ignore");
+ $lexer = new Doku_Lexer($handler, "ignore");
$lexer->addSpecialPattern($pattern,'ignore','caught');
$this->assertTrue($lexer->parse($doc));
diff --git a/_test/cases/inc/parser/parser.inc.php b/_test/cases/inc/parser/parser.inc.php
index 22574d579..74d956f43 100644
--- a/_test/cases/inc/parser/parser.inc.php
+++ b/_test/cases/inc/parser/parser.inc.php
@@ -33,8 +33,8 @@ class TestOfDoku_Parser extends UnitTestCase {
}
function setup() {
- $this->P = & new Doku_Parser();
- $this->H = & new Doku_Handler();
+ $this->P = new Doku_Parser();
+ $this->H = new Doku_Handler();
$this->P->Handler = & $this->H;
}
diff --git a/_test/lib/testmanager.php b/_test/lib/testmanager.php
index 96c9a57a2..06efd2694 100644
--- a/_test/lib/testmanager.php
+++ b/_test/lib/testmanager.php
@@ -51,9 +51,9 @@ class TestManager {
}
function runAllTests(&$reporter) {
- $manager =& new TestManager();
+ $manager = new TestManager();
$test_cases =& $manager->_getTestFileList();
- $test =& new GroupTest('All Tests');
+ $test = new GroupTest('All Tests');
foreach ($test_cases as $test_case) {
$test->addTestFile($test_case);
}
@@ -61,9 +61,9 @@ class TestManager {
}
function runAllPluginTests(&$reporter) {
- $manager =& new TestManager();
+ $manager = new TestManager();
$test_cases =& $manager->_getTestFileList(TEST_PLUGINS);
- $test =& new GroupTest('All Plugin Tests');
+ $test = new GroupTest('All Plugin Tests');
foreach ($test_cases as $test_case) {
$test->addTestFile($test_case);
}
@@ -72,7 +72,7 @@ class TestManager {
function runTestCase($testcase_name, $test_case_directory, &$reporter) {
- $manager =& new TestManager();
+ $manager = new TestManager();
$testcase_name = preg_replace('/[^a-zA-Z0-9_:]/','',$testcase_name);
$testcase_name = str_replace(':',DIRECTORY_SEPARATOR,$testcase_name);
@@ -85,26 +85,26 @@ class TestManager {
E_USER_ERROR);
}
- $test =& new GroupTest("Individual test case: " . $testcase_name);
+ $test = new GroupTest("Individual test case: " . $testcase_name);
$test->addTestFile($testcase_file);
$test->run($reporter);
}
function runTestFile($testcase_file, &$reporter) {
- $manager =& new TestManager();
+ $manager = new TestManager();
if (! file_exists($testcase_file)) {
trigger_error("Test case {$testcase_file} cannot be found",
E_USER_ERROR);
}
- $test =& new GroupTest("Individual test case: " . $testcase_file);
+ $test = new GroupTest("Individual test case: " . $testcase_file);
$test->addTestFile($testcase_file);
$test->run($reporter);
}
function runGroupTest($group_test_name, $group_test_directory, &$reporter) {
- $manager =& new TestManager();
+ $manager = new TestManager();
$group_test_name = preg_replace('/[^a-zA-Z0-9_:]/','',$group_test_name);
$group_test_name = str_replace(':',DIRECTORY_SEPARATOR,$group_test_name);
$file_path = $group_test_directory . DIRECTORY_SEPARATOR .
@@ -116,7 +116,7 @@ class TestManager {
}
require_once $file_path;
- $test =& new GroupTest($group_test_name . ' group test');
+ $test = new GroupTest($group_test_name . ' group test');
foreach ($manager->_getGroupTestClassNames($file_path) as $group_test) {
$test->addTestCase(new $group_test());
}
@@ -124,7 +124,7 @@ class TestManager {
}
function addTestCasesFromDirectory(&$group_test, $directory = '.') {
- $manager =& new TestManager();
+ $manager = new TestManager();
$test_cases =& $manager->_getTestFileList($directory);
foreach ($test_cases as $test_case) {
$group_test->addTestFile($test_case);
@@ -132,7 +132,7 @@ class TestManager {
}
function &getTestCaseList($directory = '.') {
- $manager =& new TestManager();
+ $manager = new TestManager();
return $manager->_getTestCaseList($directory);
}
@@ -155,17 +155,17 @@ class TestManager {
}
function &getPluginTestCaseList($directory = '.') {
- $manager =& new TestManager();
+ $manager = new TestManager();
return $manager->_getTestCaseList($directory);
}
function &getPluginGroupTestList($directory = '.') {
- $manager =& new TestManager();
+ $manager = new TestManager();
return $manager->_getTestGroupList($directory);
}
function &getGroupTestList($directory = '.') {
- $manager =& new TestManager();
+ $manager = new TestManager();
return $manager->_getTestGroupList($directory);
}
@@ -244,7 +244,7 @@ class TestManager {
*/
class CLITestManager extends TestManager {
function &getGroupTestList($directory = '.') {
- $manager =& new CLITestManager();
+ $manager = new CLITestManager();
$group_tests =& $manager->_getTestGroupList($directory);
$buffer = "Available grouptests:\n";
@@ -255,7 +255,7 @@ class CLITestManager extends TestManager {
}
function &getTestCaseList($directory = '.') {
- $manager =& new CLITestManager();
+ $manager = new CLITestManager();
$test_cases =& $manager->_getTestCaseList($directory);
$buffer = "Available test cases:\n";
@@ -266,7 +266,7 @@ class CLITestManager extends TestManager {
}
function &getPluginTestCaseList($directory = '.') {
- $manager =& new CLITestManager();
+ $manager = new CLITestManager();
$test_cases =& $manager->_getTestCaseList($directory);
$buffer = "Available test cases:\n";
@@ -277,7 +277,7 @@ class CLITestManager extends TestManager {
}
function &getPluginGroupTestList($directory = '.') {
- $manager =& new CLITestManager();
+ $manager = new CLITestManager();
$test_cases =& $manager->_getTestGroupList($directory);
$buffer = "Available test cases:\n";
@@ -301,7 +301,7 @@ class HTMLTestManager extends TestManager {
}
function &getGroupTestList($directory = '.') {
- $manager =& new HTMLTestManager();
+ $manager = new HTMLTestManager();
$group_tests =& $manager->_getTestGroupList($directory);
if (1 > count($group_tests)) {
return "<p>No test groups set up!</p>";
@@ -318,7 +318,7 @@ class HTMLTestManager extends TestManager {
}
function &getTestCaseList($directory = '.') {
- $manager =& new HTMLTestManager();
+ $manager = new HTMLTestManager();
$testcases =& $manager->_getTestCaseList($directory);
if (1 > count($testcases)) {
@@ -336,7 +336,7 @@ class HTMLTestManager extends TestManager {
}
function &getPluginTestCaseList($directory = '.') {
- $manager =& new HTMLTestManager();
+ $manager = new HTMLTestManager();
$testcases =& $manager->_getTestCaseList($directory);
if (1 > count($testcases)) {
@@ -354,7 +354,7 @@ class HTMLTestManager extends TestManager {
}
function &getPluginGroupTestList($directory = '.') {
- $manager =& new HTMLTestManager();
+ $manager = new HTMLTestManager();
$group_tests =& $manager->_getTestGroupList($directory);
if (1 > count($group_tests)) {
return "<p>No plugin test groups set up!</p>";
@@ -383,7 +383,7 @@ class XMLTestManager extends HTMLTestManager {
function &getGroupTestList($directory = '.') {
- $manager =& new XMLTestManager();
+ $manager = new XMLTestManager();
$group_tests =& $manager->_getTestGroupList($directory);
$rss = & $manager->_getRssWriter();
@@ -418,7 +418,7 @@ class XMLTestManager extends HTMLTestManager {
function &getTestCaseList($directory = '.') {
- $manager =& new XMLTestManager();
+ $manager = new XMLTestManager();
$testcases =& $manager->_getTestCaseList($directory);
$rss = & $manager->_getRssWriter();
@@ -452,7 +452,7 @@ class XMLTestManager extends HTMLTestManager {
require_once TEST_ROOT . '/lib/xml_writer_class.php';
require_once TEST_ROOT . '/lib/rss_writer_class.php';
- $rss_writer_object=& new rss_writer_class();
+ $rss_writer_object= new rss_writer_class();
$rss_writer_object->specification="1.0";
$rss_writer_object->about=$url."index.php?output=xml";
$rss_writer_object->stylesheet=$url."rss2html.xsl";
@@ -496,13 +496,13 @@ class RemoteTestManager extends TestManager {
function runAllTests(&$reporter, $url = FALSE) {
$groups = RemoteTestManager::getGroupTestList($url);
- $T = &new RemoteTestCase($groups['All Tests']);
+ $T = new RemoteTestCase($groups['All Tests']);
$T->run($reporter);
}
function runTestUrl($case_url,& $reporter, $url = FALSE) {
RemoteTestManager::_installSimpleTest();
- $T = &new RemoteTestCase($case_url);
+ $T = new RemoteTestCase($case_url);
$T->run($reporter);
}
@@ -511,7 +511,7 @@ class RemoteTestManager extends TestManager {
if ( !array_key_exists($case_id, $cases) ) {
trigger_error("Unknown test id $case_id\n",E_USER_ERROR);
}
- $T = &new RemoteTestCase($cases[$case_id]);
+ $T = new RemoteTestCase($cases[$case_id]);
$T->run($reporter);
}
@@ -520,7 +520,7 @@ class RemoteTestManager extends TestManager {
if ( !array_key_exists($group_name, $groups) ) {
trigger_error("Unknown group $group_name\n",E_USER_ERROR);
}
- $T = &new RemoteTestCase($groups[$group_name]);
+ $T = new RemoteTestCase($groups[$group_name]);
$T->run($reporter);
}
@@ -532,7 +532,7 @@ class RemoteTestManager extends TestManager {
$url .= '?output=xml';
- $manager =& new RemoteTestManager();
+ $manager = new RemoteTestManager();
$rss = & $manager->_getRssReader($url);
$groupList = array();
@@ -550,7 +550,7 @@ class RemoteTestManager extends TestManager {
}
$url .= '?show=cases&output=xml';
- $manager =& new RemoteTestManager();
+ $manager = new RemoteTestManager();
$rss = & $manager->_getRssReader($url);
$caseList = array();
@@ -565,7 +565,7 @@ class RemoteTestManager extends TestManager {
function &_getRssReader($url) {
require_once "XML/RSS.php";
- $rss_reader =& new XML_RSS($url);
+ $rss_reader = new XML_RSS($url);
$status = $rss_reader->parse();
diff --git a/doku.php b/doku.php
index 3f930a965..ae44fcec7 100644
--- a/doku.php
+++ b/doku.php
@@ -40,7 +40,7 @@ if(empty($HIGH)) $HIGH = getGoogleQuery();
if (isset($_POST['wikitext'])) {
$TEXT = cleanText($_POST['wikitext']);
}
-$PRE = cleanText($_POST['prefix']);
+$PRE = cleanText(substr($_POST['prefix'], 0, -1));
$SUF = cleanText($_POST['suffix']);
$SUM = $_REQUEST['summary'];
diff --git a/inc/html.php b/inc/html.php
index 0bf5842ef..add559971 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1177,7 +1177,7 @@ function html_edit(){
$form->addHidden('id', $ID);
$form->addHidden('rev', $REV);
$form->addHidden('date', $DATE);
- $form->addHidden('prefix', $PRE);
+ $form->addHidden('prefix', $PRE . '.');
$form->addHidden('suffix', $SUF);
$form->addHidden('changecheck', $check);
diff --git a/inc/infoutils.php b/inc/infoutils.php
index ac6a0a84c..d3c6f2918 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -304,6 +304,9 @@ function dbg($msg,$hidden=false){
*/
function dbglog($msg,$header=''){
global $conf;
+ // The debug log isn't automatically cleaned thus only write it when
+ // debugging has been enabled by the user.
+ if($conf['allowdebug'] !== 1) return;
if(is_object($msg) || is_array($msg)){
$msg = print_r($msg,true);
}
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 74d7fff58..2bc5c3d53 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -3,171 +3,172 @@
* faroese language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author Poul J. Clementsen <poul@diku.dk>
+ * @author Poul J. Clementsen <poul@diku.dk>
+ * @author Einar Petersen einar.petersen@gmail.com
*/
-$lang['encoding'] = 'utf-8';
-$lang['direction'] = 'ltr';
-
-$lang['btn_edit'] = 'Rætta hetta skjal';
-$lang['btn_source'] = 'Vís keldu';
-$lang['btn_show'] = 'Vís skjal';
-$lang['btn_create'] = 'Býrja uppá hetta skjal';
-$lang['btn_search'] = 'Leita';
-$lang['btn_save'] = 'Goym';
-$lang['btn_preview']= 'Forskoðan';
-$lang['btn_top'] = 'Aftur til toppin';
-$lang['btn_newer'] = '<< undan síða';
-$lang['btn_older'] = 'næsta síðe >>';
-$lang['btn_revs'] = 'Gamlar útgávur';
-$lang['btn_recent'] = 'Nýggj broyting';
-$lang['btn_upload'] = 'Legg fílu upp';
-$lang['btn_cancel'] = 'Angra';
-$lang['btn_index'] = 'Evnisyvirlit';
-$lang['btn_secedit']= 'Rætta';
-$lang['btn_login'] = 'Rita inn';
-$lang['btn_logout'] = 'Rita út';
-$lang['btn_admin'] = 'Admin';
-$lang['btn_update'] = 'Dagfør';
-$lang['btn_delete'] = 'Strika';
-$lang['btn_back'] = 'Aftur';
-$lang['btn_backlink'] = "Ávísingar afturúr";
-$lang['btn_backtomedia'] = 'Aftur til val av miðlafílu';
-$lang['btn_subscribe'] = 'Tilmelda broytingar';
-$lang['btn_unsubscribe'] = 'Strika tilmelding av broytingum';
-$lang['btn_profile'] = 'Dagføra vangamynd';
-$lang['btn_reset'] = 'Nullstilla';
-$lang['btn_resendpwd'] = 'Send nýtt loyniorð';
-
-$lang['loggedinas'] = 'Ritavur inn sum';
-$lang['user'] = 'Brúkaranavn';
-$lang['pass'] = 'Loyniorð';
-$lang['newpass'] = 'Nýtt loyniorð';
-$lang['oldpass'] = 'Vátta gamalt loyniorð';
-$lang['passchk'] = 'Endurtak nýtt loyniorð';
-$lang['remember'] = 'Minst til loyniorðið hjá mær';
-$lang['fullname'] = 'Navn';
-$lang['email'] = 'T-postur';
-$lang['register'] = 'Melda til';
-$lang['profile'] = 'Brúkara vangamynd';
-$lang['badlogin'] = 'Skeivt brúkaranavn ella loyniorð.';
-$lang['minoredit'] = 'Smærri broytingar';
-
-$lang['regmissing'] = 'Tú skalt fylla út øll øki.';
-$lang['reguexists'] = 'Hetta brúkaranavn er upptiki.';
-$lang['regsuccess'] = 'Tú ert nú stovnavur sum brúkari. Títt loyniorð verður sent til tín í einum T-posti.';
-$lang['regsuccess2']= 'Tú ert nú stovnavur sum brúkari.';
-$lang['regmailfail']= 'Títt loyniorð bleiv ikki sent. Fá vinarliga samband við administratorin.';
-$lang['regbadmail'] = 'T-post adressan er ógildig. Fá vinarliga samband við administratorin, um tú heldur at hetta er eitt brek.';
-$lang['regbadpass'] = 'Bæði loyniorðini eru ikki eins, royn vinarliga umaftur.';
-$lang['regpwmail'] = 'Títt DokuWiki loyniorð';
-$lang['reghere'] = 'Upprætta eina DokuWiki-konto her';
-
-$lang['profna'] = 'Tað er ikki møguligt at broyta tína vangamynd í hesu wiki';
-$lang['profnochange'] = 'Ongar broytingar, onki tillaga.';
-$lang['profnoempty'] = 'Tómt navn ella t-post adressa er ikki loyvt.';
-$lang['profchanged'] = 'Brúkara vangamynd dagført rætt.';
-
-$lang['pwdforget'] = 'Gloymt títt loyniorð? Fá eitt nýtt';
-$lang['resendna'] = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.';
-$lang['resendpwd'] = 'Send nýtt loyniorð til';
-$lang['resendpwdmissing'] = 'Tú skal filla út øll økir.';
-$lang['resendpwdnouser'] = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.';
-$lang['resendpwdsuccess'] = 'Títt nýggja loyniorð er sent við t-posti.';
-
-$lang['txt_upload'] = 'Vel tí fílu sum skal leggjast upp';
-$lang['txt_filename'] = 'Sláa inn wikinavn (valfrítt)';
-$lang['txt_overwrt'] = 'Yvurskriva verandi fílu';
-$lang['lockedby'] = 'Fyribils læst av';
-$lang['lockexpire'] = 'Lásið ferð úr gildi kl.';
-$lang['willexpire'] = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á '.$lang['btn_preview'].'-knappin fyri at sleppa undan trupulleikum.';
-
-$lang['js']['notsavedyet'] = "Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.\nYnskir tú at halda fram?";
-$lang['rssfailed'] = 'Eitt brek koma fyri tá roynt var at fáa: ';
-$lang['nothingfound']= 'Leiting gav onki úrslit.';
-
-$lang['mediaselect'] = 'Vel miðlafílu';
-$lang['fileupload'] = 'Legg miðla fílu upp';
-$lang['uploadsucc'] = 'Upp legg av fílu var væl eydna';
-$lang['uploadfail'] = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum';
-$lang['uploadwrong'] = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt';
-$lang['uploadexist'] = 'Fílan er longu til.';
-$lang['deletesucc'] = 'Fílan "%s" er nú strika.';
-$lang['deletefail'] = '"%s" kundi ikki strikast - kanna rættindini.';
-$lang['mediainuse'] = 'Fíla "%s" er ikki strika - hen verður enn nýtt.';
-$lang['namespaces'] = 'Navnarúm';
-$lang['mediafiles'] = 'Atkomandi fílur í';
-
-$lang['reference'] = 'Ávísing til';
-$lang['ref_inuse'] = 'Fílan kan ikki strikast, síðan hon enn verður nýtt á fylgjandi síðum:';
-$lang['ref_hidden'] = 'Nakrar ávísingar eru í skjølum sum tú ikki hevur lesi rættindi til';
-
-$lang['hits'] = 'Hits';
-$lang['quickhits'] = 'Samsvarandi skjøl';
-$lang['toc'] = 'Innihaldsyvirlit';
-$lang['current'] = 'núverandi';
-$lang['yours'] = 'Tín útgáva';
-$lang['diff'] = 'vís broytingar í mun til núverandi útgávu';
-$lang['line'] = 'Linja';
-$lang['breadcrumb'] = 'Leið';
-$lang['youarehere'] = 'Tú ert her';
-$lang['lastmod'] = 'Seinast broytt';
-$lang['by'] = 'av';
-$lang['deleted'] = 'strika';
-$lang['created'] = 'stovna';
-$lang['restored'] = 'gomul útgáva endurstovna';
-$lang['summary'] = 'Samandráttur';
-
-$lang['mail_newpage'] = 'skjal skoyta uppí:';
-$lang['mail_changed'] = 'skjal broytt:';
-
-$lang['js']['nosmblinks'] = "Ávísingar til Windows shares virka bert í Microsoft Internet Explorer.\nTú kanst enn avrita og sata inn slóðina.";
-
-$lang['qb_bold'] = 'Feit';
-$lang['qb_italic'] = 'Skák';
-$lang['qb_underl'] = 'Undurstrika';
-$lang['qb_code'] = 'Skrivimaskinu tekstur';
-$lang['qb_strike'] = 'Gjøgnumstrika';
-$lang['qb_h1'] = 'Stig 1 yvirskrift';
-$lang['qb_h2'] = 'Stig 2 yvirskrift';
-$lang['qb_h3'] = 'Stig 3 yvirskrift';
-$lang['qb_h4'] = 'Stig 4 yvirskrift';
-$lang['qb_h5'] = 'Stig 5 yvirskrift';
-$lang['qb_link'] = 'Innanhýsis slóð';
-$lang['qb_extlink'] = 'Útvortis slóð';
-$lang['qb_hr'] = 'Vatnrætt linja';
-$lang['qb_ol'] = 'Talmerktur listi';
-$lang['qb_ul'] = 'Ótalmerktur listi';
-$lang['qb_media'] = 'Leggja myndir og aðrar fílur afturat';
-$lang['qb_sig'] = 'Set inn undirskrift';
-$lang['qb_smileys'] = 'Smileys';
-$lang['qb_chars'] = 'Sertekn';
-
-$lang['js']['del_confirm']= 'Strika post(ar)?';
-$lang['admin_register']= 'Upprætta nýggjan brúkara';
-
-$lang['metaedit'] = 'Rætta metadáta';
-$lang['metasaveerr'] = 'Brek við skriving av metadáta';
-$lang['metasaveok'] = 'Metadáta goymt';
-$lang['img_backto'] = 'Aftur til';
-$lang['img_title'] = 'Heitið';
-$lang['img_caption'] = 'Myndatekstur';
-$lang['img_date'] = 'Dato';
-$lang['img_fname'] = 'Fílunavn';
-$lang['img_fsize'] = 'Stødd';
-$lang['img_artist'] = 'Myndafólk';
-$lang['img_copyr'] = 'Upphavsrættur';
-$lang['img_format'] = 'Snið';
-$lang['img_camera'] = 'Fototól';
-$lang['img_keywords']= 'Evnisorð';
-
-$lang['subscribe_success'] = 'Skoyt %s uppí tilmeldulistan fyri %s';
-$lang['subscribe_error'] = 'Brek við uppí skoyting av %s til tilmeldulistan fyri %s';
-$lang['subscribe_noaddress']= 'Ongin adressa er knýtt at tíni inn ritan, tú kanst ikki skoytast uppí tilmeldulistan';
-$lang['unsubscribe_success']= 'Strika %s frá tilmeldulistan fyri %s';
-$lang['unsubscribe_error'] = 'Brek við burturtøku av %s frá tilmeldulista fyri %s';
-
-/* auth.class language support */
-$lang['authmodfailed'] = 'Brek við validering av brúkarasamansetingv. Fá samband við umboðsstjóran á hesi wiki.';
-$lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['doublequoteopening'] = 'Vanligt gásareygað byrjan';
+$lang['doublequoteclosing'] = 'Vanligt gásareygað endi';
+$lang['singlequoteopening'] = 'Einstakt gásareygað byrjan';
+$lang['singlequoteclosing'] = 'Einstakt gásareygað endi';
+$lang['apostrophe'] = 'Apostroff';
+$lang['btn_edit'] = 'Rætta hetta skjal';
+$lang['btn_source'] = 'Vís keldu';
+$lang['btn_show'] = 'Vís skjal';
+$lang['btn_create'] = 'Býrja uppá hetta skjal';
+$lang['btn_search'] = 'Leita';
+$lang['btn_save'] = 'Goym';
+$lang['btn_preview'] = 'Forskoðan';
+$lang['btn_top'] = 'Aftur til toppin';
+$lang['btn_newer'] = '<< undan síða';
+$lang['btn_older'] = 'næsta síðe >>';
+$lang['btn_revs'] = 'Gamlar útgávur';
+$lang['btn_recent'] = 'Nýggj broyting';
+$lang['btn_upload'] = 'Legg fílu upp';
+$lang['btn_cancel'] = 'Angra';
+$lang['btn_index'] = 'Evnisyvirlit';
+$lang['btn_secedit'] = 'Rætta';
+$lang['btn_login'] = 'Rita inn';
+$lang['btn_logout'] = 'Rita út';
+$lang['btn_admin'] = 'Admin';
+$lang['btn_update'] = 'Dagfør';
+$lang['btn_delete'] = 'Strika';
+$lang['btn_back'] = 'Aftur';
+$lang['btn_backlink'] = 'Ávísingar afturúr';
+$lang['btn_backtomedia'] = 'Aftur til val av miðlafílu';
+$lang['btn_subscribe'] = 'Tilmelda broytingar';
+$lang['btn_profile'] = 'Dagføra vangamynd';
+$lang['btn_reset'] = 'Nullstilla';
+$lang['btn_resendpwd'] = 'Send nýtt loyniorð';
+$lang['btn_draft'] = 'Broyt kladdu';
+$lang['btn_recover'] = 'Endurbygg kladdu';
+$lang['btn_draftdel'] = 'Sletta';
+$lang['btn_revert'] = 'Endurbygg';
+$lang['loggedinas'] = 'Ritavur inn sum';
+$lang['user'] = 'Brúkaranavn';
+$lang['pass'] = 'Loyniorð';
+$lang['newpass'] = 'Nýtt loyniorð';
+$lang['oldpass'] = 'Vátta núverandi loyniorð';
+$lang['passchk'] = 'Endurtak nýtt loyniorð';
+$lang['remember'] = 'Minst til loyniorðið hjá mær';
+$lang['fullname'] = 'Navn';
+$lang['email'] = 'T-postur';
+$lang['register'] = 'Melda til';
+$lang['profile'] = 'Brúkara vangamynd';
+$lang['badlogin'] = 'Skeivt brúkaranavn ella loyniorð.';
+$lang['minoredit'] = 'Smærri broytingar';
+$lang['draftdate'] = 'Goym kladdu sett frá';
+$lang['nosecedit'] = 'Hendan síðan var broytt undir tilevnan, brotið var ikki rætt dagfest, heintaði fulla síðu í staðin';
+$lang['regmissing'] = 'Tú skalt fylla út øll øki.';
+$lang['reguexists'] = 'Hetta brúkaranavn er upptiki.';
+$lang['regsuccess'] = 'Tú ert nú stovnavur sum brúkari. Títt loyniorð verður sent til tín í einum T-posti.';
+$lang['regsuccess2'] = 'Tú ert nú stovnavur sum brúkari.';
+$lang['regmailfail'] = 'Títt loyniorð bleiv ikki sent. Fá vinarliga samband við administratorin.';
+$lang['regbadmail'] = 'T-post adressan er ógildig. Fá vinarliga samband við administratorin, um tú heldur at hetta er eitt brek.';
+$lang['regbadpass'] = 'Bæði loyniorðini eru ikki eins, royn vinarliga umaftur.';
+$lang['regpwmail'] = 'Títt DokuWiki loyniorð';
+$lang['reghere'] = 'Upprætta eina DokuWiki-konto her';
+$lang['profna'] = 'Tað er ikki møguligt at broyta tína vangamynd í hesu wiki';
+$lang['profnochange'] = 'Ongar broytingar, onki tillaga.';
+$lang['profnoempty'] = 'Tómt navn ella t-post adressa er ikki loyvt.';
+$lang['profchanged'] = 'Brúkara vangamynd dagført rætt.';
+$lang['pwdforget'] = 'Gloymt títt loyniorð? Fá eitt nýtt';
+$lang['resendna'] = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.';
+$lang['resendpwd'] = 'Send nýtt loyniorð til';
+$lang['resendpwdmissing'] = 'Tú skal filla út øll økir.';
+$lang['resendpwdnouser'] = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.';
+$lang['resendpwdbadauth'] = 'Hald til góðar, hendan góðkenningar kodan er ikki gildug. Kanna eftir at tú nýtti tað fulfíggjaðu góðkenningarleinkjuna';
+$lang['resendpwdconfirm'] = 'Ein góðkenningarleinkja er send við e-posti';
+$lang['resendpwdsuccess'] = 'Títt nýggja loyniorð er sent við t-posti.';
+$lang['license'] = 'Um ikki annað er tilskilað, so er tilfar á hesari wiki loyvt margfaldað undir fylgjandi treytum:';
+$lang['licenseok'] = 'Legg til merkis: Við at dagføra hesa síðu samtykkir tú at loyva margfalding av tilfarinum undir fylgjandi treytum:';
+$lang['searchmedia'] = 'Leita eftir fíl navn:';
+$lang['searchmedia_in'] = 'Leita í %s';
+$lang['txt_upload'] = 'Vel tí fílu sum skal leggjast upp';
+$lang['txt_filename'] = 'Sláa inn wikinavn (valfrítt)';
+$lang['txt_overwrt'] = 'Yvurskriva verandi fílu';
+$lang['lockedby'] = 'Fyribils læst av';
+$lang['lockexpire'] = 'Lásið ferð úr gildi kl.';
+$lang['willexpire'] = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
+$lang['js']['notsavedyet'] = 'Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.
+Ynskir tú at halda fram?';
+$lang['js']['searchmedia'] = 'Leita eftir dátufílum';
+$lang['js']['mediasize'] = 'Mynda stødd';
+$lang['js']['mediatarget'] = 'Leinkja til';
+$lang['js']['mediaclose'] = 'Læt aftur';
+$lang['js']['mediainsert'] = 'Set inn';
+$lang['js']['mediadisplayimg'] = 'Vís myndina';
+$lang['js']['mediadisplaylnk'] = 'Vís bert leinkjuna';
+$lang['js']['nosmblinks'] = 'Ávísingar til Windows shares virka bert í Microsoft Internet Explorer.
+Tú kanst enn avrita og sata inn slóðina.';
+$lang['js']['del_confirm'] = 'Strika post(ar)?';
+$lang['rssfailed'] = 'Eitt brek koma fyri tá roynt var at fáa: ';
+$lang['nothingfound'] = 'Leiting gav onki úrslit.';
+$lang['mediaselect'] = 'Vel miðlafílu';
+$lang['fileupload'] = 'Legg miðla fílu upp';
+$lang['uploadsucc'] = 'Upp legg av fílu var væl eydna';
+$lang['uploadfail'] = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum';
+$lang['uploadwrong'] = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt';
+$lang['uploadexist'] = 'Fílan er longu til.';
+$lang['deletesucc'] = 'Fílan "%s" er nú strika.';
+$lang['deletefail'] = '"%s" kundi ikki strikast - kanna rættindini.';
+$lang['mediainuse'] = 'Fíla "%s" er ikki strika - hen verður enn nýtt.';
+$lang['namespaces'] = 'Navnarúm';
+$lang['mediafiles'] = 'Atkomandi fílur í';
+$lang['reference'] = 'Ávísing til';
+$lang['ref_inuse'] = 'Fílan kan ikki strikast, síðan hon enn verður nýtt á fylgjandi síðum:';
+$lang['ref_hidden'] = 'Nakrar ávísingar eru í skjølum sum tú ikki hevur lesi rættindi til';
+$lang['hits'] = 'Hits';
+$lang['quickhits'] = 'Samsvarandi skjøl';
+$lang['toc'] = 'Innihaldsyvirlit';
+$lang['current'] = 'núverandi';
+$lang['yours'] = 'Tín útgáva';
+$lang['diff'] = 'vís broytingar í mun til núverandi útgávu';
+$lang['line'] = 'Linja';
+$lang['breadcrumb'] = 'Leið';
+$lang['youarehere'] = 'Tú ert her';
+$lang['lastmod'] = 'Seinast broytt';
+$lang['by'] = 'av';
+$lang['deleted'] = 'strika';
+$lang['created'] = 'stovna';
+$lang['restored'] = 'gomul útgáva endurstovna';
+$lang['summary'] = 'Samandráttur';
+$lang['mail_newpage'] = 'skjal skoyta uppí:';
+$lang['mail_changed'] = 'skjal broytt:';
+$lang['qb_bold'] = 'Feit';
+$lang['qb_italic'] = 'Skák';
+$lang['qb_underl'] = 'Undurstrika';
+$lang['qb_code'] = 'Skrivimaskinu tekstur';
+$lang['qb_strike'] = 'Gjøgnumstrika';
+$lang['qb_h1'] = 'Stig 1 yvirskrift';
+$lang['qb_h2'] = 'Stig 2 yvirskrift';
+$lang['qb_h3'] = 'Stig 3 yvirskrift';
+$lang['qb_h4'] = 'Stig 4 yvirskrift';
+$lang['qb_h5'] = 'Stig 5 yvirskrift';
+$lang['qb_link'] = 'Innanhýsis slóð';
+$lang['qb_extlink'] = 'Útvortis slóð';
+$lang['qb_hr'] = 'Vatnrætt linja';
+$lang['qb_ol'] = 'Talmerktur listi';
+$lang['qb_ul'] = 'Ótalmerktur listi';
+$lang['qb_media'] = 'Leggja myndir og aðrar fílur afturat';
+$lang['qb_sig'] = 'Set inn undirskrift';
+$lang['qb_smileys'] = 'Smileys';
+$lang['qb_chars'] = 'Sertekn';
+$lang['admin_register'] = 'Upprætta nýggjan brúkara';
+$lang['metaedit'] = 'Rætta metadáta';
+$lang['metasaveerr'] = 'Brek við skriving av metadáta';
+$lang['metasaveok'] = 'Metadáta goymt';
+$lang['img_backto'] = 'Aftur til';
+$lang['img_title'] = 'Heitið';
+$lang['img_caption'] = 'Myndatekstur';
+$lang['img_date'] = 'Dato';
+$lang['img_fname'] = 'Fílunavn';
+$lang['img_fsize'] = 'Stødd';
+$lang['img_artist'] = 'Myndafólk';
+$lang['img_copyr'] = 'Upphavsrættur';
+$lang['img_format'] = 'Snið';
+$lang['img_camera'] = 'Fototól';
+$lang['img_keywords'] = 'Evnisorð';
+$lang['authmodfailed'] = 'Brek við validering av brúkarasamansetingv. Fá samband við umboðsstjóran á hesi wiki.';
+$lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.';
diff --git a/inc/lang/fo/subscr_digest.txt b/inc/lang/fo/subscr_digest.txt
new file mode 100644
index 000000000..3d9f097ad
--- /dev/null
+++ b/inc/lang/fo/subscr_digest.txt
@@ -0,0 +1,20 @@
+Halló!
+
+Síðan @PAGE@ í @TITLE@ wiki er broytt.
+Her eru broytinganar:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Gamla skjalið: @OLDPAGE@
+Nýggja skjalið: @NEWPAGE@
+
+Fyri at avmelda síðu kunngerðir, logga inn í wikiina á
+@DOKUWIKIURL@ vitja so
+@SUBSCRIBE@
+og avmelda hald á síðu og/ella navnaøkis broytingar.
+
+--
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index b1783008b..c6d8ca438 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -142,6 +142,7 @@ $lang['deletefail'] = '"%s" nie je možné zmazať - skontrolujte opr
$lang['mediainuse'] = 'Súbor "%s" nebol zmazaný - je stále používaný.';
$lang['namespaces'] = 'Menné priestory';
$lang['mediafiles'] = 'Dostupné súbory';
+$lang['accessdenied'] = 'Nemáte oprávnenie na zobrazenie požadovanej stránky.';
$lang['mediausage'] = 'Pre odkázanie na súbor použite nasledujúcu syntax:';
$lang['mediaview'] = 'Zobraziť pôvodný súbor';
$lang['mediaroot'] = 'root';
@@ -157,6 +158,7 @@ $lang['current'] = 'aktuálne';
$lang['yours'] = 'Vaša verzia';
$lang['diff'] = 'Zobraziť rozdiely voči aktuálnej verzii';
$lang['diff2'] = 'Zobraziť rozdiely medzi vybranými verziami';
+$lang['difflink'] = 'Odkaz na tento prehľad zmien';
$lang['line'] = 'Riadok';
$lang['breadcrumb'] = 'História';
$lang['youarehere'] = 'Nachádzate sa';
@@ -253,6 +255,7 @@ $lang['i_pol0'] = 'Otvorená Wiki (čítanie, zápis a nahrávani
$lang['i_pol1'] = 'Verejná Wiki (čítanie pre každého, zápis a nahrávanie pre registrovaných užívateľov)';
$lang['i_pol2'] = 'Uzatvorená Wiki (čítanie, zápis a nahrávanie len pre registrovaných užívateľov)';
$lang['i_retry'] = 'Skúsiť znovu';
+$lang['i_license'] = 'Vyberte licenciu, pod ktorou chcete uložiť váš obsah:';
$lang['mu_intro'] = 'Na tomto mieste môžete nahrávať viac súborov súčasne. Tlačidlom Prehľadávať pridáte súbory do zoznamu. Tlačidlom Nahrať vykonáte prenos súborov.';
$lang['mu_gridname'] = 'Názov súboru';
$lang['mu_gridsize'] = 'Veľkosť';
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 0b8b79254..acca3f5a1 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1543,14 +1543,12 @@ class Doku_Handler_Block {
// Process blocks which are stack like... (contain linefeeds)
if ( in_array($cname,$this->stackOpen ) && (!$plugin || $plugin_open) ) {
- $this->calls[] = $call;
-
// Hack - footnotes shouldn't immediately contain a p_open
- if ( $cname != 'footnote_open' ) {
- $this->addToStack();
- } else {
- $this->addToStack(false);
+ if ($this->addToStack($cname != 'footnote_open')) {
+ $this->closeParagraph($call[2]);
}
+ $this->calls[] = $call;
+
continue;
}
@@ -1560,7 +1558,9 @@ class Doku_Handler_Block {
$this->closeParagraph($call[2]);
}
$this->calls[] = $call;
- $this->removeFromStack();
+ if ($this->removeFromStack()) {
+ $this->calls[] = array('p_open',array(), $call[2]);
+ }
continue;
}
@@ -1676,16 +1676,25 @@ class Doku_Handler_Block {
return $this->calls;
}
+ /**
+ *
+ * @return bool true when a p_close() is required
+ */
function addToStack($newStart = true) {
+ $ret = $this->inParagraph;
$this->blockStack[] = array($this->atStart, $this->inParagraph);
$this->atStart = $newStart;
$this->inParagraph = false;
+
+ return $ret;
}
function removeFromStack() {
$state = array_pop($this->blockStack);
$this->atStart = $state[0];
$this->inParagraph = $state[1];
+
+ return $this->inParagraph;
}
function addCall($call) {
diff --git a/inc/template.php b/inc/template.php
index 595c5fc03..f7c104cdb 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -793,75 +793,75 @@ function tpl_userinfo(){
global $INFO;
if(isset($_SERVER['REMOTE_USER'])){
print $lang['loggedinas'].': '.$INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')';
- return true;
- }
- return false;
- }
+ return true;
+ }
+ return false;
+}
- /**
- * Print some info about the current page
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- */
- function tpl_pageinfo($ret=false){
- global $conf;
- global $lang;
- global $INFO;
- global $ID;
-
- // return if we are not allowed to view the page
- if (!auth_quickaclcheck($ID)) { return false; }
-
- // prepare date and path
- $fn = $INFO['filepath'];
- if(!$conf['fullpath']){
- if($INFO['rev']){
- $fn = str_replace(fullpath($conf['olddir']).'/','',$fn);
- }else{
- $fn = str_replace(fullpath($conf['datadir']).'/','',$fn);
- }
- }
- $fn = utf8_decodeFN($fn);
- $date = dformat($INFO['lastmod']);
-
- // print it
- if($INFO['exists']){
- $out = '';
- $out .= $fn;
- $out .= ' &middot; ';
- $out .= $lang['lastmod'];
- $out .= ': ';
- $out .= $date;
- if($INFO['editor']){
- $out .= ' '.$lang['by'].' ';
- $out .= editorinfo($INFO['editor']);
- }else{
- $out .= ' ('.$lang['external_edit'].')';
- }
- if($INFO['locked']){
- $out .= ' &middot; ';
- $out .= $lang['lockedby'];
- $out .= ': ';
- $out .= editorinfo($INFO['locked']);
- }
- if($ret){
- return $out;
- }else{
- echo $out;
- return true;
- }
- }
- return false;
- }
-
- /**
- * Prints or returns the name of the given page (current one if none given).
- *
- * If useheading is enabled this will use the first headline else
- * the given ID is used.
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- */
+/**
+ * Print some info about the current page
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_pageinfo($ret=false){
+ global $conf;
+ global $lang;
+ global $INFO;
+ global $ID;
+
+ // return if we are not allowed to view the page
+ if (!auth_quickaclcheck($ID)) { return false; }
+
+ // prepare date and path
+ $fn = $INFO['filepath'];
+ if(!$conf['fullpath']){
+ if($INFO['rev']){
+ $fn = str_replace(fullpath($conf['olddir']).'/','',$fn);
+ }else{
+ $fn = str_replace(fullpath($conf['datadir']).'/','',$fn);
+ }
+ }
+ $fn = utf8_decodeFN($fn);
+ $date = dformat($INFO['lastmod']);
+
+ // print it
+ if($INFO['exists']){
+ $out = '';
+ $out .= $fn;
+ $out .= ' &middot; ';
+ $out .= $lang['lastmod'];
+ $out .= ': ';
+ $out .= $date;
+ if($INFO['editor']){
+ $out .= ' '.$lang['by'].' ';
+ $out .= editorinfo($INFO['editor']);
+ }else{
+ $out .= ' ('.$lang['external_edit'].')';
+ }
+ if($INFO['locked']){
+ $out .= ' &middot; ';
+ $out .= $lang['lockedby'];
+ $out .= ': ';
+ $out .= editorinfo($INFO['locked']);
+ }
+ if($ret){
+ return $out;
+ }else{
+ echo $out;
+ return true;
+ }
+ }
+ return false;
+}
+
+/**
+ * Prints or returns the name of the given page (current one if none given).
+ *
+ * If useheading is enabled this will use the first headline else
+ * the given ID is used.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
function tpl_pagetitle($id=null, $ret=false){
global $conf;
if(is_null($id)){
@@ -1017,7 +1017,7 @@ function tpl_indexerWebBug(){
*/
function tpl_getConf($id){
global $conf;
- global $tpl_configloaded;
+ static $tpl_configloaded = false;
$tpl = $conf['template'];
@@ -1053,6 +1053,29 @@ function tpl_loadConfig(){
return $conf;
}
+// language methods
+/**
+ * tpl_getLang($id)
+ *
+ * use this function to access template language variables
+ */
+function tpl_getLang($id){
+ static $lang = array();
+
+ if (count($lang) === 0){
+ $path = DOKU_TPLINC.'lang/';
+
+ $lang = array();
+
+ global $conf; // definitely don't invoke "global $lang"
+ // don't include once
+ @include($path.'en/lang.php');
+ if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
+ }
+
+ return $lang[$id];
+}
+
/**
* prints the "main content" in the mediamanger popup
*
diff --git a/inc/utf8.php b/inc/utf8.php
index 47e7ed61f..3d4de2289 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -23,7 +23,7 @@ if(!function_exists('utf8_isASCII')){
/**
* Checks if a string contains 7bit ASCII only
*
- * @author Andreas Haerter <netzmeister@andreas-haerter.de>
+ * @author Andreas Haerter <andreas.haerter@dev.mail-node.com>
*/
function utf8_isASCII($str){
return (preg_match('/(?:[^\x00-\x7F])/', $str) !== 1);
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 533b8f91c..e9c59ca5d 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -136,7 +136,7 @@ function ajax_lock(){
if(!$client) $client = clientIP(true);
$draft = array('id' => $id,
- 'prefix' => $_POST['prefix'],
+ 'prefix' => substr($_POST['prefix'], 0, -1),
'text' => $_POST['wikitext'],
'suffix' => $_POST['suffix'],
'date' => (int) $_POST['date'],
diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php
index 7b94f26d0..c3b15a842 100644
--- a/lib/plugins/config/lang/sk/lang.php
+++ b/lib/plugins/config/lang/sk/lang.php
@@ -134,6 +134,7 @@ $lang['proxy____port'] = 'Proxy server - port';
$lang['proxy____user'] = 'Proxy server - užívateľské meno';
$lang['proxy____pass'] = 'Proxy server - heslo';
$lang['proxy____ssl'] = 'Proxy server - použiť SSL';
+$lang['proxy____except'] = 'Regulárny výraz popisujúci URL odkazy, pre ktoré by proxy nemala byť použitá.';
$lang['safemodehack'] = 'Povoliť "safemode hack"';
$lang['ftp____host'] = 'FTP server pre "safemode hack"';
$lang['ftp____port'] = 'FTP port pre "safemode hack"';
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index c72beafdb..71ea40799 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -13,7 +13,7 @@ if(!defined('DOKU_INC')) die();
* need to inherit from this class
*/
class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
- var $version = '2008-02-20';
+ var $version = '2010-09-17';
/**
@@ -26,7 +26,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
'date' => $this->version,
'name' => 'Popularity Feedback Plugin',
'desc' => 'Send anonymous data about your wiki to the developers.',
- 'url' => 'http://dokuwiki.org/plugin:popularity',
+ 'url' => 'http://www.dokuwiki.org/plugin:popularity',
);
}
@@ -114,6 +114,8 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
$data['page_size'] = $list['file_size'];
$data['page_biggest'] = $list['file_max'];
$data['page_smallest'] = $list['file_min'];
+ $data['page_nscount'] = $list['dir_count'];
+ $data['page_nsnest'] = $list['dir_nest'];
if($list['file_count']) $data['page_avg'] = $list['file_size'] / $list['file_count'];
$data['page_oldest'] = $list['file_oldest'];
unset($list);
@@ -125,6 +127,8 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
$data['media_size'] = $list['file_size'];
$data['media_biggest'] = $list['file_max'];
$data['media_smallest'] = $list['file_min'];
+ $data['media_nscount'] = $list['dir_count'];
+ $data['media_nsnest'] = $list['dir_nest'];
if($list['file_count']) $data['media_avg'] = $list['file_size'] / $list['file_count'];
unset($list);
@@ -209,6 +213,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
function _search_count(&$data,$base,$file,$type,$lvl,$opts){
// traverse
if($type == 'd'){
+ if($data['dir_nest'] < $lvl) $data['dir_nest'] = $lvl;
$data['dir_count']++;
return true;
}
@@ -223,6 +228,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
if($data['file_max'] < $size) $data['file_max'] = $size;
if(!isset($data['file_oldest']) || $data['file_oldest'] > $date) $data['file_oldest'] = $date;
}
+
return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 10:52:59 +0000