Screenshot instructions:
Windows
Mac
Red Hat Linux
Ubuntu
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)
You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
S | M | T | W | T | F | S |
---|---|---|---|---|---|---|
|
1
(31) |
2
(28) |
3
(3) |
4
(1) |
5
(6) |
6
(2) |
7
|
8
(2) |
9
(1) |
10
(4) |
11
(9) |
12
(1) |
13
(1) |
14
|
15
(1) |
16
(1) |
17
|
18
|
19
|
20
|
21
|
22
|
23
|
24
|
25
|
26
(5) |
27
|
28
|
29
|
30
|
31
|
|
|
|
From: <vargenau@us...> - 2012-10-26 13:42:36
|
Revision: 8422 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8422&view=rev Author: vargenau Date: 2012-10-26 13:42:26 +0000 (Fri, 26 Oct 2012) Log Message: ----------- Remove useless blank lines Modified Paths: -------------- trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AsciiMath.php Modified: trunk/lib/RssWriter2.php =================================================================== --- trunk/lib/RssWriter2.php 2012-10-26 13:41:02 UTC (rev 8421) +++ trunk/lib/RssWriter2.php 2012-10-26 13:42:26 UTC (rev 8422) @@ -78,8 +78,6 @@ } } - - // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2012-10-26 13:41:02 UTC (rev 8421) +++ trunk/lib/SemanticWeb.php 2012-10-26 13:42:26 UTC (rev 8422) @@ -105,7 +105,6 @@ require_once 'lib/TextSearchQuery.php'; require_once 'lib/Units.php'; - /** * RdfWriter - A class to represent the links of a list of wikipages as RDF. * Supports ?format=rdf @@ -241,8 +240,6 @@ { } - - /** * OwlWriter - A class to represent a set of wiki pages (a DL model) as OWL. * Requires an actionpage returning a pagelist. @@ -256,8 +253,6 @@ { } - - /** * ModelWriter - Export a KB as set of wiki pages. * Requires an actionpage returning a pagelist. @@ -271,8 +266,6 @@ { } - - /** * NumericSearchQuery can do: * ("population < 20000 and area > 1000000", array("population", "area")) @@ -414,26 +407,18 @@ } } - - class ReasonerBackend_LISA extends ReasonerBackend { } - - class ReasonerBackend_Racer extends ReasonerBackend { } - - class ReasonerBackend_KM extends ReasonerBackend { } - - // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2012-10-26 13:41:02 UTC (rev 8421) +++ trunk/lib/plugin/AllPages.php 2012-10-26 13:42:26 UTC (rev 8422) @@ -147,8 +147,6 @@ } } - - // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-10-26 13:41:02 UTC (rev 8421) +++ trunk/lib/plugin/AsciiMath.php 2012-10-26 13:42:26 UTC (rev 8422) @@ -82,8 +82,6 @@ } } - - // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-26 13:41:14
|
Revision: 8421 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8421&view=rev Author: vargenau Date: 2012-10-26 13:41:02 +0000 (Fri, 26 Oct 2012) Log Message: ----------- elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words. Modified Paths: -------------- trunk/lib/plugin/Calendar.php trunk/lib/plugin/RedirectTo.php Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2012-10-26 13:14:46 UTC (rev 8420) +++ trunk/lib/plugin/Calendar.php 2012-10-26 13:41:02 UTC (rev 8421) @@ -150,7 +150,7 @@ if ($mday == $this->_today) { $mday = HTML::strong($mday); $td->setAttr('class', 'cal-today'); - } else if ($dbi->isWikiPage($page_for_date)) { + } elseif ($dbi->isWikiPage($page_for_date)) { $this->_links[] = $page_for_date; $td->setAttr('class', 'cal-day'); } Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-10-26 13:14:46 UTC (rev 8420) +++ trunk/lib/plugin/RedirectTo.php 2012-10-26 13:41:02 UTC (rev 8421) @@ -75,7 +75,7 @@ if (!$thispage->get('locked')) { return $this->disabled(_("Redirect to an external URL is only allowed in locked pages.")); } - } else if ($page) { + } elseif ($page) { $url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename')), 'abs_path'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-26 13:14:52
|
Revision: 8420 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8420&view=rev Author: vargenau Date: 2012-10-26 13:14:46 +0000 (Fri, 26 Oct 2012) Log Message: ----------- elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words. Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/lib/wikilens/Buddy.php trunk/lib/ziplib.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2012-10-26 13:07:18 UTC (rev 8419) +++ trunk/lib/WikiTheme.php 2012-10-26 13:14:46 UTC (rev 8420) @@ -266,7 +266,7 @@ } if (isset($this->_default_theme)) { return $this->_default_theme->_findFile($file, $missing_okay); - } else if (!$missing_okay) { + } elseif (!$missing_okay) { trigger_error("$this->_theme/$file: not found", E_USER_NOTICE); if (DEBUG & _DEBUG_TRACE) { echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n"; @@ -1691,8 +1691,6 @@ } - - /** * A class representing a clickable "button". * @@ -1735,9 +1733,6 @@ } - - - /** * A clickable image button. */ @@ -1771,8 +1766,6 @@ } } - - /** * A class representing a form <samp>submit</samp> button. */ @@ -1801,8 +1794,6 @@ } - - /** * A class representing an image form <samp>submit</samp> button. */ @@ -1834,8 +1825,6 @@ } - - /** * A sidebar box with title and body, narrow fixed-width. * To represent abbrevated content of plugins, links or forms, Modified: trunk/lib/wikilens/Buddy.php =================================================================== --- trunk/lib/wikilens/Buddy.php 2012-10-26 13:07:18 UTC (rev 8419) +++ trunk/lib/wikilens/Buddy.php 2012-10-26 13:14:46 UTC (rev 8420) @@ -90,9 +90,9 @@ $buddy_rating = $buddy_rating_array['ratingvalue']; if ($buddy_rating == "") { $agree = 1; - } else if ($agreePos && $buddy_rating >= $MIDDLE_RATING) { + } elseif ($agreePos && $buddy_rating >= $MIDDLE_RATING) { $agree = 1; - } else if (!$agreePos && $buddy_rating < $MIDDLE_RATING) { + } elseif (!$agreePos && $buddy_rating < $MIDDLE_RATING) { $agree = 1; } else { $agree = 0; @@ -101,7 +101,7 @@ } if ($agree && $agreePos) { return 1; - } else if ($agree && !$agreePos) { + } elseif ($agree && !$agreePos) { return -1; } else { return 0; Modified: trunk/lib/ziplib.php =================================================================== --- trunk/lib/ziplib.php 2012-10-26 13:07:18 UTC (rev 8419) +++ trunk/lib/ziplib.php 2012-10-26 13:14:46 UTC (rev 8420) @@ -492,7 +492,7 @@ if ($comp_type == ZIP_DEFLATE) { $data = zip_inflate($data, $crc32, $uncomp_size); - } else if ($comp_type == ZIP_STORE) { + } elseif ($comp_type == ZIP_STORE) { $crc = zip_crc32($data); if ($crc32 != $crc) ExitWiki(sprintf("CRC mismatch %x != %x", $crc, $crc32)); @@ -813,7 +813,7 @@ } if ("$type/$subtype" == 'multipart/mixed') { return ParseMimeMultipart($data, $params['boundary']); - } else if ("$type/$subtype" != 'application/x-phpwiki') { + } elseif ("$type/$subtype" != 'application/x-phpwiki') { trigger_error(sprintf("Bad %s", "content-type: $type/$subtype"), E_USER_WARNING); return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-26 13:07:29
|
Revision: 8419 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8419&view=rev Author: vargenau Date: 2012-10-26 13:07:18 +0000 (Fri, 26 Oct 2012) Log Message: ----------- elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words. Modified Paths: -------------- trunk/passencrypt.php Modified: trunk/passencrypt.php =================================================================== --- trunk/passencrypt.php 2012-10-26 13:05:03 UTC (rev 8418) +++ trunk/passencrypt.php 2012-10-26 13:07:18 UTC (rev 8419) @@ -143,7 +143,7 @@ echo "<p>The encrypted password is:<br />\n<br /> \n<tt><strong>", htmlentities($encrypted_password), "</strong></tt></p>\n"; echo "<hr />\n"; -} else if ($posted['password'] != "") { +} elseif ($posted['password'] != "") { echo "The passwords did not match. Please try again.<br />\n"; } if (empty($REQUEST_URI)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-26 13:05:09
|
Revision: 8418 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8418&view=rev Author: vargenau Date: 2012-10-26 13:05:03 +0000 (Fri, 26 Oct 2012) Log Message: ----------- include [all] Include and file path should be devided with single space. File path should not be placed under brackets. Modified Paths: -------------- trunk/themes/MacOSX/buttons/index.php Modified: trunk/themes/MacOSX/buttons/index.php =================================================================== --- trunk/themes/MacOSX/buttons/index.php 2012-10-16 08:03:36 UTC (rev 8417) +++ trunk/themes/MacOSX/buttons/index.php 2012-10-26 13:05:03 UTC (rev 8418) @@ -1,2 +1,2 @@ <?php -include("../images/index.php"); +include '../images/index.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-16 08:03:46
|
Revision: 8417 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8417&view=rev Author: vargenau Date: 2012-10-16 08:03:36 +0000 (Tue, 16 Oct 2012) Log Message: ----------- Always return string Modified Paths: -------------- trunk/lib/config.php Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2012-10-15 22:53:54 UTC (rev 8416) +++ trunk/lib/config.php 2012-10-16 08:03:36 UTC (rev 8417) @@ -238,7 +238,9 @@ // [99ms] function update_locale($loc) { - if ($loc == 'C' or $loc == 'en') return; + if ($loc == 'C' or $loc == 'en') { + return ''; + } // $LANG or DEFAULT_LANGUAGE is too less information, at least on unix for // setlocale(), for bindtextdomain() to succeed. $setlocale = guessing_setlocale(LC_ALL, $loc); // [56ms] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rurban@us...> - 2012-10-15 22:54:00
|
Revision: 8416 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8416&view=rev Author: rurban Date: 2012-10-15 22:53:54 +0000 (Mon, 15 Oct 2012) Log Message: ----------- lib/config.php:152 strchr warning, use strpos instead. Modified Paths: -------------- trunk/lib/config.php Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2012-10-11 12:56:58 UTC (rev 8415) +++ trunk/lib/config.php 2012-10-15 22:53:54 UTC (rev 8416) @@ -154,7 +154,7 @@ return $lang_short; } } - if ($pos = strchr($lang, "-") and in_array(substr($lang, 0, $pos), $languages)) + if ($pos = strpos($lang, "-") and in_array(substr($lang, 0, $pos), $languages)) return substr($lang, 0, $pos); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 12:57:10
|
Revision: 8415 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8415&view=rev Author: vargenau Date: 2012-10-11 12:56:58 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Remove redundant tags Modified Paths: -------------- trunk/lib/nusoap/nusoap.php Modified: trunk/lib/nusoap/nusoap.php =================================================================== --- trunk/lib/nusoap/nusoap.php 2012-10-11 12:35:13 UTC (rev 8414) +++ trunk/lib/nusoap/nusoap.php 2012-10-11 12:56:58 UTC (rev 8415) @@ -510,8 +510,6 @@ } } -?><?php - /** * soap_fault class, allows for creation of faults * mainly used for returning faults from deployed functions @@ -571,8 +569,6 @@ } } -?><?php - /** * parses an XML Schema, allows access to it's data, other utility methods * no validation... yet. @@ -1254,8 +1250,6 @@ } } -?><?php - /** * for creating serializable abstractions of native PHP types * NOTE: this is only really used when WSDL is not available. @@ -1311,8 +1305,6 @@ } } -?><?php - /** * transport class for sending/receiving data via HTTP and HTTPS * NOTE: PHP must be compiled with the CURL extension for HTTPS support @@ -1549,7 +1541,6 @@ return $data; } - /** * send the SOAP message via HTTPS 1.0 using CURL * @@ -1775,7 +1766,6 @@ */ function decodeChunked($buffer) { - // length := 0 $length = 0; $new = ''; @@ -1824,8 +1814,6 @@ } -?><?php - /** * * soap_server allows the user to create a SOAP server @@ -2354,8 +2342,6 @@ } } -?><?php - /** * parses a WSDL file, allows access to it's data, other utility methods * @@ -3240,8 +3226,6 @@ } } -?><?php - /** * * soap_parser class parses SOAP XML messages into native PHP values @@ -3677,11 +3661,6 @@ } } - -?><?php - - - /** * * soapclient higher level class for easy usage. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 12:35:23
|
Revision: 8414 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8414&view=rev Author: vargenau Date: 2012-10-11 12:35:13 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Fix CSS style Modified Paths: -------------- trunk/lib/WikiDB/adodb/readme.htm Modified: trunk/lib/WikiDB/adodb/readme.htm =================================================================== --- trunk/lib/WikiDB/adodb/readme.htm 2012-10-11 12:11:16 UTC (rev 8413) +++ trunk/lib/WikiDB/adodb/readme.htm 2012-10-11 12:35:13 UTC (rev 8414) @@ -1,13 +1,15 @@ +<!DOCTYPE html> <html> <head> <title>ADODB Manual</title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <XSTYLE - body - ,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt} + <meta charset="UTF-8" /> + <style type="text/css"> + <!-- + body,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt} pre {font-size:9pt} .toplink {font-size:8pt} - /> + --> + </style> </head> <body bgcolor="#FFFFFF"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 12:11:27
|
Revision: 8413 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8413&view=rev Author: vargenau Date: 2012-10-11 12:11:16 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Remove extra white lines Modified Paths: -------------- trunk/lib/diff3.php trunk/lib/imdb.php Modified: trunk/lib/diff3.php =================================================================== --- trunk/lib/diff3.php 2012-10-11 12:05:36 UTC (rev 8412) +++ trunk/lib/diff3.php 2012-10-11 12:11:16 UTC (rev 8413) @@ -114,8 +114,6 @@ } } - - class Diff3 { function Diff3($orig, $final1, $final2) Modified: trunk/lib/imdb.php =================================================================== --- trunk/lib/imdb.php 2012-10-11 12:05:36 UTC (rev 8412) +++ trunk/lib/imdb.php 2012-10-11 12:11:16 UTC (rev 8413) @@ -441,8 +441,6 @@ } - - // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 12:05:42
|
Revision: 8412 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8412&view=rev Author: vargenau Date: 2012-10-11 12:05:36 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Repair comment Modified Paths: -------------- trunk/configurator.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2012-10-11 11:52:26 UTC (rev 8411) +++ trunk/configurator.php 2012-10-11 12:05:36 UTC (rev 8412) @@ -222,8 +222,7 @@ --> </style> <script type="text/javascript"> - < - !-- + <!-- function update(accepted, error, value, output) { var msg = document.getElementById(output); if (accepted) { @@ -306,7 +305,7 @@ } } - -- > + // --> </script> </head> <body onload="do_init();"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 11:52:37
|
Revision: 8411 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8411&view=rev Author: vargenau Date: 2012-10-11 11:52:26 +0000 (Thu, 11 Oct 2012) Log Message: ----------- No empty line at end of file Modified Paths: -------------- trunk/lib/plugin/_GroupInfo.php Modified: trunk/lib/plugin/_GroupInfo.php =================================================================== --- trunk/lib/plugin/_GroupInfo.php 2012-10-11 09:32:21 UTC (rev 8410) +++ trunk/lib/plugin/_GroupInfo.php 2012-10-11 11:52:26 UTC (rev 8411) @@ -66,5 +66,3 @@ return $output; } } - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 09:32:31
|
Revision: 8410 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8410&view=rev Author: vargenau Date: 2012-10-11 09:32:21 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Remove useless semicolon Modified Paths: -------------- trunk/lib/HtmlElement.php trunk/lib/HtmlElement5.php trunk/lib/PageList.php trunk/lib/RssWriter.php trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/Template.php trunk/lib/TextSearchQuery.php trunk/lib/WikiDB.php trunk/lib/WikiPlugin.php trunk/lib/WikiTheme.php trunk/lib/XmlElement.php trunk/lib/diff3.php trunk/lib/imdb.php trunk/lib/stdlib.php Modified: trunk/lib/HtmlElement.php =================================================================== --- trunk/lib/HtmlElement.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/HtmlElement.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -125,8 +125,8 @@ } } -; + function HTML( /* $content, ... */) { return new XmlContent(func_get_args()); Modified: trunk/lib/HtmlElement5.php =================================================================== --- trunk/lib/HtmlElement5.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/HtmlElement5.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -125,8 +125,8 @@ } } -; + function HTML( /* $content, ... */) { return new XmlContent(func_get_args()); Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/PageList.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -176,8 +176,8 @@ } } -; + class _PageList_Column extends _PageList_Column_base { function _PageList_Column($field, $default_heading, $align = false) @@ -216,8 +216,8 @@ } } -; + /* overcome a call_user_func limitation by not being able to do: * call_user_func_array(array(&$class, $class_name), $params); * So we need $class = new $classname($params); @@ -289,8 +289,8 @@ } } -; + class _PageList_Column_checkbox extends _PageList_Column { function _PageList_Column_checkbox($field, $default_heading, $name = 'p') @@ -341,8 +341,8 @@ } } -; + class _PageList_Column_time extends _PageList_Column { function _PageList_Column_time($field, $default_heading) @@ -364,8 +364,8 @@ } } -; + class _PageList_Column_version extends _PageList_Column { function _getValue($page_handle, &$revision_handle) @@ -376,8 +376,8 @@ } } -; + // Output is hardcoded to limit of first 50 bytes. Otherwise // on very large Wikis this will fail if used with AllPages // (PHP memory limit exceeded) @@ -485,9 +485,9 @@ } } -; + class _PageList_Column_author extends _PageList_Column { function _PageList_Column_author($field, $default_heading, $align = false) @@ -511,8 +511,8 @@ } } -; + class _PageList_Column_owner extends _PageList_Column_author { function _getValue($page_handle, &$revision_handle) @@ -530,8 +530,8 @@ } } -; + class _PageList_Column_creator extends _PageList_Column_author { function _getValue($page_handle, &$revision_handle) @@ -549,8 +549,8 @@ } } -; + class _PageList_Column_pagename extends _PageList_Column_base { var $_field = 'pagename'; @@ -584,8 +584,8 @@ } } -; + class _PageList_Column_perm extends _PageList_Column { function _getValue($page_handle, &$revision_handle) @@ -597,8 +597,8 @@ } } -; + class _PageList_Column_acl extends _PageList_Column { function _getValue($page_handle, &$revision_handle) @@ -621,8 +621,8 @@ } } -; + class PageList { var $_group_rows = 3; @@ -1875,8 +1875,8 @@ } -; + /* List pages with checkboxes to select from. * The [Select] button toggles via Javascript flipAll */ Modified: trunk/lib/RssWriter.php =================================================================== --- trunk/lib/RssWriter.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/RssWriter.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -198,8 +198,8 @@ } } -; + /* Taken from mediawiki. * See http://www.atomenabled.org/developers/syndication/ */ Modified: trunk/lib/RssWriter2.php =================================================================== --- trunk/lib/RssWriter2.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/RssWriter2.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -78,8 +78,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/SemanticWeb.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -241,8 +241,8 @@ { } -; + /** * OwlWriter - A class to represent a set of wiki pages (a DL model) as OWL. * Requires an actionpage returning a pagelist. @@ -256,8 +256,8 @@ { } -; + /** * ModelWriter - Export a KB as set of wiki pages. * Requires an actionpage returning a pagelist. @@ -271,8 +271,8 @@ { } -; + /** * NumericSearchQuery can do: * ("population < 20000 and area > 1000000", array("population", "area")) @@ -414,26 +414,26 @@ } } -; + class ReasonerBackend_LISA extends ReasonerBackend { } -; + class ReasonerBackend_Racer extends ReasonerBackend { } -; + class ReasonerBackend_KM extends ReasonerBackend { } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/Template.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -224,8 +224,8 @@ } } -; + /** * Get a templates * Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/TextSearchQuery.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -404,8 +404,8 @@ } } -; + /** * A simple algebraic matcher for numeric attributes. * NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area")) Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/WikiDB.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -755,9 +755,9 @@ } } -; + /** * A base class which representing a wiki-page within a * WikiDB. @@ -1539,8 +1539,8 @@ } -; + /** * This class represents a specific revision of a WikiDB_Page within * a WikiDB. @@ -1888,9 +1888,9 @@ } } -; + /** * Class representing a sequence of WikiDB_Pages. * TODO: Enhance to php5 iterators @@ -2046,8 +2046,8 @@ } -; + /** * A class which represents a sequence of WikiDB_PageRevisions. * TODO: Enhance to php5 iterators @@ -2134,8 +2134,8 @@ } } -; + /** pseudo iterator */ class WikiDB_Array_PageIterator @@ -2431,8 +2431,8 @@ } } -; + function _sql_debuglog($msg, $newline = true, $shutdown = false) { static $fp = false; Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/WikiPlugin.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -554,8 +554,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/WikiTheme.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -1691,8 +1691,8 @@ } -; + /** * A class representing a clickable "button". * @@ -1735,9 +1735,9 @@ } -; + /** * A clickable image button. */ @@ -1771,8 +1771,8 @@ } } -; + /** * A class representing a form <samp>submit</samp> button. */ @@ -1801,8 +1801,8 @@ } -; + /** * A class representing an image form <samp>submit</samp> button. */ @@ -1834,8 +1834,8 @@ } -; + /** * A sidebar box with title and body, narrow fixed-width. * To represent abbrevated content of plugins, links or forms, Modified: trunk/lib/XmlElement.php =================================================================== --- trunk/lib/XmlElement.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/XmlElement.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -199,8 +199,8 @@ } } -; + /** * An XML element. * @@ -459,8 +459,8 @@ } -; + class RawXml { function RawXml($xml_text) Modified: trunk/lib/diff3.php =================================================================== --- trunk/lib/diff3.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/diff3.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -114,8 +114,8 @@ } } -; + class Diff3 { function Diff3($orig, $final1, $final2) Modified: trunk/lib/imdb.php =================================================================== --- trunk/lib/imdb.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/imdb.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -441,8 +441,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2012-10-11 09:24:50 UTC (rev 8409) +++ trunk/lib/stdlib.php 2012-10-11 09:32:21 UTC (rev 8410) @@ -1665,8 +1665,8 @@ } } -; + // File globbing // expands a list containing regex's to its matching entries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 09:25:03
|
Revision: 8409 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8409&view=rev Author: vargenau Date: 2012-10-11 09:24:50 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Remove useless semicolon Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AddComment.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -142,8 +142,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AllPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -147,8 +147,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AllUsers.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -111,8 +111,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AppendText.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -153,8 +153,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AsciiMath.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -82,8 +82,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AsciiSVG.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -87,8 +87,8 @@ } } -; + class AsciiSVG_HTML extends HtmlElement { function startTag() Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AuthorHistory.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -221,8 +221,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/BackLinks.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -176,8 +176,8 @@ } -; + // how many links from this backLink to other pages class _PageList_Column_BackLinks_count extends _PageList_Column { Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/BlogArchives.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -150,8 +150,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/BlogJournal.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -108,8 +108,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Calendar.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -246,8 +246,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CalendarList.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -226,8 +226,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CategoryPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -82,8 +82,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Chart.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -154,8 +154,8 @@ } } -; + class SVG_HTML extends HtmlElement { function startTag() Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Comment.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -60,8 +60,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CreateBib.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -158,8 +158,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CreatePage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -150,8 +150,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CreateToc.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -528,8 +528,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CurrentTime.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -85,8 +85,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/DeadEndPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -33,8 +33,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Diff.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -202,8 +202,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/DynamicIncludePage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -97,8 +97,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/EditMetaData.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -194,8 +194,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ExternalSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -154,8 +154,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FacebookLike.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -76,8 +76,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FileInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -351,8 +351,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FrameInclude.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -148,8 +148,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FullTextSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -153,8 +153,8 @@ } } -; + /* * List of Links and link to ListLinks */ Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FuzzyPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -200,8 +200,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GoTo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -88,8 +88,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GoogleMaps.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -157,8 +157,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GooglePlugin.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -126,8 +126,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GraphViz.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -464,8 +464,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/HelloWorld.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -72,8 +72,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Imdb.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -109,8 +109,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/IncludePage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -212,8 +212,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/IncludePages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -86,8 +86,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/InterWikiSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -64,8 +64,8 @@ } } -; + /** * @desc */ Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/JabberPresence.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -74,8 +74,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LdapSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -205,8 +205,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LikePages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -116,8 +116,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LinkDatabase.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -182,8 +182,8 @@ } } -; + class _PageList_Column_LinkDatabase_links extends _PageList_Column { function _getValue($page, &$revision_handle) Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LinkSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -165,8 +165,8 @@ } } -; + // FIXME: sortby errors with this column class _PageList_Column_LinkSearch_link extends _PageList_Column Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ListPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -132,8 +132,8 @@ } } -; + // how many back-/forwardlinks for this page class _PageList_Column_ListPages_count extends _PageList_Column { Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ListRelations.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -62,8 +62,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ListSubpages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -113,8 +113,8 @@ } } -; + // how many backlinks for this subpage class _PageList_Column_ListSubpages_count extends _PageList_Column { Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ModeratedPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -458,8 +458,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/MostPopular.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -102,8 +102,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/NewPagesPerUser.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -136,8 +136,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/NoCache.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -61,8 +61,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/OldStyleTable.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -153,8 +153,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/OrphanedPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -98,8 +98,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageDump.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -319,8 +319,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageGroup.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -203,8 +203,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageHistory.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -353,8 +353,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -71,8 +71,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageTrail.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -93,8 +93,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PasswordReset.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -195,8 +195,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PhotoAlbum.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -669,8 +669,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PhpHighlight.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -182,8 +182,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PhpWeather.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -197,8 +197,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Ploticus.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -301,8 +301,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PluginManager.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -186,8 +186,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PopUp.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -100,8 +100,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PopularNearby.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -151,8 +151,8 @@ } } -; + function cmp_by_hits($a, $b) { if ($a['hits'] == $b['hits']) return 0; Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PreferenceApp.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -310,8 +310,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Processing.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -86,8 +86,8 @@ } } -; + class Processing_HTML extends HtmlElement { function startTag() Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RandomPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -113,8 +113,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RateIt.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -450,8 +450,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RecentChanges.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -1474,8 +1474,8 @@ } -; + class OptionsButtonBars extends HtmlElement { Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RedirectTo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -106,8 +106,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RssFeed.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -129,8 +129,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SearchHighlight.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -110,8 +110,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SemanticRelations.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -143,8 +143,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SemanticSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -435,8 +435,8 @@ } } -; + class _PageList_Column_SemanticSearch_relation extends _PageList_Column { Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -220,8 +220,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SiteMap.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -223,8 +223,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SpellCheck.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -191,8 +191,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SqlResult.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -220,8 +220,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SyncWiki.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -365,8 +365,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SyntaxHighlighter.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -162,8 +162,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/TeX2png.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -238,8 +238,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Template.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -267,8 +267,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/TitleSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -109,8 +109,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Transclude.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -162,8 +162,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/TranslateText.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -135,8 +135,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UnfoldSubpages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -181,8 +181,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UriResolver.php =================================================================== --- trunk/lib/plugin/UriResolver.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UriResolver.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -65,8 +65,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UserPreferences.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -176,8 +176,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UserRatings.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -233,8 +233,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Video.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -146,8 +146,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WantedPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -143,8 +143,8 @@ } } -; + // which links to the missing page class _PageList_Column_WantedPages_wanted extends _PageList_Column { Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WantedPagesOld.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -215,8 +215,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WatchPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -172,8 +172,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WhoIsOnline.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -206,8 +206,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminRemove.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -248,8 +248,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminRename.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -331,8 +331,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -181,8 +181,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminUtils.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -311,8 +311,8 @@ } } -; + require_once 'lib/PageList.php'; class _PageList_Column_email Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiBlog.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -432,8 +432,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiForm.php =================================================================== --- trunk/lib/plugin/WikiForm.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiForm.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -116,8 +116,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiFormRich.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -399,8 +399,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiForum.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -136,8 +136,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiPoll.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -337,8 +337,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/YouTube.php =================================================================== --- trunk/lib/plugin/YouTube.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/YouTube.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -200,8 +200,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_AuthInfo.php =================================================================== --- trunk/lib/plugin/_AuthInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_AuthInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -201,8 +201,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_BackendInfo.php =================================================================== --- trunk/lib/plugin/_BackendInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_BackendInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -201,8 +201,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_GroupInfo.php =================================================================== --- trunk/lib/plugin/_GroupInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_GroupInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -67,4 +67,4 @@ } } -; + Modified: trunk/lib/plugin/_PreferencesInfo.php =================================================================== --- trunk/lib/plugin/_PreferencesInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_PreferencesInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -51,8 +51,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_Retransform.php =================================================================== --- trunk/lib/plugin/_Retransform.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_Retransform.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -85,8 +85,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_WikiTranslation.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -382,8 +382,8 @@ } } -; + class _PageList_Column_customlang extends _PageList_Column { function _PageList_Column_customlang($field, $from_lang, $plugin) Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/text2png.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -231,8 +231,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 07:32:16
|
Revision: 8408 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8408&view=rev Author: vargenau Date: 2012-10-11 07:32:06 +0000 (Thu, 11 Oct 2012) Log Message: ----------- No need to indent Modified Paths: -------------- trunk/lib/loadsave.php Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2012-10-11 07:28:17 UTC (rev 8407) +++ trunk/lib/loadsave.php 2012-10-11 07:32:06 UTC (rev 8408) @@ -970,7 +970,7 @@ $page->set($key, $value); } - $mesg = HTML::p(array('style' => 'text-indent: 3em;')); + $mesg = HTML::p(); if ($source) $mesg->pushContent(' ', fmt("from %s", $source)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-11 07:28:28
|
Revision: 8407 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8407&view=rev Author: vargenau Date: 2012-10-11 07:28:17 +0000 (Thu, 11 Oct 2012) Log Message: ----------- quoted_printable_encode inserts "\r\n" if line is too long, use "\n" only Modified Paths: -------------- trunk/lib/MailNotify.php Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2012-10-10 16:51:57 UTC (rev 8406) +++ trunk/lib/MailNotify.php 2012-10-11 07:28:17 UTC (rev 8407) @@ -479,7 +479,8 @@ // Let us try quoted printable first if (function_exists('quoted_printable_encode')) { // PHP 5.3 - return "=?UTF-8?Q?" . quoted_printable_encode($subject) . "?="; + // quoted_printable_encode inserts "\r\n" if line is too long, use "\n" only + return "=?UTF-8?Q?" . str_replace("\r\n", "\n", quoted_printable_encode($subject)) . "?="; } // If not, encode in base64 (less human-readable) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-10 16:52:08
|
Revision: 8406 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8406&view=rev Author: vargenau Date: 2012-10-10 16:51:57 +0000 (Wed, 10 Oct 2012) Log Message: ----------- Comment "override DB sort" Modified Paths: -------------- trunk/lib/plugin/BackLinks.php Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2012-10-10 16:42:37 UTC (rev 8405) +++ trunk/lib/plugin/BackLinks.php 2012-10-10 16:51:57 UTC (rev 8406) @@ -72,7 +72,7 @@ } if (!empty($limit)) $args['limit'] = $limit; - $args['dosort'] = !empty($args['sortby']); // override DB sort (??) + // $args['dosort'] = !empty($args['sortby']); // override DB sort (??) $pagelist = new PageList($info, $exclude, $args); // support logical AND: page1,page2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-10 16:42:48
|
Revision: 8405 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8405&view=rev Author: vargenau Date: 2012-10-10 16:42:37 +0000 (Wed, 10 Oct 2012) Log Message: ----------- Use PHP "empty" function Modified Paths: -------------- trunk/lib/plugin/SiteMap.php Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2012-10-10 16:08:08 UTC (rev 8404) +++ trunk/lib/plugin/SiteMap.php 2012-10-10 16:42:37 UTC (rev 8405) @@ -196,7 +196,7 @@ if (!is_string($includepages)) $includepages = ' '; // avoid plugin loader problems $loader = new WikiPluginLoader(); - $plugin = $loader->getPlugin($dtree ? 'DynamicIncludePage' : 'IncludePage', false); + $plugin = $loader->getPlugin(!empty($dtree) ? 'DynamicIncludePage' : 'IncludePage', false); $nothing = ''; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-10 16:08:17
|
Revision: 8404 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8404&view=rev Author: vargenau Date: 2012-10-10 16:08:08 +0000 (Wed, 10 Oct 2012) Log Message: ----------- Update locale Modified Paths: -------------- trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2012-10-10 10:13:58 UTC (rev 8403) +++ trunk/locale/po/de.po 2012-10-10 16:08:08 UTC (rev 8404) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-02 11:47+0200\n" +"POT-Creation-Date: 2012-10-10 18:07+0200\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <rurban@...>, Carsten Klapp " "<carstenklapp@...>, Helmer Pardun <pardunpress@..." @@ -17,153 +17,153 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../lib/CachedMarkup.php:535 +#: ../lib/CachedMarkup.php:579 msgid "BAD semantic relation link" msgstr "" -#: ../lib/CachedMarkup.php:566 +#: ../lib/CachedMarkup.php:611 #, php-format msgid "Attribute %s, base value: %s" msgstr "Attribut %s, Basis: %s" -#: ../lib/CachedMarkup.php:567 +#: ../lib/CachedMarkup.php:612 #, php-format msgid "Attribute %s, value: %s" msgstr "Attribut %s, Wert: %s" -#: ../lib/CachedMarkup.php:574 +#: ../lib/CachedMarkup.php:619 #, php-format msgid "Relation %s to page %s" msgstr "Relation %s zu Seite %s" -#: ../lib/CachedMarkup.php:629 +#: ../lib/CachedMarkup.php:679 msgid "Found by " msgstr "Gefunden von " -#: ../lib/Captcha.php:32 +#: ../lib/Captcha.php:34 msgid "Typed in verification word mismatch ... are you a bot?" msgstr "" -#: ../lib/Captcha.php:69 +#: ../lib/Captcha.php:75 msgid "Type word above:" msgstr "" -#: ../lib/DbaDatabase.php:20 +#: ../lib/DbaDatabase.php:21 #, php-format msgid "The DBA handler %s is unsupported!" msgstr "Die DBA Methode %s wird nicht unterstützt!" -#: ../lib/DbaDatabase.php:21 +#: ../lib/DbaDatabase.php:22 #, php-format msgid "Supported handlers are: %s" msgstr "Unterstützte DBA Methoden sind: %s" -#: ../lib/DbSession.php:41 +#: ../lib/DbSession.php:42 #, php-format msgid "Your WikiDB DB backend '%s' cannot be used for DbSession." msgstr "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt." -#: ../lib/DbSession.php:42 +#: ../lib/DbSession.php:43 #, php-format msgid "Set USE_DB_SESSION to false." msgstr "Setzen Sie USE_DB_SESSION auf false." -#: ../lib/diff.php:198 ../lib/plugin/Diff.php:66 +#: ../lib/diff.php:221 ../lib/plugin/Diff.php:71 #, php-format msgid "version %s" msgstr "Version %s" -#: ../lib/diff.php:201 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:530 -#: ../lib/WikiTheme.php:532 +#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541 +#: ../lib/WikiTheme.php:543 #, php-format msgid "by %s" msgstr "von %s" -#: ../lib/diff.php:205 ../lib/plugin/Diff.php:71 -#: ../lib/wikilens/PageListColumns.php:357 +#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76 +#: ../lib/wikilens/PageListColumns.php:380 msgid "None" msgstr "Keine" -#: ../lib/diff.php:228 ../lib/plugin/Diff.php:94 -#: ../lib/plugin/PageHistory.php:324 ../lib/plugin/PageInfo.php:54 +#: ../lib/diff.php:251 ../lib/plugin/Diff.php:100 +#: ../lib/plugin/PageHistory.php:347 ../lib/plugin/PageInfo.php:58 #, php-format msgid "I'm sorry, there is no such page as %s." msgstr "Leider gibt es keine solche Seite %s." -#: ../lib/diff.php:231 ../lib/diff.php:340 +#: ../lib/diff.php:254 ../lib/diff.php:361 #, php-format msgid "Diff: %s" msgstr "Vergleich von: %s" -#: ../lib/diff.php:238 ../lib/diff.php:248 ../lib/plugin/Diff.php:102 -#: ../lib/plugin/Diff.php:112 +#: ../lib/diff.php:261 ../lib/diff.php:270 ../lib/plugin/Diff.php:108 +#: ../lib/plugin/Diff.php:117 #, php-format msgid "version %d" msgstr "Version %d." -#: ../lib/diff.php:242 ../lib/plugin/Diff.php:106 +#: ../lib/diff.php:264 ../lib/plugin/Diff.php:111 msgid "current version" msgstr "aktuelle Version" -#: ../lib/diff.php:259 ../lib/plugin/Diff.php:123 +#: ../lib/diff.php:280 ../lib/plugin/Diff.php:127 msgid "revision by previous author" msgstr "Revidierte Ausgabe des vorigen Autors" -#: ../lib/diff.php:265 ../lib/plugin/Diff.php:129 +#: ../lib/diff.php:286 ../lib/plugin/Diff.php:133 msgid "previous revision" msgstr "vorige Neubearbeitung" -#: ../lib/diff.php:275 ../lib/plugin/Diff.php:139 +#: ../lib/diff.php:296 ../lib/plugin/Diff.php:143 msgid "predecessor to the previous major change" msgstr "Vorgänger zur vorherigen größeren Änderung" # word substitution order changes here -#: ../lib/diff.php:286 ../lib/plugin/Diff.php:149 +#: ../lib/diff.php:307 ../lib/plugin/Diff.php:153 #, php-format msgid "Differences between %s and %s of %s." msgstr "Zeilenweiser Vergleich von %3$s, von %1$s mit %2$s." # (Differences sind eigentlich= Unterschiede, Abweichungen) # (eigentlich=weitere Abweichungen, Veränderungen) -#: ../lib/diff.php:289 ../lib/plugin/Diff.php:152 +#: ../lib/diff.php:310 ../lib/plugin/Diff.php:156 msgid "Other diffs:" msgstr "Andere Vergleiche:" -#: ../lib/diff.php:290 ../lib/plugin/Diff.php:153 +#: ../lib/diff.php:311 ../lib/plugin/Diff.php:157 msgid "Previous Major Revision" msgstr "Vorige größere Neubearbeitung" -#: ../lib/diff.php:291 ../lib/plugin/Diff.php:154 +#: ../lib/diff.php:312 ../lib/plugin/Diff.php:158 msgid "Previous Revision" msgstr "Vorige Neubearbeitung" -#: ../lib/diff.php:292 ../lib/plugin/Diff.php:155 +#: ../lib/diff.php:313 ../lib/plugin/Diff.php:159 msgid "Previous Author" msgstr "Voriger Autor" -#: ../lib/diff.php:308 ../lib/plugin/Diff.php:172 +#: ../lib/diff.php:329 ../lib/plugin/Diff.php:176 msgid "Newer page:" msgstr "Neuere Seite:" -#: ../lib/diff.php:310 ../lib/plugin/Diff.php:174 +#: ../lib/diff.php:331 ../lib/plugin/Diff.php:178 msgid "Older page:" msgstr "Ältere Seite:" -#: ../lib/diff.php:318 +#: ../lib/diff.php:339 #, php-format msgid "Content of versions %1$s and %2$s is identical." msgstr "" -#: ../lib/diff.php:325 +#: ../lib/diff.php:346 #, php-format msgid "Version %1$s was created because: %2$s" msgstr "" -#: ../lib/display.php:74 ../lib/display.php:344 -#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:154 -#: ../lib/plugin/PageGroup.php:165 ../lib/plugin/PageGroup.php:181 -#: ../lib/plugin/PageGroup.php:188 ../lib/plugin/PageHistory.php:232 -#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:37 +#: ../lib/display.php:77 ../lib/display.php:347 +#: ../lib/plugin/HelloWorld.php:69 ../lib/plugin/PageGroup.php:160 +#: ../lib/plugin/PageGroup.php:171 ../lib/plugin/PageGroup.php:187 +#: ../lib/plugin/PageGroup.php:194 ../lib/plugin/PageHistory.php:246 +#: ../lib/plugin/UnfoldSubpages.php:159 ../themes/Crao/templates/head.tmpl:37 #: ../themes/default/templates/head.tmpl:43 #: ../themes/default/templates/top.tmpl:9 #: ../themes/MonoBook/templates/logo.tmpl:2 @@ -176,18 +176,18 @@ msgid "%s: %s" msgstr "%s: %s" -#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:448 -#: ../lib/plugin/LinkDatabase.php:42 +#: ../lib/display.php:108 ../lib/display.php:208 ../lib/display.php:451 +#: ../lib/plugin/LinkDatabase.php:43 msgid "LinkDatabase" msgstr "LinkDatenbank" # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte # Änderungen"; in terms of newspapers or journalism it's traditionally # "NeuesteNachrichten" or much more better "DasNeueste"). -#: ../lib/display.php:170 ../lib/display.php:410 ../lib/loadsave.php:1562 -#: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210 -#: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393 -#: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160 +#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1576 +#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:230 +#: ../lib/plugin/RecentChanges.php:237 ../lib/plugin/RecentChanges.php:440 +#: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentChanges.php:1280 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:11 #: ../themes/Crao/templates/head.tmpl:53 #: ../themes/Crao/templates/navbar.tmpl:11 @@ -207,14 +207,14 @@ msgid "RecentChanges" msgstr "NeuesteÄnderungen" -#: ../lib/display.php:207 ../lib/display.php:449 -#: ../lib/plugin/FileInfo.php:126 ../lib/TextSearchQuery.php:115 +#: ../lib/display.php:209 ../lib/display.php:452 +#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:116 #, php-format msgid "Unsupported argument: %s=%s" msgstr "Nicht unterstütztes Argument: %s=%s" -#: ../lib/display.php:276 ../lib/display.php:283 -#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50 +#: ../lib/display.php:279 ../lib/display.php:286 +#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50 #: ../themes/blog/templates/navbar.tmpl:8 #: ../themes/Crao/templates/navbar.tmpl:15 #: ../themes/default/templates/navbar.tmpl:18 @@ -226,19 +226,19 @@ msgid "BackLinks" msgstr "BackLinks" -#: ../lib/display.php:279 ../lib/display.php:286 +#: ../lib/display.php:282 ../lib/display.php:289 #, php-format msgid "BackLinks for %s" msgstr "BackLinks für %s" # versandet (=full of sand) ;) # weitergeleitet von -#: ../lib/display.php:294 +#: ../lib/display.php:297 #, php-format msgid "(Redirected from %s)" msgstr "(Weitergeleitet von %s)" -#: ../lib/display.php:367 ../themes/Crao/templates/head.tmpl:60 +#: ../lib/display.php:370 ../themes/Crao/templates/head.tmpl:60 #: ../themes/Crao/templates/head.tmpl:61 #: ../themes/default/templates/head.tmpl:68 #: ../themes/default/templates/head.tmpl:69 @@ -247,65 +247,65 @@ msgid "SandBox" msgstr "SandKasten" -#: ../lib/editpage.php:161 ../lib/editpage.php:581 +#: ../lib/editpage.php:154 ../lib/editpage.php:593 msgid "Your version" msgstr "Ihre Version" -#: ../lib/editpage.php:161 ../lib/editpage.php:582 +#: ../lib/editpage.php:154 ../lib/editpage.php:594 msgid "Other version" msgstr "Andere Version" -#: ../lib/editpage.php:172 +#: ../lib/editpage.php:165 msgid "Some internal editing error" msgstr "" -#: ../lib/editpage.php:173 +#: ../lib/editpage.php:166 msgid "" "Your are probably trying to edit/create an invalid version of this page." msgstr "" "Sie versuchen offenbar eine ungültige Version dieser Seite zu bearbeiten." -#: ../lib/editpage.php:174 +#: ../lib/editpage.php:167 msgid "&version=-1 might help." msgstr "&version=-1 wird empfohlen." # (Wrong Translation; sorry, but the German term for edit is NOT # editieren, but e d i e r e n). -#: ../lib/editpage.php:193 +#: ../lib/editpage.php:186 #, php-format msgid "Edit: %s" msgstr "Bearbeite: %s" -#: ../lib/editpage.php:230 +#: ../lib/editpage.php:224 #, php-format msgid "View Source: %s" msgstr "Quelltext Ansicht: %s" -#: ../lib/editpage.php:248 +#: ../lib/editpage.php:243 msgid "Page now locked." msgstr "Seite jetzt gesperrt." -#: ../lib/editpage.php:249 +#: ../lib/editpage.php:244 msgid "Page now unlocked." msgstr "Seite jetzt freigegeben." -#: ../lib/editpage.php:256 +#: ../lib/editpage.php:251 msgid "Page now public." msgstr "Seite jetzt öffentlich freigegeben." -#: ../lib/editpage.php:257 +#: ../lib/editpage.php:252 msgid "Page now not-public." msgstr "Seite jetzt nicht mehr öffentlich freigegeben." -#: ../lib/editpage.php:266 +#: ../lib/editpage.php:261 msgid "Page now external." msgstr "" -#: ../lib/editpage.php:267 +#: ../lib/editpage.php:262 msgid "Page now not-external." msgstr "" -#: ../lib/editpage.php:376 +#: ../lib/editpage.php:372 #, php-format msgid "Saved: %s" msgstr "Gespeichert: %s" @@ -314,41 +314,41 @@ msgid "Too many external links." msgstr "Zu viele externe Links." -#: ../lib/editpage.php:443 +#: ../lib/editpage.php:444 msgid "SpamAssassin reports: " msgstr "SpamAssassin sagt: " -#: ../lib/editpage.php:470 +#: ../lib/editpage.php:471 msgid "External links contain blocked domains:" msgstr "" -#: ../lib/editpage.php:471 +#: ../lib/editpage.php:472 #, php-format msgid "%s is listed at %s with %s" msgstr "%s ist gelistet auf %s mit %s" -#: ../lib/editpage.php:495 +#: ../lib/editpage.php:498 msgid "Spam Prevention" msgstr "AntiSpam" -#: ../lib/editpage.php:496 +#: ../lib/editpage.php:499 msgid "This page edit seems to contain spam and was therefore not saved." msgstr "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert." -#: ../lib/editpage.php:498 ../lib/editpage.php:557 +#: ../lib/editpage.php:501 ../lib/editpage.php:564 msgid "Sorry for the inconvenience." msgstr "" "Entschuldigen Sie bitte die hiermit für Sie verbundenen Unannehmlichkeiten." -#: ../lib/editpage.php:523 +#: ../lib/editpage.php:529 msgid "Versions are identical" msgstr "Versionen sind identisch" -#: ../lib/editpage.php:554 ../themes/MacOSX/themeinfo.php:136 +#: ../lib/editpage.php:561 ../themes/MacOSX/themeinfo.php:140 msgid "Page Locked" msgstr "Seite Gesperrt" -#: ../lib/editpage.php:555 +#: ../lib/editpage.php:562 msgid "" "This page has been locked by the administrator so your changes can not be " "saved." @@ -356,7 +356,7 @@ "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. " "Ihre Änderungen können deshalb nicht gespeichert werden." -#: ../lib/editpage.php:556 +#: ../lib/editpage.php:563 msgid "" "(Copy your changes to the clipboard. You can try editing a different page or " "save your text in a text editor.)" @@ -364,26 +364,26 @@ "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen " "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)" -#: ../lib/editpage.php:565 ../lib/editpage.php:566 ../lib/main.php:806 -#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42 -#: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217 -#: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260 -#: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264 -#: ../lib/plugin/ModeratedPage.php:348 ../lib/plugin/ModeratedPage.php:352 -#: ../lib/plugin/ModeratedPage.php:407 ../lib/plugin/ModeratedPage.php:432 +#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831 +#: ../lib/main.php:1209 ../lib/plugin/ModeratedPage.php:43 +#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226 +#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271 +#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275 +#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364 +#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446 msgid "ModeratedPage" msgstr "ModerierteSeite" -#: ../lib/editpage.php:566 +#: ../lib/editpage.php:576 #, php-format msgid "" "You can edit away, but your changes will have to be approved by the defined " "moderators at the definition in %s" msgstr "" -#: ../lib/editpage.php:568 ../lib/plugin/PasswordReset.php:154 -#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121 -#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:14 +#: ../lib/editpage.php:578 ../lib/plugin/PasswordReset.php:162 +#: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129 +#: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77 #: ../themes/Crao/templates/navbar.tmpl:21 #: ../themes/default/templates/head.tmpl:84 @@ -401,14 +401,14 @@ msgid "UserPreferences" msgstr "BenutzerEinstellungen" -#: ../lib/editpage.php:567 +#: ../lib/editpage.php:577 #, php-format msgid "" "The approval has a grace period of 5 days. If you have your E-Mail defined " "in your %s, you will get a notification of approval or rejection." msgstr "" -#: ../lib/editpage.php:580 ../lib/editpage.php:942 +#: ../lib/editpage.php:592 ../lib/editpage.php:958 #, php-format msgid "" "Some of the changes could not automatically be combined. Please look for " @@ -420,15 +420,15 @@ "enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern " "klicken." -#: ../lib/editpage.php:584 ../lib/editpage.php:945 +#: ../lib/editpage.php:596 ../lib/editpage.php:961 msgid "Please check it through before saving." msgstr "Bitte überprüfen Sie erst alles, bevor Sie es abspeichern." -#: ../lib/editpage.php:595 +#: ../lib/editpage.php:606 msgid "Conflicting Edits!" msgstr "Widersprechende Änderungen!" -#: ../lib/editpage.php:596 +#: ../lib/editpage.php:607 msgid "" "In the time since you started editing this page, another user has saved a " "new version of it." @@ -436,7 +436,7 @@ "Während der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, " "hat ein anderer Benutzer bereits eine neuere Version gespeichert." -#: ../lib/editpage.php:597 +#: ../lib/editpage.php:608 msgid "" "Your changes can not be saved as they are, since doing so would overwrite " "the other author's changes. So, your changes and those of the other author " @@ -447,272 +447,272 @@ "überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors " "miteinander kombiniert worden. Das Ergebnis sehen Sie unten." -#: ../lib/editpage.php:666 ../lib/plugin/HtmlConverter.php:66 +#: ../lib/editpage.php:679 ../lib/plugin/HtmlConverter.php:70 msgid "Convert" msgstr "Konvertieren" -#: ../lib/editpage.php:695 ../lib/EditToolbar.php:210 -#: ../lib/EditToolbar.php:212 ../lib/WysiwygEdit/Wikiwyg.php:79 +#: ../lib/editpage.php:708 ../lib/EditToolbar.php:214 +#: ../lib/EditToolbar.php:216 ../lib/WysiwygEdit/Wikiwyg.php:82 msgid "Preview" msgstr "Vorschau" -#: ../lib/editpage.php:702 ../lib/EditToolbar.php:203 -#: ../lib/EditToolbar.php:205 ../lib/WysiwygEdit/Wikiwyg.php:80 +#: ../lib/editpage.php:715 ../lib/EditToolbar.php:207 +#: ../lib/EditToolbar.php:209 ../lib/WysiwygEdit/Wikiwyg.php:83 msgid "Save" msgstr "Speichern" -#: ../lib/editpage.php:706 +#: ../lib/editpage.php:719 msgid "Changes" msgstr "Änderungen" -#: ../lib/editpage.php:710 ../lib/plugin/UpLoad.php:161 -#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:94 +#: ../lib/editpage.php:723 ../lib/plugin/UpLoad.php:165 +#: ../lib/plugin/UpLoad.php:170 ../lib/plugin/WikiForm.php:98 msgid "Upload" msgstr "Hochladen" -#: ../lib/editpage.php:713 +#: ../lib/editpage.php:726 msgid "Spell Check" msgstr "" -#: ../lib/editpage.php:736 ../themes/Portland/templates/editpage.tmpl:36 +#: ../lib/editpage.php:749 ../themes/Portland/templates/editpage.tmpl:36 #: ../themes/Wordpress/templates/editpage.tmpl:52 #, php-format msgid "Author will be logged as %s." msgstr "%s wird als Autor aufgenommen." -#: ../lib/editpage.php:897 +#: ../lib/editpage.php:912 msgid "Keep old" msgstr "" -#: ../lib/editpage.php:900 +#: ../lib/editpage.php:915 msgid "Overwrite with new" msgstr "" # (Wrong Translation; sorry, but the German term for edit is NOT # editieren, but e d i e r e n). -#: ../lib/editpage.php:910 +#: ../lib/editpage.php:925 #, php-format msgid "Merge and Edit: %s" msgstr "Zusammenfügen und Bearbeiten: %s" -#: ../lib/EditToolbar.php:48 +#: ../lib/EditToolbar.php:50 msgid "Undo" msgstr "Rückgängig" -#: ../lib/EditToolbar.php:50 +#: ../lib/EditToolbar.php:52 msgid "Undo disabled" msgstr "Undo deaktiviert" -#: ../lib/EditToolbar.php:51 +#: ../lib/EditToolbar.php:53 msgid "Operation undone" msgstr "Aktion rückgängig gemacht" -#: ../lib/EditToolbar.php:52 +#: ../lib/EditToolbar.php:54 msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" msgstr "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?" -#: ../lib/EditToolbar.php:53 +#: ../lib/EditToolbar.php:55 #, php-format msgid "String \"%s\" not found." msgstr "Zeichenkette \"%s\" nicht gefunden." -#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:255 -#: ../lib/EditToolbar.php:256 ../lib/plugin/WikiAdminSearchReplace.php:193 +#: ../lib/EditToolbar.php:56 ../lib/EditToolbar.php:259 +#: ../lib/EditToolbar.php:260 ../lib/plugin/WikiAdminSearchReplace.php:200 msgid "Search & Replace" msgstr "Suchen & Ersetzen" -#: ../lib/EditToolbar.php:55 +#: ../lib/EditToolbar.php:57 msgid "Search for" msgstr "Suche nach" -#: ../lib/EditToolbar.php:56 +#: ../lib/EditToolbar.php:58 msgid "Replace with" msgstr "Ersetze mit" -#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299 -#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348 -#: ../lib/plugin/WikiPoll.php:221 ../lib/stdlib.php:1952 -#: ../lib/upgrade.php:195 ../lib/upgrade.php:398 ../lib/upgrade.php:412 -#: ../lib/upgrade.php:432 ../lib/upgrade.php:441 ../lib/upgrade.php:465 -#: ../lib/upgrade.php:493 ../lib/upgrade.php:543 ../lib/upgrade.php:546 -#: ../lib/upgrade.php:578 ../lib/upgrade.php:580 ../lib/upgrade.php:607 -#: ../lib/upgrade.php:667 ../lib/upgrade.php:692 ../lib/upgrade.php:835 -#: ../lib/upgrade.php:838 ../lib/upgrade.php:905 +#: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308 +#: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359 +#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2005 +#: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421 +#: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474 +#: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554 +#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615 +#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848 +#: ../lib/upgrade.php:851 ../lib/upgrade.php:920 msgid "OK" msgstr "OK" -#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:322 -#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:402 -#: ../lib/EditToolbar.php:440 ../lib/EditToolbar.php:475 +#: ../lib/EditToolbar.php:60 ../lib/EditToolbar.php:327 +#: ../lib/EditToolbar.php:378 ../lib/EditToolbar.php:409 +#: ../lib/EditToolbar.php:448 ../lib/EditToolbar.php:484 msgid "Close" msgstr "Schließen" -#: ../lib/EditToolbar.php:125 +#: ../lib/EditToolbar.php:129 msgid "Bold text" msgstr "Fetter Text" -#: ../lib/EditToolbar.php:126 +#: ../lib/EditToolbar.php:130 msgid "Bold text [alt-b]" msgstr "Fetter Text [alt-f]" -#: ../lib/EditToolbar.php:130 +#: ../lib/EditToolbar.php:134 msgid "Italic text" msgstr "Kursiver Text" -#: ../lib/EditToolbar.php:131 +#: ../lib/EditToolbar.php:135 msgid "Italic text [alt-i]" msgstr "Kursiver Text [alt-k]" -#: ../lib/EditToolbar.php:135 +#: ../lib/EditToolbar.php:139 msgid "Strike-through text" msgstr "Durchgestrichen" -#: ../lib/EditToolbar.php:136 +#: ../lib/EditToolbar.php:140 msgid "Strike" msgstr "Durchstreichen" -#: ../lib/EditToolbar.php:140 +#: ../lib/EditToolbar.php:144 msgid "Color text" msgstr "Farbiger Text" -#: ../lib/EditToolbar.php:141 +#: ../lib/EditToolbar.php:145 msgid "Color" msgstr "Farbe" -#: ../lib/EditToolbar.php:145 +#: ../lib/EditToolbar.php:149 msgid "PageName|optional label" msgstr "SeitenName|optionaler Name" -#: ../lib/EditToolbar.php:146 +#: ../lib/EditToolbar.php:150 msgid "Link to page" msgstr "Link auf Seite" -#: ../lib/EditToolbar.php:150 +#: ../lib/EditToolbar.php:154 msgid "http://www.example.com|optional label" msgstr "http://www.example.com|optionaler Name" -#: ../lib/EditToolbar.php:151 +#: ../lib/EditToolbar.php:155 msgid "External link (remember http:// prefix)" msgstr "Externer Link (http:// prefix)" -#: ../lib/EditToolbar.php:155 +#: ../lib/EditToolbar.php:159 msgid "Headline text" msgstr "Überschrift" -#: ../lib/EditToolbar.php:156 +#: ../lib/EditToolbar.php:160 msgid "Level 1 headline" msgstr "H1 Überschrift" -#: ../lib/EditToolbar.php:160 +#: ../lib/EditToolbar.php:164 msgid "Insert non-formatted text here" msgstr "Füge unformatierten Text hier ein" -#: ../lib/EditToolbar.php:161 +#: ../lib/EditToolbar.php:165 msgid "Ignore wiki formatting" msgstr "Keine Wiki Formatierung" -#: ../lib/EditToolbar.php:166 +#: ../lib/EditToolbar.php:170 msgid "Your signature" msgstr "Deine Signatur" -#: ../lib/EditToolbar.php:171 +#: ../lib/EditToolbar.php:175 msgid "Horizontal line" msgstr "Horizontale Trennlinie" -#: ../lib/EditToolbar.php:176 +#: ../lib/EditToolbar.php:180 msgid "Sample table" msgstr "Beispieltabelle" -#: ../lib/EditToolbar.php:181 +#: ../lib/EditToolbar.php:185 msgid "Enumeration" msgstr "Num. Liste" -#: ../lib/EditToolbar.php:186 +#: ../lib/EditToolbar.php:190 msgid "List" msgstr "Liste" -#: ../lib/EditToolbar.php:191 ../lib/plugin/CreateToc.php:479 -#: ../lib/plugin/CreateToc.php:494 ../lib/WysiwygEdit/Wikiwyg.php:75 +#: ../lib/EditToolbar.php:195 ../lib/plugin/CreateToc.php:502 +#: ../lib/plugin/CreateToc.php:517 ../lib/WysiwygEdit/Wikiwyg.php:78 msgid "Table of Contents" msgstr "Inhaltsverzeichnis" -#: ../lib/EditToolbar.php:195 ../lib/PageList.php:489 -#: ../lib/plugin/AuthorHistory.php:150 ../lib/plugin/WantedPagesOld.php:143 +#: ../lib/EditToolbar.php:199 ../lib/PageList.php:560 +#: ../lib/plugin/AuthorHistory.php:154 ../lib/plugin/WantedPagesOld.php:147 msgid "Page Name" msgstr "Seitenname" -#: ../lib/EditToolbar.php:196 ../themes/default/templates/redirect.tmpl:16 +#: ../lib/EditToolbar.php:200 ../themes/default/templates/redirect.tmpl:16 #: ../themes/default/templates/redirect.tmpl:39 msgid "Redirect" msgstr "Weiterleiten" -#: ../lib/EditToolbar.php:200 +#: ../lib/EditToolbar.php:204 msgid "Template Name" msgstr "Vorlagenname" -#: ../lib/EditToolbar.php:201 ../lib/plugin/PopularTags.php:57 -#: ../lib/plugin/Template.php:61 +#: ../lib/EditToolbar.php:205 ../lib/plugin/PopularTags.php:61 +#: ../lib/plugin/Template.php:62 msgid "Template" msgstr "Vorlage" -#: ../lib/EditToolbar.php:233 +#: ../lib/EditToolbar.php:237 msgid "Click a button to get an example text" msgstr "" -#: ../lib/EditToolbar.php:247 ../lib/EditToolbar.php:248 +#: ../lib/EditToolbar.php:251 ../lib/EditToolbar.php:252 msgid "Undo Search & Replace" msgstr "Suchen & Ersetzen rückgängig machen" -#: ../lib/EditToolbar.php:316 ../lib/EditToolbar.php:319 +#: ../lib/EditToolbar.php:321 ../lib/EditToolbar.php:324 msgid "Insert Categories" msgstr "Neue Kategorie" -#: ../lib/EditToolbar.php:321 ../lib/EditToolbar.php:371 -#: ../lib/EditToolbar.php:401 ../lib/EditToolbar.php:439 -#: ../lib/EditToolbar.php:474 +#: ../lib/EditToolbar.php:326 ../lib/EditToolbar.php:377 +#: ../lib/EditToolbar.php:408 ../lib/EditToolbar.php:447 +#: ../lib/EditToolbar.php:483 msgid "Insert" msgstr "Einfügen" -#: ../lib/EditToolbar.php:366 ../lib/EditToolbar.php:367 -#: ../lib/EditToolbar.php:369 +#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373 +#: ../lib/EditToolbar.php:375 msgid "Insert Plugin" msgstr "Zusatzprogramme einfügen" -#: ../lib/EditToolbar.php:396 ../lib/EditToolbar.php:397 -#: ../lib/EditToolbar.php:399 +#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:404 +#: ../lib/EditToolbar.php:406 msgid "Insert PageLink" msgstr "SeitenLink einfügen" -#: ../lib/EditToolbar.php:434 ../lib/EditToolbar.php:435 -#: ../lib/EditToolbar.php:437 +#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:443 +#: ../lib/EditToolbar.php:445 msgid "Insert Image or Video" msgstr "Bild oder Video einfügen" -#: ../lib/EditToolbar.php:469 ../lib/EditToolbar.php:470 -#: ../lib/EditToolbar.php:472 +#: ../lib/EditToolbar.php:478 ../lib/EditToolbar.php:479 +#: ../lib/EditToolbar.php:481 msgid "Insert Template" msgstr "Vorlage einfügen" -#: ../lib/ErrorManager.php:220 +#: ../lib/ErrorManager.php:231 #, php-format msgid "%s: error while handling error:" msgstr "%s: Fehler während der Fehlerbehandlung von:" -#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1143 +#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1158 #, php-format msgid "%s: file not found" msgstr "»%s«: Datei nicht gefunden" -#: ../lib/IniConfig.php:994 +#: ../lib/IniConfig.php:1010 msgid "CategoryGroup" msgstr "KategorieGruppen" # (namenlos=unbenannt; depends on interpretation) -#: ../lib/IniConfig.php:996 +#: ../lib/IniConfig.php:1012 msgid "An unnamed PhpWiki" msgstr "Unbenanntes PhpWiki" -#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70 +#: ../lib/IniConfig.php:1014 ../lib/upgrade.php:73 #: ../themes/blog/templates/browse-footer.tmpl:3 #: ../themes/default/templates/userprefs.tmpl:129 #: ../themes/fusionforge/templates/navbar.tmpl:7 @@ -720,73 +720,73 @@ msgid "HomePage" msgstr "StartSeite" -#: ../lib/InlineParser.php:341 +#: ../lib/InlineParser.php:358 msgid "Invalid [] syntax ignored" msgstr "Ungültige [] syntax ignoriert" -#: ../lib/InlineParser.php:341 ../lib/plugin/ModeratedPage.php:257 -#: ../lib/plugin/ModeratedPage.php:260 ../lib/plugin/ModeratedPage.php:352 -#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240 -#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:270 -#: ../lib/plugin/WikiAdminRename.php:276 -#: ../lib/plugin/WikiAdminSearchReplace.php:231 -#: ../lib/plugin/WikiAdminSearchReplace.php:235 -#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248 -#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104 -#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:7 +#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268 +#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364 +#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246 +#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277 +#: ../lib/plugin/WikiAdminRename.php:283 +#: ../lib/plugin/WikiAdminSearchReplace.php:240 +#: ../lib/plugin/WikiAdminSearchReplace.php:244 +#: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254 +#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128 +#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7 #: ../themes/default/templates/blogform.tmpl:7 #: ../themes/fusionforge/templates/blogform.tmpl:7 -#: ../themes/fusionforge/themeinfo.php:49 +#: ../themes/fusionforge/themeinfo.php:52 msgid ": " msgstr ": " -#: ../lib/InlineParser.php:392 ../lib/main.php:767 ../lib/stdlib.php:969 +#: ../lib/InlineParser.php:409 ../lib/main.php:793 ../lib/stdlib.php:988 msgid "Page name too long" msgstr "Seite Name zu lang" -#: ../lib/InlineParser.php:398 ../lib/main.php:774 +#: ../lib/InlineParser.php:415 ../lib/main.php:800 #, php-format msgid "Illegal character '%s' in page name." msgstr "Ungültiges Zeichen '%s' in Seitenname." -#: ../lib/InlineParser.php:920 +#: ../lib/InlineParser.php:979 #, php-format msgid "unknown color %s ignored" msgstr "unbekannte Farbe %s ignoriert" -#: ../lib/loadsave.php:71 +#: ../lib/loadsave.php:73 msgid "ZIP files of database" msgstr "Speichern und Archivieren" -#: ../lib/loadsave.php:72 +#: ../lib/loadsave.php:76 msgid "Dump to directory" msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern" -#: ../lib/loadsave.php:73 ../themes/fusionforge/templates/navbar.tmpl:17 +#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:17 #: ../themes/MonoBook/templates/navbar.tmpl:58 #: ../themes/Sidebar/templates/navbar.tmpl:48 msgid "Upload File" msgstr "Datei Hochladen" -#: ../lib/loadsave.php:74 ../lib/plugin/WikiForm.php:67 +#: ../lib/loadsave.php:82 ../lib/plugin/WikiForm.php:71 msgid "Load File" msgstr "Datei Laden" -#: ../lib/loadsave.php:75 +#: ../lib/loadsave.php:85 msgid "Upgrade" msgstr "Updaten" -#: ../lib/loadsave.php:77 +#: ../lib/loadsave.php:89 msgid "Dump pages as XHTML" msgstr "Seiten als XHTML Dateien speichern" # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten # must also be renamed to match what is here. -#: ../lib/loadsave.php:83 ../lib/loadsave.php:466 ../lib/loadsave.php:1027 -#: ../lib/loadsave.php:1033 ../lib/loadsave.php:1041 ../lib/main.php:1069 -#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185 -#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:144 -#: ../lib/plugin/WikiAdminSelect.php:218 +#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1041 +#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1097 +#: ../lib/main.php:1229 ../lib/main.php:1242 ../lib/PagePerm.php:190 +#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:147 +#: ../lib/plugin/WikiAdminSelect.php:221 #: ../themes/blog/templates/navbar.tmpl:11 #: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71 #: ../themes/Crao/templates/navbar.tmpl:35 @@ -808,30 +808,30 @@ # (Wrong Translation; sorry, but the German term for edit is NOT # editieren, but e d i e r e n). -#: ../lib/loadsave.php:94 ../lib/MailNotify.php:297 +#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306 #, php-format msgid "Edited by: %s" msgstr "Bearbeitet von: %s" -#: ../lib/loadsave.php:96 ../lib/loadsave.php:97 +#: ../lib/loadsave.php:109 ../lib/loadsave.php:110 msgid "LoadDump" msgstr "SeiteLaden" -#: ../lib/loadsave.php:100 +#: ../lib/loadsave.php:114 #, php-format msgid "PageChange Notification of %s sent to %s" msgstr "SeitenÄnderung Benachrichtigung von %s an %s gesendet" -#: ../lib/loadsave.php:103 +#: ../lib/loadsave.php:117 #, php-format msgid "PageChange Notification Error: Couldn't send %s to %s" msgstr "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden" -#: ../lib/loadsave.php:111 +#: ../lib/loadsave.php:125 msgid "Complete." msgstr "Fertig." -#: ../lib/loadsave.php:112 +#: ../lib/loadsave.php:126 #, php-format msgid "Return to %s" msgstr "Zurück zu %s" @@ -840,141 +840,141 @@ # all revisions of all pages (FullDump), or just the most recent # revision of each page (LatestSnapshot). # VollständigerSpeicherauszug, VolligerSpeicherauszug oder...? -#: ../lib/loadsave.php:235 +#: ../lib/loadsave.php:251 msgid "FullDump" msgstr "VollSicherung" -#: ../lib/loadsave.php:239 +#: ../lib/loadsave.php:254 msgid "LatestSnapshot" msgstr "LetzeSicherung" -#: ../lib/loadsave.php:309 ../lib/loadsave.php:440 +#: ../lib/loadsave.php:324 ../lib/loadsave.php:457 msgid "You must specify a directory to dump to" msgstr "Sie müssen zum Sichern ein Verzeichnis angeben." -#: ../lib/loadsave.php:314 ../lib/loadsave.php:445 +#: ../lib/loadsave.php:329 ../lib/loadsave.php:462 #, php-format msgid "Cannot create directory '%s'" msgstr "Das Verzeichnis »%s« kann nicht erzeugt werden" -#: ../lib/loadsave.php:316 ../lib/loadsave.php:447 +#: ../lib/loadsave.php:331 ../lib/loadsave.php:464 #, php-format msgid "Created directory '%s' for the page dump..." msgstr "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen..." -#: ../lib/loadsave.php:319 ../lib/loadsave.php:450 +#: ../lib/loadsave.php:334 ../lib/loadsave.php:467 #, php-format msgid "Using directory '%s'" msgstr "Das Verzeichnis »%s« wird verwendet" -#: ../lib/loadsave.php:322 ../lib/loadsave.php:452 +#: ../lib/loadsave.php:337 ../lib/loadsave.php:469 msgid "Dumping Pages" msgstr "Die Seiten werden geschrieben" -#: ../lib/loadsave.php:358 ../lib/loadsave.php:621 ../lib/stdlib.php:1026 +#: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046 msgid "Skipped." msgstr "Ausgelassen." -#: ../lib/loadsave.php:366 +#: ../lib/loadsave.php:381 #, php-format msgid "saved as %s" msgstr "gespeichert als %s" -#: ../lib/loadsave.php:376 ../lib/loadsave.php:691 -#: ../lib/plugin/text2png.php:222 +#: ../lib/loadsave.php:391 ../lib/loadsave.php:710 +#: ../lib/plugin/text2png.php:227 #, php-format msgid "couldn't open file '%s' for writing" msgstr "Datei »%s« konnte nicht zum Schreiben geöffnet werden" -#: ../lib/loadsave.php:382 ../lib/loadsave.php:701 +#: ../lib/loadsave.php:397 ../lib/loadsave.php:720 #, php-format msgid "%s bytes written" msgstr "%s Bytes geschrieben" -#: ../lib/loadsave.php:675 ../lib/loadsave.php:752 ../lib/loadsave.php:787 -#: ../lib/loadsave.php:817 +#: ../lib/loadsave.php:694 ../lib/loadsave.php:771 ../lib/loadsave.php:806 +#: ../lib/loadsave.php:836 #, php-format msgid "... copied to %s" msgstr "... kopiert nach %s" -#: ../lib/loadsave.php:678 ../lib/loadsave.php:754 ../lib/loadsave.php:789 -#: ../lib/loadsave.php:819 +#: ../lib/loadsave.php:697 ../lib/loadsave.php:773 ../lib/loadsave.php:808 +#: ../lib/loadsave.php:838 #, php-format msgid "... not copied to %s" msgstr "... nicht kopiert nach %s" -#: ../lib/loadsave.php:699 +#: ../lib/loadsave.php:718 msgid "saved as " msgstr "gespeichert als " -#: ../lib/loadsave.php:762 ../lib/loadsave.php:797 ../lib/loadsave.php:828 +#: ../lib/loadsave.php:781 ../lib/loadsave.php:816 ../lib/loadsave.php:847 msgid "... not found" msgstr "... nicht gefunden" -#: ../lib/loadsave.php:887 +#: ../lib/loadsave.php:905 msgid "Empty pagename!" msgstr "Leerer Seitenname!" -#: ../lib/loadsave.php:897 ../lib/WikiTheme.php:686 +#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701 #, php-format msgid "'%s': Bad page name" msgstr "»%s«: Ungültiger Seitenname" -#: ../lib/loadsave.php:903 ../lib/loadsave.php:1543 ../lib/PageType.php:136 -#: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73 -#: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:155 +#: ../lib/loadsave.php:921 ../lib/loadsave.php:1557 ../lib/PageType.php:163 +#: ../lib/plugin/InterWikiSearch.php:56 ../lib/plugin/WantedPagesOld.php:77 +#: ../lib/plugin/WantedPages.php:56 ../themes/default/templates/info.tmpl:155 #: ../themes/default/templates/info.tmpl:156 #: ../themes/MonoBook/templates/info.tmpl:161 #: ../themes/MonoBook/templates/info.tmpl:162 msgid "InterWikiMap" msgstr "InterWikiListe" -#: ../lib/loadsave.php:960 +#: ../lib/loadsave.php:975 #, php-format msgid "from %s" msgstr "von %s" -#: ../lib/loadsave.php:969 ../lib/MailNotify.php:304 -#: ../lib/plugin/RecentChanges.php:137 +#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313 +#: ../lib/plugin/RecentChanges.php:150 msgid "New page" msgstr "Neue Seite" -#: ../lib/loadsave.php:977 +#: ../lib/loadsave.php:992 msgid "has edit conflicts - overwriting anyway" msgstr "" "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben" -#: ../lib/loadsave.php:986 +#: ../lib/loadsave.php:1000 msgid "keep old" msgstr "" -#: ../lib/loadsave.php:988 +#: ../lib/loadsave.php:1002 msgid "has edit conflicts - skipped" msgstr "hat unauflösbare Konflikte beim Speichern - übersprungen" -#: ../lib/loadsave.php:997 +#: ../lib/loadsave.php:1010 #, php-format msgid "content is identical to current version %d - no new revision created" msgstr "" "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version " "erzeugt" -#: ../lib/loadsave.php:1011 +#: ../lib/loadsave.php:1025 #, php-format msgid "- saved to database as version %d" msgstr "- in der Datenbank gespeichert als Version %d." -#: ../lib/loadsave.php:1017 ../lib/loadsave.php:1283 +#: ../lib/loadsave.php:1031 ../lib/loadsave.php:1300 #, php-format msgid "MIME file %s" msgstr "MIME-Datei %s" -#: ../lib/loadsave.php:1018 ../lib/loadsave.php:1294 +#: ../lib/loadsave.php:1032 ../lib/loadsave.php:1311 #, php-format msgid "Serialized file %s" msgstr "Serialisierte Datei %s" -#: ../lib/loadsave.php:1019 ../lib/loadsave.php:1316 +#: ../lib/loadsave.php:1033 ../lib/loadsave.php:1332 #, php-format msgid "plain file %s" msgstr "Nur-Text-Datei %s" @@ -982,188 +982,188 @@ # This translation gives the general idea of the action to be performed, # but the text must be brief enough to fit inside a button: # "widersprechende Änderungen Zusammenfügen und die ergebende Seite Bearbeiten" -#: ../lib/loadsave.php:1026 ../lib/plugin/SyncWiki.php:268 +#: ../lib/loadsave.php:1040 ../lib/plugin/SyncWiki.php:276 msgid "Merge Edit" msgstr "Zusammenfügen Bearbeiten" -#: ../lib/loadsave.php:1032 +#: ../lib/loadsave.php:1046 msgid "Restore Anyway" msgstr "Ungeprüft überschreiben" -#: ../lib/loadsave.php:1040 +#: ../lib/loadsave.php:1054 msgid "Overwrite All" msgstr "" -#: ../lib/loadsave.php:1047 +#: ../lib/loadsave.php:1061 msgid " Sorry, cannot merge." msgstr " Konnte leider nicht automatisch einpflegen." -#: ../lib/loadsave.php:1070 +#: ../lib/loadsave.php:1084 #, fuzzy msgid "Revert: missing required version argument" msgstr "Parameter version muß angegeben werden" -#: ../lib/loadsave.php:1077 +#: ../lib/loadsave.php:1091 #, fuzzy msgid "No revert: no page content" msgstr "leerer Seiteninalt" -#: ../lib/loadsave.php:1082 +#: ../lib/loadsave.php:1096 #, fuzzy msgid "No revert: same version page" msgstr "selbe Version der Seite" -#: ../lib/loadsave.php:1087 +#: ../lib/loadsave.php:1101 #, fuzzy msgid "Revert cancelled" msgstr "Abgebrochen" -#: ../lib/loadsave.php:1096 ../lib/plugin/PasswordReset.php:102 -#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116 -#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141 -#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162 -#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197 -#: ../lib/plugin/WikiAdminRename.php:210 -#: ../lib/plugin/WikiAdminSearchReplace.php:187 -#: ../lib/plugin/WikiAdminSetAcl.php:197 +#: ../lib/loadsave.php:1110 ../lib/plugin/PasswordReset.php:109 +#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120 +#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148 +#: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168 +#: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204 +#: ../lib/plugin/WikiAdminRename.php:215 +#: ../lib/plugin/WikiAdminSearchReplace.php:194 +#: ../lib/plugin/WikiAdminSetAcl.php:204 #: ../themes/default/templates/info.tmpl:129 msgid "Yes" msgstr "Ja" -#: ../lib/loadsave.php:1098 ../lib/plugin/PasswordReset.php:105 -#: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113 -#: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85 -#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154 -#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176 -#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220 -#: ../lib/plugin/WikiAdminRename.php:233 -#: ../lib/plugin/WikiAdminSearchReplace.php:199 -#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210 -#: ../lib/plugin/WikiAdminSetExternal.php:131 -#: ../lib/plugin/WikiAdminUtils.php:292 ../lib/plugin/WikiFormRich.php:307 -#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:791 +#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:112 +#: ../lib/plugin/PasswordReset.php:156 ../lib/plugin/TranslateText.php:117 +#: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92 +#: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160 +#: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181 +#: ../lib/plugin/WikiAdminPurge.php:161 ../lib/plugin/WikiAdminRemove.php:226 +#: ../lib/plugin/WikiAdminRename.php:238 +#: ../lib/plugin/WikiAdminSearchReplace.php:206 +#: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216 +#: ../lib/plugin/WikiAdminSetExternal.php:137 +#: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313 +#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803 #: ../themes/default/templates/login.tmpl:85 #: ../themes/default/templates/userprefs.tmpl:290 #: ../themes/fusionforge/templates/userprefs.tmpl:390 msgid "Cancel" msgstr "Abbrechen" -#: ../lib/loadsave.php:1112 +#: ../lib/loadsave.php:1126 #, php-format msgid "revert to version %d" msgstr "Speichere Version %d zurück." -#: ../lib/loadsave.php:1119 +#: ../lib/loadsave.php:1133 #, php-format msgid "Revert: %s" msgstr "Zurückspeichern: %s" -#: ../lib/loadsave.php:1120 +#: ../lib/loadsave.php:1134 #, php-format msgid "- version %d saved to database as version %d" msgstr "- version %d in der Datenbank gespeichert als Version %d." -#: ../lib/loadsave.php:1138 ../lib/WikiGroup.php:838 +#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:882 #, php-format msgid "%s: not defined" msgstr "%s: nicht definiert" -#: ../lib/loadsave.php:1148 +#: ../lib/loadsave.php:1163 msgid "Default InterWiki map file not loaded." msgstr "Standard-Datei der InterWikiListe nicht geladen." -#: ../lib/loadsave.php:1155 ../lib/PageType.php:298 +#: ../lib/loadsave.php:1170 ../lib/PageType.php:330 #, php-format msgid "Loading InterWikiMap from external file %s." msgstr "Die InterWikiListe wird von der externen Datei %s geladen." -#: ../lib/loadsave.php:1331 ../lib/loadsave.php:1344 +#: ../lib/loadsave.php:1349 ../lib/loadsave.php:1363 msgid "Skipping" msgstr "Übersprungen" -#: ../lib/loadsave.php:1443 +#: ../lib/loadsave.php:1464 #, php-format msgid "Empty or not existing source. Unable to load: %s" msgstr "" -#: ../lib/loadsave.php:1450 +#: ../lib/loadsave.php:1468 #, php-format msgid "Bad file type: %s" msgstr "Ungültiger Dateityp: %s" -#: ../lib/loadsave.php:1467 +#: ../lib/loadsave.php:1482 #, php-format msgid "Loading '%s'" msgstr "»%s« wird geladen" -#: ../lib/loadsave.php:1499 +#: ../lib/loadsave.php:1514 msgid "Loading up virgin wiki" msgstr "Lade neue Seiten in das frische Wiki" -#: ../lib/loadsave.php:1555 +#: ../lib/loadsave.php:1569 msgid "No uploaded file to upload?" msgstr "Keine Datei zum Hochladen?" -#: ../lib/loadsave.php:1558 +#: ../lib/loadsave.php:1572 #, php-format msgid "Uploading %s" msgstr "%s wird hochgeladen" -#: ../lib/MailNotify.php:202 +#: ../lib/MailNotify.php:210 #, php-format msgid "PageChange Notification of %s" msgstr "SeitenÄnderung Benachrichtigung von %s" -#: ../lib/MailNotify.php:243 +#: ../lib/MailNotify.php:251 #, php-format msgid "sent to %s" msgstr "an %s gesendet" -#: ../lib/MailNotify.php:249 +#: ../lib/MailNotify.php:257 #, php-format msgid "Error: Couldn't send %s to %s" msgstr "Fehler: Konnte nicht %s an %s senden" -#: ../lib/MailNotify.php:277 +#: ../lib/MailNotify.php:286 msgid "Page change" msgstr "Seiten Änderung" -#: ../lib/MailNotify.php:300 +#: ../lib/MailNotify.php:309 #, fuzzy msgid "Page creation" msgstr "Seiten Version" -#: ../lib/MailNotify.php:307 +#: ../lib/MailNotify.php:316 #, fuzzy, php-format msgid "Created by: %s" msgstr "Erzeugen: %s" -#: ../lib/MailNotify.php:309 +#: ../lib/MailNotify.php:318 #, php-format msgid "Summary: %s" msgstr "Zusammenfassung: %s" -#: ../lib/MailNotify.php:319 +#: ../lib/MailNotify.php:329 #, fuzzy, php-format msgid "Renamed by: %s" msgstr "umbenannt von %s" -#: ../lib/MailNotify.php:320 +#: ../lib/MailNotify.php:330 #, php-format msgid "Page rename %s to %s" msgstr "Seite »%s« nach umbenennen »%s«" -#: ../lib/MailNotify.php:356 +#: ../lib/MailNotify.php:368 #, php-format msgid "User %s removed page %s" msgstr "Seite gelöscht %s von Benutzer %s" -#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113 -#: ../lib/WikiUserNew.php:1780 +#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 +#: ../lib/WikiUserNew.php:1857 msgid "E-mail address confirmation" msgstr "E-Mail Bestätigung" -#: ../lib/MailNotify.php:395 +#: ../lib/MailNotify.php:409 #, php-format msgid "" "Someone, probably you from IP address %s, has registered an\n" @@ -1178,277 +1178,277 @@ "will expire at %s." msgstr "" -#: ../lib/main.php:101 ../lib/WikiDB.php:1005 +#: ../lib/main.php:111 ../lib/WikiDB.php:1067 msgid "Optimizing database" msgstr "Datenbank wird optimiert" -#: ../lib/main.php:471 +#: ../lib/main.php:492 msgid "FORBIDDEN" msgstr "VERBOTEN" -#: ../lib/main.php:472 ../lib/main.php:482 +#: ../lib/main.php:493 ../lib/main.php:503 msgid "ANON" msgstr "ANON" -#: ../lib/main.php:473 +#: ../lib/main.php:494 msgid "BOGO" msgstr "BOGO" -#: ../lib/main.php:474 +#: ../lib/main.php:495 msgid "USER" msgstr "BENUTZER" -#: ../lib/main.php:475 +#: ../lib/main.php:496 msgid "ADMIN" msgstr "ADMIN" -#: ../lib/main.php:476 +#: ../lib/main.php:497 msgid "UNOBTAINABLE" msgstr "UNERREICHBAR" -#: ../lib/main.php:504 ../lib/main.php:523 +#: ../lib/main.php:526 ../lib/main.php:545 #, php-format msgid "%s is disallowed on this wiki." msgstr "»%s« ist auf diesem Wiki nicht zugelassen." -#: ../lib/main.php:512 +#: ../lib/main.php:534 msgid "authenticated" msgstr "authentifizierten" -#: ../lib/main.php:512 +#: ../lib/main.php:534 msgid "not authenticated" msgstr "nicht authentifizierten" -#: ../lib/main.php:514 +#: ../lib/main.php:536 msgid "Missing PagePermission:" msgstr "Fehlende Zugriffsberechtigung:" # Missing PagePermission:| access | pagename -#: ../lib/main.php:513 +#: ../lib/main.php:535 #, php-format msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)." msgstr "" "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht " "zugelassen." -#: ../lib/main.php:531 +#: ../lib/main.php:552 #, php-format msgid "You must sign in to %s." msgstr "Sie müssen sich anmelden %s." -#: ../lib/main.php:541 +#: ../lib/main.php:561 #, php-format msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:543 ../lib/plugin/PluginManager.php:58 +#: ../lib/main.php:562 ../lib/plugin/PluginManager.php:61 #, php-format msgid "You must be an administrator to %s." msgstr "Sie müssen Administratorrechte haben %s." -#: ../lib/main.php:557 +#: ../lib/main.php:577 msgid "view this page" msgstr "um diese Seite anzuzeigen" -#: ../lib/main.php:558 +#: ../lib/main.php:578 msgid "diff this page" msgstr "um von dieser Seite die Änderungen anzuzeigen" -#: ../lib/main.php:559 +#: ../lib/main.php:579 msgid "dump html pages" msgstr "um von diesem Wiki HTML-Dateien lokal abzuspeichern" -#: ../lib/main.php:560 +#: ../lib/main.php:580 msgid "dump serial pages" msgstr "um von diesem Wiki die Seiten lokal abzuspeichern" -#: ../lib/main.php:561 +#: ../lib/main.php:581 msgid "edit this page" msgstr "um diese Seite zu bearbeiten" -#: ../lib/main.php:562 +#: ../lib/main.php:582 msgid "rename this page" msgstr "um diese Seite umzubennen" -#: ../lib/main.php:563 +#: ../lib/main.php:583 msgid "revert to a previous version of this page" msgstr "Zurückspeichern einer älteren Version dieser Seite." -#: ../lib/main.php:564 +#: ../lib/main.php:584 msgid "create this page" msgstr "um diese Seite zu erzeugen" -#: ../lib/main.php:565 +#: ../lib/main.php:585 msgid "load files into this wiki" msgstr "um Seiten in dieses Wiki zu laden" -#: ../lib/main.php:566 +#: ../lib/main.php:586 msgid "lock this page" msgstr "um diese Seite zu sperren" -#: ../lib/main.php:567 +#: ../lib/main.php:587 msgid "purge this page" msgstr "um diese Seite endgültig zu löschen" -#: ../lib/main.php:568 +#: ../lib/main.php:588 msgid "remove this page" msgstr "um diese Seite zu löschen" -#: ../lib/main.php:569 +#: ../lib/main.php:589 msgid "unlock this page" msgstr "um diese Seite zu entsperren" -#: ../lib/main.php:570 +#: ../lib/main.php:590 msgid "upload a zip dump" msgstr "um einen ZIP-Speicherauszug in dieses Wiki zu laden" # (verify=verwirklichen, in die Tat umsetzen, durch- oder ausführen) -#: ../lib/main.php:571 +#: ../lib/main.php:591 msgid "verify the current action" msgstr "um die gegenwärtige Aktion durchzuführen" -#: ../lib/main.php:572 +#: ../lib/main.php:592 msgid "view the source of this page" msgstr "um den Quelltext dieser Seiten anzusehen" -#: ../lib/main.php:573 +#: ../lib/main.php:593 msgid "access this wiki via XML-RPC" msgstr "um via XML-RPC auf dieses Wiki zuzugreifen" -#: ../lib/main.php:574 +#: ../lib/main.php:594 msgid "access this wiki via SOAP" msgstr "um via SOAP auf dieses Wiki zuzugreifen" -#: ../lib/main.php:575 +#: ../lib/main.php:595 msgid "download a zip dump from this wiki" msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen" -#: ../lib/main.php:576 +#: ../lib/main.php:596 msgid "download a html zip dump from this wiki" msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen" -#: ../lib/main.php:582 +#: ../lib/main.php:602 msgid "use" msgstr "benutze" -#: ../lib/main.php:600 +#: ../lib/main.php:621 msgid "Browsing pages" msgstr "Das Durchblättern der Seiten dieses Wikis" -#: ../lib/main.php:601 +#: ../lib/main.php:622 msgid "Diffing pages" msgstr "Die Inhalts-Differenz-Seiten dieses Wikis" -#: ../lib/main.php:602 +#: ../lib/main.php:623 msgid "Dumping html pages" msgstr "Die Speicherung von Wiki Seiten als HTML-Dateien" -#: ../lib/main.php:603 +#: ../lib/main.php:624 msgid "Dumping serial pages" msgstr "Die Speicherung von Wiki Seiten als Dateien" -#: ../lib/main.php:604 +#: ../lib/main.php:625 msgid "Editing pages" msgstr "Ändern in diesem Wiki" -#: ../lib/main.php:605 +#: ../lib/main.php:626 msgid "Reverting to a previous version of pages" msgstr "Zurückspeichern einer älteren Version" -#: ../lib/main.php:606 +#: ../lib/main.php:627 msgid "Creating pages" msgstr "Neue Seiten erzeugen" -#: ../lib/main.php:607 +#: ../lib/main.php:628 msgid "Loading files" msgstr "Dateien hinaufladen" -#: ../lib/main.php:608 +#: ../lib/main.php:629 msgid "Locking pages" msgstr "Seiten sperren" -#: ../lib/main.php:609 +#: ../lib/main.php:630 msgid "Purging pages" msgstr "Das Durchblättern der Seiten dieses Wikis" -#: ../lib/main.php:610 +#: ../lib/main.php:631 msgid "Removing pages" msgstr "Die Seitenlöschung in diesem Wiki" -#: ../lib/main.php:611 +#: ../lib/main.php:632 msgid "Unlocking pages" msgstr "Die Seitenfreigabe in diesem Wiki" -#: ../lib/main.php:612 +#: ../lib/main.php:633 msgid "Uploading zip dumps" msgstr "Das Hochladen von ZIP-Dumps in diesem Wiki" -#: ../lib/main.php:613 +#: ../lib/main.php:634 msgid "Verify the current action" msgstr "Bestätigen Sie die gegenwärtige Aktion" -#: ../lib/main.php:614 +#: ../lib/main.php:635 msgid "Viewing the source of pages" msgstr "Die Quelltextansicht der Seiten in diesem Wiki" -#: ../lib/main.php:615 +#: ../lib/main.php:636 msgid "XML-RPC access" msgstr "XML-RPC Zugriff" -#: ../lib/main.php:616 +#: ../lib/main.php:637 msgid "SOAP access" msgstr "SOAP-Zugriff" -#: ../lib/main.php:617 +#: ../lib/main.php:638 msgid "Downloading zip dumps" msgstr "Das Herunterladen aller Wiki-Seiten als gezippte Datei" -#: ../lib/main.php:618 +#: ../lib/main.php:639 msgid "Downloading html zip dumps" msgstr "" "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei" -#: ../lib/main.php:794 +#: ../lib/main.php:819 #, php-format msgid "%s: action forwarded to a moderator." msgstr "" -#: ../lib/main.php:797 +#: ../lib/main.php:822 msgid "This action requires moderator approval. Please be patient." msgstr "" -#: ../lib/main.php:802 +#: ../lib/main.php:827 msgid "You must wait for moderator approval." msgstr "Sie müssen auf die Zustimmung des Moderators warten." -#: ../lib/main.php:822 ../lib/plugin/ModeratedPage.php:309 +#: ../lib/main.php:845 ../lib/plugin/ModeratedPage.php:319 #, php-format msgid "%s: Bad action" msgstr "%s: Ungültige Aktion" -#: ../lib/main.php:839 +#: ../lib/main.php:863 msgid "Fatal PhpWiki Error" msgstr "Fataler PhpWiki-Fehler" -#: ../lib/main.php:1090 +#: ../lib/main.php:1119 msgid "Chown" msgstr "Chown" -#: ../lib/main.php:1094 +#: ../lib/main.php:1124 msgid "SetAcl" msgstr "AclSetzen" -#: ../lib/main.php:1098 +#: ../lib/main.php:1129 msgid "SetAclSimple" msgstr "" -#: ../lib/main.php:1102 ../lib/PagePerm.php:185 -#: ../lib/plugin/WikiAdminRename.php:144 ../lib/plugin/WikiAdminRename.php:270 +#: ../lib/main.php:1134 ../lib/PagePerm.php:190 +#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277 #: ../themes/fusionforge/templates/actionbar.tmpl:118 msgid "Rename" msgstr "Umbenennen" -#: ../lib/main.php:1106 ../lib/main.php:1111 ../lib/plugin/PageDump.php:56 +#: ../lib/main.php:1139 ../lib/main.php:1144 ../lib/plugin/PageDump.php:57 #: ../themes/Crao/templates/actionbar.tmpl:31 #: ../themes/default/templates/actionbar.tmpl:37 #: ../themes/MonoBook/templates/actionbar.tmpl:77 @@ -1460,13 +1460,13 @@ msgid "PageDump" msgstr "SeiteSpeichern" -#: ../lib/main.php:1129 ../lib/plugin/FullTextSearch.php:46 -#: ../lib/plugin/WantedPagesOld.php:126 +#: ../lib/main.php:1164 ../lib/plugin/FullTextSearch.php:47 +#: ../lib/plugin/WantedPagesOld.php:130 msgid "FullTextSearch" msgstr "VolltextSuche" -#: ../lib/main.php:1137 ../lib/plugin/RecentChanges.php:808 -#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1468 +#: ../lib/main.php:1170 ../lib/plugin/RecentChanges.php:900 +#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522 #: ../themes/Crao/templates/navbar.tmpl:2 #: ../themes/Crao/templates/navbar.tmpl:6 #: ../themes/Crao/templates/navbar.tmpl:49 @@ -1480,132 +1480,132 @@ msgid "TitleSearch" msgstr "TitelSuche" -#: ../lib/main.php:1311 ../lib/main.php:1324 ../lib/Request.php:821 +#: ../lib/main.php:1366 ../lib/main.php:1379 ../lib/Request.php:870 #, php-format msgid "%s is not writable." msgstr "%s is nicht änderbar." -#: ../lib/main.php:1312 +#: ../lib/main.php:1367 msgid "The session.save_path directory" msgstr "Das session.save_path Verzeichnis" -#: ../lib/main.php:1314 ../lib/Request.php:823 +#: ../lib/main.php:1369 ../lib/Request.php:872 #, php-format msgid "Please ensure that %s is writable, or redefine %s in config/config.ini." msgstr "" "Bitte überprüfen Sie, dass %s änderbar ist, oder ändern Sie %s in config/" "config.ini." -#: ../lib/main.php:1315 +#: ../lib/main.php:1370 #, php-format msgid "the session.save_path directory '%s'" msgstr "das session.save_path Verzeichnis »%s«" -#: ../lib/main.php:1319 +#: ../lib/main.php:1374 #, php-format msgid "Attempting to use the directory '%s' instead." msgstr "Versuche stattdessen das Verzeichnis »%s« zu verwenden." -#: ../lib/main.php:1326 +#: ../lib/main.php:1381 msgid "Users will not be able to sign in." msgstr "Benutzer werden sich nicht anmelden können." -#: ../lib/main.php:1338 +#: ../lib/main.php:1393 msgid "Your PHP version is too old. You must have at least PHP 4.3.9" msgstr "" -#: ../lib/PageList.php:92 +#: ../lib/PageList.php:98 #, php-format msgid "Sort by %s" msgstr "Sortiere nach %s" -#: ../lib/PageList.php:119 +#: ../lib/PageList.php:126 msgid "reverse" msgstr "umdrehen" -#: ../lib/PageList.php:130 +#: ../lib/PageList.php:137 msgid "Click to reverse sort order" msgstr "Klicken Sie um die Reihenfolge umzudrehen" -#: ../lib/PageList.php:137 +#: ../lib/PageList.php:144 #, php-format msgid "Click to sort by %s" msgstr "Sortiere nach %s" -#: ../lib/PageList.php:273 +#: ../lib/PageList.php:300 msgid "Click to de-/select all pages" msgstr "Klicken Sie um alle/keine Seiten auszuwählen" -#: ../lib/PageList.php:348 ../lib/plugin/IncludePage.php:193 +#: ../lib/PageList.php:394 ../lib/plugin/IncludePage.php:207 #, php-format msgid " ... first %d bytes" msgstr " ... erste %d Bytes" -#: ../lib/PageList.php:355 +#: ../lib/PageList.php:401 #, php-format msgid " ... around %s" msgstr "... cirka %s" -#: ../lib/PageList.php:410 ../lib/plugin/AppendText.php:55 +#: ../lib/PageList.php:458 ../lib/plugin/AppendText.php:59 #, php-format msgid "%s not found" msgstr "%s nicht gefunden" -#: ../lib/PageList.php:528 ../lib/plugin/WikiAdminSetAcl.php:242 +#: ../lib/PageList.php:610 ../lib/plugin/WikiAdminSetAcl.php:249 #: ../themes/default/templates/info.tmpl:70 #: ../themes/MonoBook/templates/info.tmpl:83 #, php-format msgid "page permission inherited from %s" msgstr "Zugriffsrecht geerbt von %s" -#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:244 +#: ../lib/PageList.php:612 ../lib/plugin/WikiAdminSetAcl.php:251 #: ../themes/default/templates/info.tmpl:72 #: ../themes/MonoBook/templates/info.tmpl:85 msgid "individual page permission" msgstr "individuelles Zugriffsrecht" -#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:246 +#: ../lib/PageList.php:614 ../lib/plugin/WikiAdminSetAcl.php:252 #: ../themes/default/templates/info.tmpl:74 #: ../themes/MonoBook/templates/info.tmpl:87 msgid "default page permission" msgstr "Vorgabe Zugriffsrecht" -#: ../lib/PageList.php:656 ../lib/plugin/FullTextSearch.php:115 +#: ../lib/PageList.php:742 ../lib/plugin/FullTextSearch.php:119 msgid "<no matches>" msgstr "<nichts gefunden>" -#: ../lib/PageList.php:1161 ../lib/plugin/FullTextSearch.php:86 -#: ../lib/plugin/WikiAdminSearchReplace.php:178 +#: ../lib/PageList.php:1276 ../lib/plugin/FullTextSearch.php:90 +#: ../lib/plugin/WikiAdminSearchReplace.php:185 msgid "Content" msgstr "Inhalt" -#: ../lib/PageList.php:1173 ../lib/plugin/WikiAdminChmod.php:135 -#: ../lib/plugin/WikiAdminSetAcl.php:191 +#: ../lib/PageList.php:1288 ../lib/plugin/WikiAdminChmod.php:142 +#: ../lib/plugin/WikiAdminSetAcl.php:198 msgid "Permission" msgstr "Zugriffsrecht" -#: ../lib/PageList.php:1175 ../lib/plugin/WikiAdminSetAcl.php:193 -#: ../lib/plugin/WikiAdminSetAcl.php:248 +#: ../lib/PageList.php:1290 ../lib/plugin/WikiAdminSetAcl.php:200 +#: ../lib/plugin/WikiAdminSetAcl.php:254 #: ../themes/default/templates/info.tmpl:137 #: ../themes/MonoBook/templates/info.tmpl:143 msgid "ACL" msgstr "ACL" -#: ../lib/PageList.php:1177 +#: ../lib/PageList.php:1292 msgid "All" msgstr "" -#: ../lib/PageList.php:1181 ../themes/default/templates/info.tmpl:54 +#: ../lib/PageList.php:1296 ../themes/default/templates/info.tmpl:54 #: ../themes/MonoBook/templates/info.tmpl:68 msgid "Last Modified" msgstr "Zuletzt geändert" -#: ../lib/PageList.php:1183 ../themes/default/templates/info.tmpl:113 +#: ../lib/PageList.php:1298 ../themes/default/templates/info.tmpl:113 #: ../themes/MonoBook/templates/info.tmpl:125 msgid "Hits" msgstr "Treffer" -#: ../lib/PageList.php:1185 ../themes/Crao/templates/editpage.tmpl:35 +#: ../lib/PageList.php:1300 ../themes/Crao/templates/editpage.tmpl:35 #: ../themes/default/templates/editpage.tmpl:37 #: ../themes/default/templates/info.tmpl:108 #: ../themes/fusionforge/templates/editpage.tmpl:35 @@ -1614,30 +1614,30 @@ msgid "Size" msgstr "Größe" -#: ../lib/PageList.php:1188 ../themes/default/templates/info.tmpl:56 +#: ../lib/PageList.php:1303 ../themes/default/templates/info.tmpl:56 #: ../themes/MonoBook/templates/info.tmpl:70 msgid "Last Summary" msgstr "Letzte Zusammenfassung" -#: ../lib/PageList.php:1190 ../lib/plugin/AuthorHistory.php:109 -#: ../lib/plugin/AuthorHistory.php:152 +#: ../lib/PageList.php:1305 ../lib/plugin/AuthorHistory.php:114 +#: ../lib/plugin/AuthorHistory.php:156 msgid "Version" msgstr "Version" -#: ../lib/PageList.php:1193 ../themes/default/templates/info.tmpl:55 +#: ../lib/PageList.php:1308 ../themes/default/templates/info.tmpl:55 #: ../themes/MonoBook/templates/info.tmpl:69 msgid "Last Author" msgstr "Letzter Autor" -#: ../lib/PageList.php:1195 ../lib/WikiGroup.php:36 +#: ../lib/PageList.php:1310 ../lib/WikiGroup.php:37 msgid "Owner" msgstr "Besitzer" -#: ../lib/PageList.php:1197 ../lib/WikiGroup.php:37 +#: ../lib/PageList.php:1312 ../lib/WikiGroup.php:38 msgid "Creator" msgstr "Erzeuger" -#: ../lib/PageList.php:1203 ../themes/Crao/templates/editpage.tmpl:59 +#: ../lib/PageList.php:1318 ../themes/Crao/templates/editpage.tmpl:59 #: ../themes/default/templates/editpage.tmpl:78 #: ../themes/default/templates/info.tmpl:124 #: ../themes/fusionforge/templates/editpage.tmpl:62 @@ -1646,129 +1646,129 @@ msgid "Locked" msgstr "Gesperrt" -#: ../lib/PageList.php:1204 +#: ../lib/PageList.php:1319 msgid "locked" msgstr "gesperrt" -#: ../lib/PageList.php:1206 ../themes/fusionforge/templates/editpage.tmpl:67 +#: ../lib/PageList.php:1321 ../themes/fusionforge/templates/editpage.tmpl:67 msgid "External" msgstr "Externe" -#: ../lib/PageList.php:1207 +#: ../lib/PageList.php:1322 msgid "external" msgstr "externe" -#: ../lib/PageList.php:1210 +#: ../lib/PageList.php:1325 msgid "Minor Edit" msgstr "Kleinere Änderung" -#: ../lib/PageList.php:1210 +#: ../lib/PageList.php:1325 msgid "minor" msgstr "kleinere" -#: ../lib/PageList.php:1212 ../themes/default/templates/info.tmpl:104 +#: ../lib/PageList.php:1327 ../themes/default/templates/info.tmpl:104 #: ../themes/MonoBook/templates/info.tmpl:116 msgid "Markup" msgstr "Quelltext" -#: ../lib/PageList.php:1381 ../lib/PageList.php:1388 ../lib/PageList.php:1394 -#: ../lib/WikiDB/backend.php:547 ../lib/WikiDB/backend.php:553 +#: ../lib/PageList.php:1500 ../lib/PageList.php:1507 ../lib/PageList.php:1512 +#: ../lib/WikiDB/backend.php:574 ../lib/WikiDB/backend.php:579 msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#: ../lib/PageList.php:1503 ../lib/plugin/WantedPagesOld.php:170 +#: ../lib/PageList.php:1627 ../lib/plugin/WantedPagesOld.php:175 #, php-format msgid "Columns: %s." msgstr "Spalten: %s." -#: ../lib/PagePerm.php:186 +#: ../lib/PagePerm.php:191 msgid "SearchReplace" msgstr "Suchen & Ersetzen" -#: ../lib/PagePerm.php:316 +#: ../lib/PagePerm.php:327 msgid "List this page and all subpages" msgstr "Auflistung aller Seiten und Unterseiten" -#: ../lib/PagePerm.php:317 +#: ../lib/PagePerm.php:328 msgid "View this page and all subpages" msgstr "Anzeige aller Seiten und Unterseiten" -#: ../lib/PagePerm.php:318 +#: ../lib/PagePerm.php:329 msgid "Edit this page and all subpages" msgstr "Bearbeiten aller Seiten und Unterseiten" # Erzeugen?? -#: ../lib/PagePerm.php:319 +#: ../lib/PagePerm.php:330 msgid "Create a new (sub)page" msgstr "Erzeuge eine neue (Unter)Seite" -#: ../lib/PagePerm.php:320 +#: ../lib/PagePerm.php:331 msgid "Download page contents" msgstr "Runterladen der Seite" -#: ../lib/PagePerm.php:321 +#: ../lib/PagePerm.php:332 msgid "Change page attributes" msgstr "Ändern von Eigenschaften" -#: ../lib/PagePerm.php:322 +#: ../lib/PagePerm.php:333 msgid "Remove this page" msgstr "Löschen der Seite" -#: ../lib/PagePerm.php:323 +#: ../lib/PagePerm.php:334 msgid "Purge this page" msgstr "Lösche diese Seite endgültig" -#: ../lib/PagePerm.php:353 +#: ../lib/PagePerm.php:366 #, php-format msgid "Unsupported ACL access type %s ignored." msgstr "Nicht unterstützter ACL Zugiffsmodus %s ignoriert." -#: ../lib/PagePerm.php:578 +#: ../lib/PagePerm.php:601 msgid "Access" msgstr "Zugriff" -#: ../lib/PagePerm.php:580 +#: ../lib/PagePerm.php:603 msgid "Group/User" msgstr "Gruppe/Benutzer" -#: ../lib/PagePerm.php:581 +#: ../lib/PagePerm.php:604 msgid "Grant" msgstr "Erlaube" -#: ../lib/PagePerm.php:582 +#: ../lib/PagePerm.php:605 msgid "Del/+" msgstr "Lö/+" -#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71 -#: ../lib/plugin/WikiAdminSetAcl.php:250 +#: ../lib/PagePerm.php:606 ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "Beschreibung" -#: ../lib/PagePerm.php:604 +#: ../lib/PagePerm.php:627 msgid "Add this ACL" msgstr "Füge diese ACL hinzu" -#: ../lib/PagePerm.php:628 +#: ../lib/PagePerm.php:651 msgid "Allow / Deny" msgstr "Erlaube / Sperre" -#: ../lib/PagePerm.php:640 +#: ../lib/PagePerm.php:663 msgid "Delete this ACL" msgstr "Lösche diese ACL" -#: ../lib/PagePerm.php:666 +#: ../lib/PagePerm.php:689 msgid "add " msgstr "hinzufügen " -#: ../lib/PagePerm.php:670 +#: ../lib/PagePerm.php:693 msgid "Check to add this ACL" msgstr "Anklicken um diese ACL hinzuzufügen" -#: ../lib/PageType.php:142 +#: ../lib/PageType.php:169 msgid "WARNING: InterWikiMap page is unlocked, so not using those links." msgstr "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert." -#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:840 +#: ../lib/PageType.php:289 ../lib/PageType.php:292 ../lib/stdlib.php:854 #: ../themes/default/templates/navbar.tmpl:5 #: ../themes/default/templates/navbar.tmpl:7 #: ../themes/fusionforge/templates/actionbar.tmpl:14 @@ -1784,295 +1784,295 @@ msgid "Discussion" msgstr "Diskussion" -#: ../lib/PageType.php:396 +#: ../lib/PageType.php:439 msgid "Moniker" msgstr "Kurzname" -#: ../lib/PageType.php:397 +#: ../lib/PageType.php:440 msgid "InterWiki Address" msgstr "InterWiki-Adresse" -#: ../lib/plugin/AddComment.php:39 +#: ../lib/plugin/AddComment.php:40 msgid "AddComment" msgstr "NeuerKommentar" -#: ../lib/plugin/AddComment.php:43 +#: ../lib/plugin/AddComment.php:45 #, php-format msgid "Show and add comments for %s" msgstr "Kommentare für %s zeigen und hinzufügen" -#: ../lib/plugin/AddComment.php:73 ../lib/plugin/Chart.php:77 -#: ../lib/plugin/CreateBib.php:110 ../lib/plugin/CreateToc.php:378 -#: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:64 -#: ../lib/plugin/GoogleMaps.php:90 ../lib/plugin/GoogleMaps.php:93 -#: ../lib/plugin/IncludePage.php:78 ../lib/plugin/ModeratedPage.php:63 -#: ../lib/plugin/PageGroup.php:95 ../lib/plugin/SyncWiki.php:70 -#: ../lib/plugin/SyntaxHighlighter.php:126 ../lib/plugin/Template.php:108 -#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190 -#: ../lib/plugin/WikiForum.php:71 ../lib/plugin/WikiPoll.php:143 +#: ../lib/plugin/AddComment.php:77 ../lib/plugin/Chart.php:83 +#: ../lib/plugin/CreateBib.php:113 ../lib/plugin/CreateToc.php:400 +#: ../lib/plugin/FileInfo.php:65 ../lib/plugin/FileInfo.php:68 +#: ../lib/plugin/GoogleMaps.php:93 ../lib/plugin/GoogleMaps.php:96 +#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/ModeratedPage.php:69 +#: ../lib/plugin/PageGroup.php:101 ../lib/plugin/SyncWiki.php:74 +#: ../lib/plugin/SyntaxHighlighter.php:137 ../lib/plugin/Template.php:115 +#: ../lib/plugin/WikiFormRich.php:179 ../lib/plugin/WikiFormRich.php:196 +#: ../lib/plugin/WikiForum.php:75 ../lib/plugin/WikiPoll.php:149 #, php-format msgid "A required argument '%s' is missing." msgstr "Erforderliches Argument »%s« fehlt." -#: ../lib/plugin/AddComment.php:99 +#: ../lib/plugin/AddComment.php:103 msgid "Click to hide the comments" msgstr "Klicken um Kommentare zu verstecken" -#: ../lib/plugin/AddComment.php:102 +#: ../lib/plugin/AddComment.php:106 msgid "Click to display all comments" msgstr "Klicken um Kommentare anzuzeigen" -#: ../lib/plugin/AddComment.php:107 ../lib/plugin/CreateToc.php:492 +#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:515 msgid "Click to display" msgstr "Klicken um anzuzeigen" -#: ../lib/plugin/AddComment.php:109 +#: ../lib/plugin/AddComment.php:113 msgid "Comments" msgstr "Kommentare" -#: ../lib/plugin/AllPages.php:34 ../themes/MonoBook/templates/navbar.tmpl:75 +#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:75 #: ../themes/Sidebar/templates/navbar.tmpl:66 msgid "AllPages" msgstr "AlleSeiten" -#: ../lib/plugin/AllPages.php:38 +#: ../lib/plugin/AllPages.php:40 msgid "List all pages in this wiki." msgstr "Alle Seiten in diesem Wiki auflisten." -#: ../lib/plugin/AllPages.php:68 +#: ../lib/plugin/AllPages.php:72 #, php-format msgid "All pages in this wiki (%d total):" msgstr "Alle Seiten in diesem Wiki (%d insgesamt):" -#: ../lib/plugin/AllPages.php:74 +#: ../lib/plugin/AllPages.php:78 #, php-format msgid "List of user-created pages (%d total):" msgstr "Liste der Benutzer erzeugten Seiten (%d insgesamt):" -#: ../lib/plugin/AllPages.php:83 ../lib/plugin/LinkDatabase.php:81 +#: ../lib/plugin/AllPages.php:87 ../lib/plugin/LinkDatabase.php:91 #, php-format msgid "List of pages owned by [%s] (%d total):" msgstr "Liste der Seiten owned by [%s] (%d insgesamt):" -#: ../lib/plugin/AllPages.php:96 ../lib/plugin/LinkDatabase.php:88 +#: ../lib/plugin/AllPages.php:100 ../lib/plugin/LinkDatabase.php:98 #, php-format msgid "List of pages last edited by [%s] (%d total):" msgstr "Liste der Seiten last edited by [%s] (%d insgesamt):" -#: ../lib/plugin/AllPages.php:109 ../lib/plugin/LinkDatabase.php:95 +#: ../lib/plugin/AllPages.php:113 ../lib/plugin/LinkDatabase.php:105 #, php-format msgid "List of pages created by [%s] (%d total):" msgstr "Liste der Seiten erzeugt von [%s] (%d insgesamt):" -#: ../lib/plugin/AllPages.php:139 ../lib/plugin/AllUsers.php:102 +#: ../lib/plugin/AllPages.php:143 ../lib/plugin/AllUsers.php:107 #, php-format msgid "Elapsed time: %s s" msgstr "Dauer: %s s" -#: ../lib/plugin/AllUsers.php:37 +#: ../lib/plugin/AllUsers.php:38 msgid "AllUsers" msgstr "AlleBenutzer" -#: ../lib/plugin/AllUsers.php:41 +#: ../lib/plugin/AllUsers.php:43 msgid "List all once authenticated users." msgstr "Liste alle eingetragenen Benutzer." # (authentication=means verbürgt, beglaubigt, oder ganz einfach= durch # Nachweis berechtigte = authenticated User are in one simple term = # Benutzungsberechtigte oder auch Eingetragene Benutzer) -#: ../lib/plugin/AllUsers.php:80 +#: ../lib/plugin/AllUsers.php:85 #, php-format msgid "Authenticated users on this wiki (%d total):" msgstr "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):" -#: ../lib/plugin/AnalyseAccessLogSql.php:162 -#: ../lib/plugin/AnalyseAccessLogSql.php:197 +#: ../lib/plugin/AnalyseAccessLogSql.php:168 +#: ../lib/plugin/AnalyseAccessLogSql.php:205 msgid "0 - last minute" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:163 -#: ../lib/plugin/AnalyseAccessLogSql.php:198 +#: ../lib/plugin/AnalyseAccessLogSql.php:169 +#: ../lib/plugin/AnalyseAccessLogSql.php:206 msgid "1 - 1 minute to 1 hour" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:164 -#: ../lib/plugin/AnalyseAccessLogSql.php:199 +#: ../lib/plugin/AnalyseAccessLogSql.php:170 +#: ../lib/plugin/AnalyseAccessLogSql.php:207 msgid "2 - 1 hour to 1 day" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:165 -#: ../lib/plugin/AnalyseAccessLogSql.php:200 +#: ../lib/plugin/AnalyseAccessLogSql.php:171 +#: ../lib/plugin/AnalyseAccessLogSql.php:208 msgid "3 - 1 day to 1 week" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:166 -#: ../lib/plugin/AnalyseAccessLogSql.php:201 +#: ../lib/plugin/AnalyseAccessLogSql.php:172 +#: ../lib/plugin/AnalyseAccessLogSql.php:209 msgid "4 - 1 week to 1 month" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:167 -#: ../lib/plugin/AnalyseAccessLogSql.php:202 +#: ../lib/plugin/AnalyseAccessLogSql.php:173 +#: ../lib/plugin/AnalyseAccessLogSql.php:210 msgid "5 - 1 month to 1 year" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:168 -#: ../lib/plugin/AnalyseAccessLogSql.php:203 +#: ../lib/plugin/AnalyseAccessLogSql.php:174 +#: ../lib/plugin/AnalyseAccessLogSql.php:211 msgid "6 - more than 1 year" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:222 +#: ../lib/plugin/AnalyseAccessLogSql.php:231 msgid "referring_urls" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:223 +#: ../lib/plugin/AnalyseAccessLogSql.php:232 msgid "external_referers" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:224 +#: ../lib/plugin/AnalyseAccessLogSql.php:233 msgid "referring_domains" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:225 +#: ../lib/plugin/AnalyseAccessLogSql.php:234 msgid "remote_hosts" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:226 +#: ../lib/plugin/AnalyseAccessLogSql.php:235 msgid "users" msgstr "Benutzer" -#: ../lib/plugin/AnalyseAccessLogSql.php:227 +#: ../lib/plugin/AnalyseAccessLogSql.php:236 msgid "host_users" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:228 +#: ../lib/plugin/AnalyseAccessLogSql.php:237 msgid "search_bots" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:229 +#: ../lib/plugin/AnalyseAccessLogSql.php:238 msgid "search_bots_hits" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:231 +#: ../lib/plugin/AnalyseAccessLogSql.php:240 msgid "minutes" msgstr "Minuten" -#: ../lib/plugin/AnalyseAccessLogSql.php:232 +#: ../lib/plugin/AnalyseAccessLogSql.php:241 msgid "hours" msgstr "Stunden" -#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498 +#: ../lib/plugin/AnalyseAccessLogSql.php:242 ../lib/plugin/VisualWiki.php:520 msgid "days" msgstr "Tage" -#: ../lib/plugin/AnalyseAccessLogSql.php:234 +#: ../lib/plugin/AnalyseAccessLogSql.php:243 msgid "weeks" msgstr "Wochen" -#: ../lib/plugin/AnalyseAccessLogSql.php:252 +#: ../lib/plugin/AnalyseAccessLogSql.php:263 msgid "AnalyseAccessLogSql" msgstr "" -#: ../lib/plugin/AnalyseAccessLogSql.php:256 +#: ../lib/plugin/AnalyseAccessLogSql.php:268 msgid "Show summary information from the access log table." msgstr "Zeige Überblick über die Access LOG-Tabelle." -#: ../lib/plugin/AnalyseAccessLogSql.php:264 +#: ../lib/plugin/AnalyseAccessLogSql.php:277 msgid "The requested information is available only to Administrators." msgstr "Diese Information ist nur für Administratoren zugänglich." -#: ../lib/plugin/AnalyseAccessLogSql.php:267 +#: ../lib/plugin/AnalyseAccessLogSql.php:280 msgid "The SQL_ACCESS_LOG is not enabled." msgstr "SQL_ACCESS_LOG ist nicht aktiviert." -#: ../lib/plugin/AnalyseAccessLogSql.php:278 +#: ../lib/plugin/AnalyseAccessLogSql.php:291 #, php-format msgid "Unrecognised parameter 'mode=%s'" msgstr "Ungültiges Argument 'mode=%s'" # some empty DB field -#: ../lib/plugin/AnalyseAccessLogSql.php:297 -#: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411 -#: ../lib/plugin/WatchPage.php:57 +#: ../lib/plugin/AnalyseAccessLogSql.php:311 +#: ../lib/plugin/_BackendInfo.php:122 ../lib/plugin/SemanticSearch.php:420 +#: ../lib/plugin/WatchPage.php:62 msgid "<empty>" msgstr "<leer>" -#: ../lib/plugin/AppendText.php:37 ../lib/plugin/AppendText.php:79 +#: ../lib/plugin/AppendText.php:38 ../lib/plugin/AppendText.php:85 msgid "AppendText" msgstr "TextHinzufügen" -#: ../lib/plugin/AppendText.php:41 +#: ../lib/plugin/AppendText.php:43 msgid "Append text to any page in this wiki." msgstr "Füge Text zu einer Seite in diesem Wiki hinzu." -#: ../lib/plugin/AppendText.php:56 +#: ../lib/plugin/AppendText.php:60 msgid "Appending at the end." msgstr "Füge am Ende hinzu." -#: ../lib/plugin/AppendText.php:89 +#: ../lib/plugin/AppendText.php:95 #, php-format msgid "Page could not be updated. %s doesn't exist!" msgstr "Seite konnte nicht geändert werden. %s existiert nicht!" -#: ../lib/plugin/AppendText.php:123 +#: ../lib/plugin/AppendText.php:129 #, php-format msgid "AppendText to %s" msgstr "TextHinzufügen zu %s" -#: ../lib/plugin/AppendText.php:126 +#: ../lib/plugin/AppendText.php:132 msgid "Page successfully updated." msgstr "Datei erfolgreich geändert." -#: ../lib/plugin/AppendText.php:143 +#: ../lib/plugin/AppendText.php:149 #, php-format msgid "Go to %s." msgstr "Gehe zu %s." -#: ../lib/plugin/AsciiMath.php:48 +#: ../lib/plugin/AsciiMath.php:49 msgid "AsciiMath" msgstr "" -#: ../lib/plugin/AsciiMath.php:52 +#: ../lib/plugin/AsciiMath.php:54 msgid "Render ASCII Math as MathML" msgstr "" -#: ../lib/plugin/AsciiSVG.php:32 +#: ../lib/plugin/AsciiSVG.php:33 msgid "AsciiSVG" msgstr "" -#: ../lib/plugin/AsciiSVG.php:36 +#: ../lib/plugin/AsciiSVG.php:38 msgid "Render inline ASCII SVG" msgstr "" -#: ../lib/plugin/AtomFeed.php:32 +#: ../lib/plugin/AtomFeed.php:33 msgid "AtomFeed" msgstr "" -#: ../lib/plugin/AtomFeed.php:36 +#: ../lib/plugin/AtomFeed.php:38 msgid "Atom Aggregator Plugin" msgstr "" -#: ../lib/plugin/_AuthInfo.php:35 +#: ../lib/plugin/_AuthInfo.php:36 msgid "AuthInfo" msgstr "AuthentifizierungsInfo" -#: ../lib/plugin/_AuthInfo.php:39 +#: ../lib/plugin/_AuthInfo.php:41 msgid "Display general and user specific auth information." msgstr "" -#: ../lib/plugin/_AuthInfo.php:60 +#: ../lib/plugin/_AuthInfo.php:64 msgid "General Auth Settings" msgstr "Allgemeine Authentifizierungs-Einstellungen" -#: ../lib/plugin/_AuthInfo.php:95 +#: ../lib/plugin/_AuthInfo.php:99 #, php-format msgid "Personal Auth Settings for '%s'" msgstr "Spezielle Authentifizierungs-Einstellungen %s" -#: ../lib/plugin/_AuthInfo.php:97 +#: ../lib/plugin/_AuthInfo.php:101 msgid "No userid" msgstr "" -#: ../lib/plugin/AuthorHistory.php:63 ../themes/blog/templates/info.tmpl:3 +#: ../lib/plugin/AuthorHistory.php:64 ../themes/blog/templates/info.tmpl:3 #: ../themes/MonoBook/templates/actionbar.tmpl:75 #: ../themes/MonoBook/templates/info.tmpl:180 #: ../themes/Sidebar/templates/actionbar.tmpl:56 @@ -2080,7 +2080,7 @@ msgid "AuthorHistory" msgstr "AutorenProtokoll" -#: ../lib/plugin/AuthorHistory.php:67 +#: ../lib/plugin/AuthorHistory.php:69 #, php-format msgid "" "List all page revisions edited by one user with diff links, or show a " @@ -2089,18 +2089,18 @@ "Liste aller Versionen eines Autors mit Diff-Links, oder eine SeitenProtokoll-" "ähnliche Liste einer Seite nur für einen Autor." -#: ../lib/plugin/AuthorHistory.php:110 ../lib/plugin/AuthorHistory.php:153 +#: ../lib/plugin/AuthorHistory.php:115 ../lib/plugin/AuthorHistory.php:157 msgid "Minor" msgstr "kleinere" -#: ../lib/plugin/AuthorHistory.php:111 +#: ../lib/plugin/AuthorHistory.php:116 #: ../themes/default/templates/info.tmpl:60 #: ../themes/default/templates/wikiforum.tmpl:21 #: ../themes/MonoBook/templates/info.tmpl:74 msgid "Author" msgstr "Autor" -#: ../lib/plugin/AuthorHistory.php:112 ../lib/plugin/AuthorHistory.php:154 +#: ../lib/plugin/AuthorHistory.php:117 ../lib/plugin/AuthorHistory.php:158 #: ../themes/Crao/templates/editpage.tmpl:46 #: ../themes/default/templates/editpage.tmpl:48 #: ../themes/default/templates/info.tmpl:61 @@ -2111,24 +2111,24 @@ msgid "Summary" msgstr "Zusammenfassung" -#: ../lib/plugin/AuthorHistory.php:113 ../lib/plugin/AuthorHistory.php:155 +#: ../lib/plugin/AuthorHistory.php:118 ../lib/plugin/AuthorHistory.php:159 msgid "Modified" msgstr "Geändert" -#: ../lib/plugin/AuthorHistory.php:142 +#: ../lib/plugin/AuthorHistory.php:147 #, php-format msgid "History of all major and minor edits by %s to page %s." msgstr "" "Verlaufsprotokoll aller großen und kleinen Änderungen von %s der Seite %s." -#: ../lib/plugin/AuthorHistory.php:189 +#: ../lib/plugin/AuthorHistory.php:193 #, php-format msgid "History of all major and minor modifications for any page edited by %s." msgstr "" "Verlaufsprotokoll aller großen und kleinen Änderungen aller Seiten, die von " "%s bearbeitet wurden." -#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53 +#: ../lib/plugin/_BackendInfo.php:31 ../lib/plugin/_WikiTranslation.php:53 #: ../themes/Crao/templates/actionbar.tmpl:30 #: ../themes/default/templates/actionbar.tmpl:36 #: ../themes/MonoBook/templates/info.tmpl:186 @@ -2138,133 +2138,133 @@ msgid "DebugInfo" msgstr "DebugInfo" -#: ../lib/plugin/_BackendInfo.php:34 +#: ../lib/plugin/_BackendInfo.php:36 #, php-format msgid "Get debugging information for %s." msgstr "Debug-Informationen von %s." -#: ../lib/plugin/_BackendInfo.php:53 +#: ../lib/plugin/_BackendInfo.php:57 #, php-format msgid "Querying backend directly for '%s'" msgstr "DB Debug Informationen von der Seite »%s«" -#: ../lib/plugin/_BackendInfo.php:62 +#: ../lib/plugin/_BackendInfo.php:66 #, php-format msgid "No pagedata for %s" msgstr "Keine Daten für Seite %s" # Hidden password field -#: ../lib/plugin/_BackendInfo.php:119 +#: ../lib/plugin/_BackendInfo.php:122 msgid "<not displayed>" msgstr "<nicht angezeigt>" -#: ../lib/plugin/BackLinks.php:33 +#: ../lib/plugin/BackLinks.php:35 #, php-format msgid "List all pages which link to %s." msgstr "Alle Seiten, die mit %s verlinkt sind." -#: ../lib/plugin/BackLinks.php:67 ../lib/plugin/ListPages.php:118 -#: ../lib/plugin/ListPages.php:121 ../lib/plugin/ListSubpages.php:84 +#: ../lib/plugin/BackLinks.php:71 ../lib/plugin/ListPages.php:122 +#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89 msgid "#" msgstr "" -#: ../lib/plugin/BackLinks.php:120 +#: ../lib/plugin/BackLinks.php:124 #, php-format msgid "No other page links to %s yet." msgstr "Noch keine Seiten sind mit %s verlinkt." -#: ../lib/plugin/BackLinks.php:123 +#: ../lib/plugin/BackLinks.php:127 #, php-format msgid "One page would link to %s:" msgstr "Eine Seite würde mit %s verlinkt sein:" -#: ../lib/plugin/BackLinks.php:132 +#: ../lib/plugin/BackLinks.php:136 #, php-format msgid "%s pages would link to %s:" msgstr "%s Seiten würden mit %s verlinkt sein:" -#: ../lib/plugin/BackLinks.php:141 ../lib/plugin/SemanticSearch.php:127 -#: ../lib/plugin/SemanticSearch.php:206 +#: ../lib/plugin/BackLinks.php:144 ../lib/plugin/SemanticSearch.php:133 +#: ../lib/plugin/SemanticSearch.php:212 msgid "AND" msgstr "" -#: ../lib/plugin/BackLinks.php:147 +#: ../lib/plugin/BackLinks.php:150 #, php-format msgid "No page links to %s." msgstr "Keine Seiten sind mit %s verlinkt." -#: ../lib/plugin/BackLinks.php:152 +#: ../lib/plugin/BackLinks.php:155 #, php-format msgid "One page links to %s:" msgstr "Eine Seite ist mit %s verlinkt:" -#: ../lib/plugin/BackLinks.php:162 +#: ../lib/plugin/BackLinks.php:165 msgid "Those" msgstr "Diese" -#: ../lib/plugin/BackLinks.php:161 +#: ../lib/plugin/BackLinks.php:164 #, php-format msgid "%s pages link to %s:" msgstr "%s Seiten sind mit %s verlinkt:" -#: ../lib/plugin/BackLinks.php:170 +#: ../lib/plugin/BackLinks.php:173 msgid "More..." msgstr "" -#: ../lib/plugin/BlogArchives.php:39 ../lib/plugin/BlogArchives.php:144 +#: ../lib/plugin/BlogArchives.php:40 ../lib/plugin/BlogArchives.php:149 #: ../themes/blog/templates/actionbar.tmpl:8 msgid "Archives" msgstr "" -#: ../lib/plugin/BlogArchives.php:43 +#: ../lib/plugin/BlogArchives.php:45 msgid "List blog months links for the current or ADMIN user" msgstr "" -#: ../lib/plugin/BlogArchives.php:98 ../lib/plugin/BlogJournal.php:99 +#: ../lib/plugin/BlogArchives.php:102 ../lib/plugin/BlogJournal.php:104 #, php-format msgid "Blog Entries for %s:" msgstr "Blog-Einträge für %s:" -#: ../lib/plugin/BlogArchives.php:106 +#: ../lib/plugin/BlogArchives.php:110 #: ../themes/blog/templates/actionbar.tmpl:8 msgid "BlogArchives" msgstr "BlogArchiv" -#: ../lib/plugin/BlogArchives.php:132 +#: ../lib/plugin/BlogArchives.php:136 msgid "Blog Archives:" msgstr "Blog-Archive:" -#: ../lib/plugin/BlogJournal.php:38 +#: ../lib/plugin/BlogJournal.php:39 msgid "BlogJournal" msgstr "" -#: ../lib/plugin/BlogJournal.php:42 +#: ../lib/plugin/BlogJournal.php:44 msgid "Include latest blog entries for the current or ADMIN user" msgstr "" -#: ../lib/plugin/BlogJournal.php:95 +#: ../lib/plugin/BlogJournal.php:100 msgid "New entry" msgstr "Neuer Eintrag" -#: ../lib/plugin/BlogJournal.php:97 +#: ../lib/plugin/BlogJournal.php:102 msgid "No Blog Entries" msgstr "Keine Blog-Einträge" -#: ../lib/plugin/BoxRight.php:34 +#: ../lib/plugin/BoxRight.php:36 msgid "A simple plugin for <div class=boxright> with wikimarkup" msgstr "" -#: ../lib/plugin/CalendarList.php:54 ../lib/plugin/CalendarList.php:58 +#: ../lib/plugin/CalendarList.php:54 ../lib/plugin/CalendarList.php:59 msgid "CalendarList" msgstr "KalenderListe" -#: ../lib/plugin/CalendarList.php:138 ../lib/plugin/Calendar.php:165 +#: ../lib/plugin/CalendarList.php:143 ../lib/plugin/Calendar.php:169 #, php-format msgid "Edit %s" msgstr "Bearbeite %s" -#: ../lib/plugin/Calendar.php:39 ../lib/plugin/Calendar.php:43 -#: ../lib/WikiTheme.php:1523 ../lib/WikiUser.php:478 +#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45 +#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501 #: ../themes/blog/templates/sidebar.tmpl:15 #: ../themes/Crao/templates/head.tmpl:80 #: ../themes/Crao/templates/navbar.tmpl:26 @@ -2277,31 +2277,31 @@ msgid "Calendar" msgstr "Kalender" -#: ../lib/plugin/Calendar.php:88 +#: ../lib/plugin/Calendar.php:93 msgid "Previous Month" msgstr "Voriger Monat" -#: ../lib/plugin/Calendar.php:92 +#: ../lib/plugin/Calendar.php:97 msgid "Next Month" msgstr "Nächster Monat" -#: ../lib/plugin/Calendar.php:124 +#: ../lib/plugin/Calendar.php:129 msgid "Wk" msgstr "Cw" -#: ../lib/plugin/CategoryPage.php:44 +#: ../lib/plugin/CategoryPage.php:45 msgid "CategoryPage" msgstr "KategorieSeite" -#: ../lib/plugin/CategoryPage.php:48 +#: ../lib/plugin/CategoryPage.php:50 msgid "Create a Wiki page." msgstr "Erzeuge eine neue Wiki-Seite." -#: ../lib/plugin/Chart.php:50 +#: ../lib/plugin/Chart.php:51 msgid "Chart" msgstr "" -#: ../lib/plugin/Chart.php:54 +#: ../lib/plugin/Chart.php:56 msgid "Render SVG charts" msgstr "" @@ -2309,377 +2309,377 @@ msgid "Comment" msgstr "Kommentar" -#: ../lib/plugin/Comment.php:47 +#: ../lib/plugin/Comment.php:48 msgid "Embed hidden comments in WikiPages." msgstr "Kommentar in WikiText verstecken." -#: ../lib/plugin/CreateBib.php:37 +#: ../lib/plugin/CreateBib.php:38 msgid "CreateBib" msgstr "" -#: ../lib/plugin/CreateBib.php:41 +#: ../lib/plugin/CreateBib.php:43 msgid "Automatically create a Bibtex file from linked pages" msgstr "" -#: ../lib/plugin/CreatePage.php:42 +#: ../lib/plugin/CreatePage.php:43 msgid "CreatePage" msgstr "NeueSeite" -#: ../lib/plugin/CreatePage.php:46 +#: ../lib/plugin/CreatePage.php:48 msgid "Create a Wiki page by the provided name." msgstr "Erzeuge neue Wiki-Seite mit dem angegebenem Namen." -#: ../lib/plugin/CreatePage.php:66 +#: ../lib/plugin/CreatePage.php:70 msgid "Cannot create page with empty name!" msgstr "Kann Seite mit leerem Namen nicht erzeugen" -#: ../lib/plugin/CreatePage.php:70 +#: ../lib/plugin/CreatePage.php:74 msgid "CreatePage failed" msgstr "" -#: ../lib/plugin/CreatePage.php:72 ../lib/plugin/CreatePage.php:74 +#: ../lib/plugin/CreatePage.php:76 ../lib/plugin/CreatePage.php:78 #, php-format msgid "Do you really want to create the page '%s'?" msgstr "" -#: ../lib/plugin/CreatePage.php:79 ../lib/plugin/CreatePage.php:83 +#: ../lib/plugin/CreatePage.php:83 ../lib/plugin/CreatePage.php:87 msgid "The new page you want to create will be a subpage." msgstr "" -#: ../lib/plugin/CreatePage.php:80 +#: ../lib/plugin/CreatePage.php:84 msgid "Subpages cannot be created unless the parent page exists." msgstr "" -#: ../lib/plugin/CreatePage.php:87 +#: ../lib/plugin/CreatePage.php:91 msgid "" "Subpages with ending space are not allowed as directory name on Windows." msgstr "" -#: ../lib/plugin/CreatePage.php:116 +#: ../lib/plugin/CreatePage.php:121 #, php-format msgid "%s already exists" msgstr "%s existiert bereits" -#: ../lib/plugin/CreatePage.php:132 +#: ../lib/plugin/CreatePage.php:137 msgid "Created by CreatePage" msgstr "Erzeugt von NeueSeite" -#: ../lib/plugin/CreateToc.php:46 +#: ../lib/plugin/CreateToc.php:47 msgid "CreateToc" msgstr "InhaltsVerzeichnis" -#: ../lib/plugin/CreateToc.php:50 +#: ../lib/plugin/CreateToc.php:52 msgid "Create a Table of Contents and automatically link to headers" msgstr "" -#: ../lib/plugin/CreateToc.php:389 +#: ../lib/plugin/CreateToc.php:412 msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'" msgstr "" -#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129 +#: ../lib/plugin/CreateToc.php:417 ../lib/plugin/Template.php:136 #, php-format msgid "Page '%s' does not exist." msgstr "Seite »%s« existiert nicht" -#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86 -#: ../lib/plugin/PageDump.php:85 +#: ../lib/plugin/CreateToc.php:422 ../lib/plugin/Diff.php:92 +#: ../lib/plugin/PageDump.php:90 #, php-format msgid "Illegal access to page %s: no read access" msgstr "" -#: ../lib/plugin/CreateToc.php:407 +#: ../lib/plugin/CreateToc.php:430 msgid "Error: version must be a positive integer." msgstr "" -#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107 -#: ../lib/plugin/PageGroup.php:120 ../lib/plugin/Template.php:145 +#: ../lib/plugin/CreateToc.php:434 ../lib/plugin/IncludePage.php:119 +#: ../lib/plugin/PageGroup.php:126 ../lib/plugin/Template.php:152 #, php-format msgid "%s: no such revision %d." msgstr "%s(%d): keine solche Version" -#: ../lib/plugin/CreateToc.php:422 +#: ../lib/plugin/CreateToc.php:445 msgid "CreateToc disabled for old markup." msgstr "InhaltsVerzeichnis deaktiviert für altes Markup." -#: ../lib/plugin/CreateToc.php:485 +#: ../lib/plugin/CreateToc.php:508 msgid "Click to display to TOC" msgstr "Klicken um TOC anzuzeigen" -#: ../lib/plugin/CurrentTime.php:57 +#: ../lib/plugin/CurrentTime.php:58 msgid "CurrentTime" msgstr "AktuelleZeit" -#: ../lib/plugin/CurrentTime.php:61 +#: ../lib/plugin/CurrentTime.php:63 msgid "A simple plugin that displays current time and date" msgstr "" -#: ../lib/plugin/DeadEndPages.php:31 +#: ../lib/plugin/DeadEndPages.php:32 msgid "DeadEndPages" msgstr "VerwaisteSeiten" -#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1026 -#: ../themes/blog/themeinfo.php:65 +#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056 +#: ../themes/blog/themeinfo.php:71 msgid "Diff" msgstr "Diff" # word substitution order changes here -#: ../lib/plugin/Diff.php:40 +#: ../lib/plugin/Diff.php:43 msgid "Display differences between revisions" msgstr "Zeilenweiser Vergleich der Versionen" -#: ../lib/plugin/Diff.php:182 +#: ../lib/plugin/Diff.php:186 msgid "Content of versions " msgstr "" -#: ../lib/plugin/Diff.php:183 +#: ../lib/plugin/Diff.php:187 msgid " and " msgstr " und " -#: ../lib/plugin/Diff.php:183 +#: ../lib/plugin/Diff.php:187 msgid " is identical." msgstr " sind identisch." -#: ../lib/plugin/Diff.php:188 +#: ../lib/plugin/Diff.php:192 msgid "Version " msgstr "Version " -#: ../lib/plugin/Diff.php:189 +#: ../lib/plugin/Diff.php:193 msgid " was created because: " msgstr "" -#: ../lib/plugin/DynamicIncludePage.php:35 +#: ../lib/plugin/DynamicIncludePage.php:36 msgid "DynamicIncludePage" msgstr "" -#: ../lib/plugin/DynamicIncludePage.php:39 +#: ../lib/plugin/DynamicIncludePage.php:41 msgid "Dynamically include the content from another wiki page." msgstr "Text von einer andere Seite einfügen." -#: ../lib/plugin/DynamicIncludePage.php:59 -#: ../lib/plugin/DynamicIncludePage.php:82 +#: ../lib/plugin/DynamicIncludePage.php:63 +#: ../lib/plugin/DynamicIncludePage.php:86 #, php-format msgid " %s :" msgstr "" -#: ../lib/plugin/DynamicIncludePage.php:77 -#: ../lib/plugin/DynamicIncludePage.php:78 -#: ../lib/plugin/NewPagesPerUser.php:109 ../lib/plugin/NewPagesPerUser.php:110 -#: ../lib/plugin/RecentChanges.php:1362 ../lib/plugin/RecentChanges.php:1363 -#: ../themes/Sidebar/themeinfo.php:56 ../themes/Sidebar/themeinfo.php:57 +#: ../lib/plugin/DynamicIncludePage.php:81 +#: ../lib/plugin/DynamicIncludePage.php:82 +#: ../lib/plugin/NewPagesPerUser.php:113 ../lib/plugin/NewPagesPerUser.php:114 +#: ../lib/plugin/RecentChanges.php:1491 ../lib/plugin/RecentChanges.php:1492 +#: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60 msgid "Click to hide/show" msgstr "Hier klicken um zu verstecken" -#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54 +#: ../lib/plugin/EditMetaData.php:49 ../lib/plugin/_WikiTranslation.php:54 msgid "EditMetaData" msgstr "MetaDatenBearbeiten" -#: ../lib/plugin/EditMetaData.php:52 +#: ../lib/plugin/EditMetaData.php:54 #, php-format msgid "Edit metadata for %s" msgstr "Meta-Daten für %s bearbeiten" -#: ../lib/plugin/EditMetaData.php:127 +#: ../lib/plugin/EditMetaData.php:131 #, php-format msgid "No metadata for %s" msgstr "Keine Meta-Daten für %s" -#: ../lib/plugin/EditMetaData.php:141 +#: ../lib/plugin/EditMetaData.php:144 msgid "" "Add or change a page-level metadata 'key=>value' pair. Note that you can " "remove a key by leaving the value-box empty." msgstr "" -#: ../lib/plugin/EditMetaData.php:144 ../lib/upgrade.php:789 +#: ../lib/plugin/EditMetaData.php:147 ../lib/upgrade.php:801 msgid "Submit" msgstr "Eingeben" -#: ../lib/plugin/EditMetaData.php:159 +#: ../lib/plugin/EditMetaData.php:162 msgid "Requires WikiAdmin privileges to edit." msgstr "Verlangt Administratorenrechte zur Bearbeitung." -#: ../lib/plugin/ExternalSearch.php:40 +#: ../lib/plugin/ExternalSearch.php:41 msgid "ExternalSearch" msgstr "FremdSuche" -#: ../lib/plugin/ExternalSearch.php:44 +#: ../lib/plugin/ExternalSearch.php:46 msgid "Redirects to an external web site based on form input" msgstr "" "Weiterleitung der Suche zu einer externen Webseite aufgrund einer " "Formulareingabe" -#: ../lib/plugin/ExternalSearch.php:135 ../lib/plugin/PhotoAlbum.php:477 +#: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 #, php-format msgid "Invalid argument: %s=%s" msgstr "Ungültiger Parameter: %s=%s" -#: ../lib/plugin/FacebookLike.php:35 +#: ../lib/plugin/FacebookLike.php:36 msgid "" "Display a Facebook Like button. See http://developers.facebook.com/docs/"; "reference/plugins/like" msgstr "" -#: ../lib/plugin/FileInfo.php:40 +#: ../lib/plugin/FileInfo.php:41 msgid "FileInfo" msgstr "DateiInfo" -#: ../lib/plugin/FileInfo.php:44 +#: ../lib/plugin/FileInfo.php:46 msgid "Display file information like version, size, date... of uploaded files." msgstr "" -#: ../lib/plugin/FileInfo.php:78 +#: ../lib/plugin/FileInfo.php:82 #, php-format msgid "File '%s' not found." msgstr "Datei '%s' nicht gefunden" -#: ../lib/plugin/FileInfo.php:92 +#: ../lib/plugin/FileInfo.php:96 msgid "" "Output suppressed. FileInfoPlugin with local files require a locked page." msgstr "" -#: ../lib/plugin/FileInfo.php:93 +#: ../lib/plugin/FileInfo.php:97 msgid "page not locked" msgstr "Seite nicht gesperrt" -#: ../lib/plugin/FoafViewer.php:69 +#: ../lib/plugin/FoafViewer.php:71 msgid "FoafViewer" msgstr "FoafBetrachter" -#: ../lib/plugin/FoafViewer.php:73 +#: ../lib/plugin/FoafViewer.php:76 msgid "Parse an RDF FOAF file and extract information to render as HTML" msgstr "" -#: ../lib/plugin/FoafViewer.php:96 +#: ../lib/plugin/FoafViewer.php:101 msgid "required pear library XML/FOAF/Parser.php not found in include_path" msgstr "" -#: ../lib/plugin/FoafViewer.php:102 +#: ../lib/plugin/FoafViewer.php:107 msgid "FOAF File URI" msgstr "" -#: ../lib/plugin/FoafViewer.php:106 +#: ../lib/plugin/FoafViewer.php:111 msgid "Pretty HTML" msgstr "" -#: ../lib/plugin/FoafViewer.php:108 +#: ../lib/plugin/FoafViewer.php:113 msgid "Original URL (Redirect)" msgstr "" -#: ../lib/plugin/FoafViewer.php:110 +#: ../lib/plugin/FoafViewer.php:115 msgid "Parse FOAF" msgstr "" -#: ../lib/plugin/FoafViewer.php:119 +#: ../lib/plugin/FoafViewer.php:123 msgid "foaf must be a URI starting with http://"; msgstr "" -#: ../lib/plugin/FoafViewer.php:142 +#: ../lib/plugin/FoafViewer.php:145 msgid "Title" msgstr "Titel" # (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit # eingeschlossenem Rahmen) -#: ../lib/plugin/FrameInclude.php:52 +#: ../lib/plugin/FrameInclude.php:53 msgid "FrameInclude" msgstr "FrameEinbetten" -#: ../lib/plugin/FrameInclude.php:56 +#: ../lib/plugin/FrameInclude.php:58 msgid "" "Displays a url in a seperate frame inside our body. Only one frame allowed." msgstr "" "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der " "Seite. Nur ein Frame ist erlaubt." -#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59 -#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73 -#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110 -#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137 -#: ../lib/plugin/WikiAdminRename.php:145 -#: ../lib/plugin/WikiAdminSearchReplace.php:121 -#: ../lib/plugin/WikiAdminSetAcl.php:141 -#: ../lib/plugin/WikiAdminSetExternal.php:96 -#: ../lib/plugin/WikiAdminUtils.php:64 +#: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 +#: ../lib/plugin/RedirectTo.php:91 ../lib/plugin/SyncWiki.php:77 +#: ../lib/plugin/WikiAdminChown.php:113 ../lib/plugin/WikiAdminMarkup.php:115 +#: ../lib/plugin/WikiAdminPurge.php:99 ../lib/plugin/WikiAdminRemove.php:143 +#: ../lib/plugin/WikiAdminRename.php:149 +#: ../lib/plugin/WikiAdminSearchReplace.php:127 +#: ../lib/plugin/WikiAdminSetAcl.php:147 +#: ../lib/plugin/WikiAdminSetExternal.php:101 +#: ../lib/plugin/WikiAdminUtils.php:68 msgid "Plugin not run: not in browse mode" msgstr "" -#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123 +#: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/Template.php:130 #, php-format msgid "Recursive inclusion of page %s" msgstr "Rekursiver Selbstaufruf der Seite %s" # (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!) -#: ../lib/plugin/FrameInclude.php:95 +#: ../lib/plugin/FrameInclude.php:99 #, php-format msgid "%s or %s parameter missing" msgstr "%s oder %s Argument fehlt" -#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:87 +#: ../lib/plugin/FrameInclude.php:105 ../lib/plugin/Transclude.php:91 #, php-format msgid "Recursive inclusion of url %s" msgstr "Rekursiver Selbstaufruf der URL %s" -#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287 -#: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81 -#: ../lib/plugin/text2png.php:167 +#: ../lib/plugin/FrameInclude.php:112 ../lib/plugin/SemanticSearch.php:295 +#: ../lib/plugin/TeX2png.php:234 ../lib/plugin/text2png.php:85 +#: ../lib/plugin/text2png.php:172 #, php-format msgid "See %s" msgstr "Siehe %s" -#: ../lib/plugin/FullTextSearch.php:50 +#: ../lib/plugin/FullTextSearch.php:52 msgid "Search the content of all pages in this wiki." msgstr "Den Text aller Seiten dieses Wikis durchsuchen." -#: ../lib/plugin/FullTextSearch.php:88 ../lib/plugin/FullTextSearch.php:123 +#: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127 #, php-format msgid "Full text search results for '%s'" msgstr "Volltext-Suchresultate nach »%s«" -#: ../lib/plugin/FullTextSearch.php:113 +#: ../lib/plugin/FullTextSearch.php:117 #, php-format msgid "only %d pages displayed" msgstr "nur %d Seiten angezeigt" -#: ../lib/plugin/FullTextSearch.php:118 +#: ../lib/plugin/FullTextSearch.php:122 #, php-format msgid "Ignored stoplist words '%s'" msgstr "" -#: ../lib/plugin/FullTextSearch.php:163 ../lib/plugin/WantedPages.php:171 +#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:188 #, php-format msgid "(%d Links)" msgstr "(%d Verweise)" -#: ../lib/plugin/FuzzyPages.php:39 +#: ../lib/plugin/FuzzyPages.php:40 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-10 10:14:08
|
Revision: 8403 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8403&view=rev Author: vargenau Date: 2012-10-10 10:13:58 +0000 (Wed, 10 Oct 2012) Log Message: ----------- Add comment: We should test whether the wiki plugin is disabled globally in the Forge or by the current project. Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2012-10-09 15:40:38 UTC (rev 8402) +++ trunk/g 2012-10-10 10:13:58 UTC (rev 8403) @@ -66,6 +66,9 @@ if (! isset($group_id) || ! isset($project)) { exit_no_group(); } else if (!($project->usesPlugin("wiki"))) { + // We should test whether the wiki plugin is disabled globally + // in the Forge or by the current project. + // exit_disabled('home'); exit_project_disabled('home'); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-09 15:40:48
|
Revision: 8402 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8402&view=rev Author: vargenau Date: 2012-10-09 15:40:38 +0000 (Tue, 09 Oct 2012) Log Message: ----------- Avoid warning in: <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin !> >> Modified Paths: -------------- trunk/lib/plugin/IncludePage.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2012-10-08 23:19:11 UTC (rev 8401) +++ trunk/lib/plugin/IncludePage.php 2012-10-09 15:40:38 UTC (rev 8402) @@ -69,6 +69,13 @@ return array(array('linkto' => $page->name, 'relation' => 0)); } + // Avoid warning in: + // <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin !> >> + function handle_plugin_args_cruft($argstr, $args) + { + return; + } + function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-08 23:19:17
|
Revision: 8401 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8401&view=rev Author: vargenau Date: 2012-10-08 23:19:11 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Fix Phpdoc Modified Paths: -------------- trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/VisualWiki.php Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/FoafViewer.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -194,6 +194,8 @@ * * @param $array Source array * @param $index Element Index to use. + * @param null $dc + * @return \RawXml * @todo Make sure it can look more than 1 layer deep * @todo Pass in dublincore metadata */ Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/GraphViz.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -159,6 +159,9 @@ * Sets the imagetype according to user wishes and * relies on WikiPluginCached to catch illegal image * formats. + * @param WikiDB $dbi + * @param array $argarray + * @param Request $request * @return string 'png', 'jpeg', 'gif' */ function getImageType($dbi, $argarray, $request) @@ -352,6 +355,7 @@ * 'none') * @param shape string node shape; 'ellipse', 'box', 'circle', 'point' * @param label string not used anymore + * @return array */ function invokeDot($argarray) { Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/PhotoAlbum.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -555,6 +555,7 @@ * * @param string $src path to dir or textfile (local or remote) * @param array $photos + * @param string $webpath * @return string Error when bad url or file couldn't be opened */ function fromFile($src, &$photos, $webpath = '') Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/Ploticus.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -142,6 +142,9 @@ * this case, because png will definitely have the * best results.) * + * @param WikiDB $dbi + * @param array $argarray + * @param Request $request * @return string 'png', 'jpeg', 'gif' */ function getImageType($dbi, $argarray, $request) Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/PopularNearby.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -105,6 +105,7 @@ * @param $pages array of WikiDB_Page's or a Page_iterator * @param $direction boolean: true if incoming links * + * @param int $limit * @return Array of sorted links */ function sortedLinks($pages, $direction = false, $limit = 5) Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/RateIt.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -309,13 +309,18 @@ * * This needs to be put in the <body> section of the page. * - * @param pagename Name of the page to rate + * @param Name $pagename * @param version Version of the page to rate (may be "" for current) - * @param imgPrefix Prefix of the names of the images that display the rating + * @param Prefix $imgPrefix + * @param Id $dimension + * @param bool|Makes $small + * @return \HtmlElement + * @internal param \Name $pagename of the page to rate + * @internal param \Prefix $imgPrefix of the names of the images that display the rating * You can have two widgets for the same page displayed at * once iff the imgPrefix-s are different. - * @param dimension Id of the dimension to rate - * @param small Makes a smaller ratings widget if non-false + * @internal param \Id $dimension of the dimension to rate + * @internal param \Makes $small a smaller ratings widget if non-false * * Limitations: Currently this can only print the current users ratings. * And only the widget, but no value (for buddies) also. Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/RecentChanges.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -1108,6 +1108,8 @@ /** Constructor * * @param $revisions object a WikiDB_PageRevisionIterator. + * @param bool $check_current_revision + * @return void */ function NonDeletedRevisionIterator($revisions, $check_current_revision = true) { Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/VisualWiki.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -150,6 +150,9 @@ /** * Checks options, creates help page if necessary, calls both * database access and image map production functions. + * @param WikiDB $dbi + * @param array $argarray + * @param Request $request * @return array($map,$html) */ function getMap($dbi, $argarray, $request) @@ -221,10 +224,13 @@ * Selects the first (smallest or biggest) WikiPages in * a given category. * - * @param number integer number of page names to be found - * @param category string attribute of the pages which is used + * @param int $number + * @param string $category + * @param bool $minimum + * @internal param int $number number of page names to be found + * @internal param string $category attribute of the pages which is used * to compare them - * @param minimum boolean true finds smallest, false finds biggest + * @internal param bool $minimum true finds smallest, false finds biggest * @return array list of page names found to be the best */ function findbest($number, $category, $minimum) @@ -273,20 +279,22 @@ * like size, age, revision number which are used to find the * most attractive pages. * - * @param dbi WikiDB database handle to access all Wiki pages - * @param LARGE integer number of largest pages which should + * @param WikiDB $dbi + * @param $argarray + * @internal param \WikiDB $dbi database handle to access all Wiki pages + * @internal param int $LARGE number of largest pages which should * be included - * @param RECENT integer number of the youngest pages to be included - * @param REFINED integer number of the pages with shortes revision + * @internal param int $RECENT number of the youngest pages to be included + * @internal param int $REFINED number of the pages with shortes revision * interval - * @param BACKLINK integer number of the pages with most backlinks - * @param EXCLUDELIST string colon ':' separated list of page names which + * @internal param int $BACKLINK number of the pages with most backlinks + * @internal param string $EXCLUDELIST colon ':' separated list of page names which * should not be displayed (like PhpWiki, for * example) - * @param INCLUDELIST string colon separated list of pages which are + * @internal param string $INCLUDELIST colon separated list of pages which are * always included (for example your own * page :) - * @param COLOR string 'age', 'revtime' or 'none'; Selects which + * @internal param string $COLOR 'age', 'revtime' or 'none'; Selects which * page feature is used to determine the * filling color of the nodes in the graph. * @return void @@ -417,13 +425,15 @@ * Creates the text file description of the graph needed to invoke * <code>dot</code>. * - * @param filename string name of the dot file to be created - * @param width float width of the output graph in inches - * @param height float height of the graph in inches - * @param colorby string color sceme beeing used ('age', 'revtime', + * @param string $filename + * @param bool $argarray + * @internal param string $filename name of the dot file to be created + * @internal param float $width width of the output graph in inches + * @internal param float $height height of the graph in inches + * @internal param string $colorby color sceme beeing used ('age', 'revtime', * 'none') - * @param shape string node shape; 'ellipse', 'box', 'circle', 'point' - * @param label string 'name': label by name, + * @internal param string $shape node shape; 'ellipse', 'box', 'circle', 'point' + * @internal param string $label 'name': label by name, * 'number': label by unique number * @return boolean error status; true=ok; false=error */ @@ -534,14 +544,17 @@ * called only if debug=static. * * @access private - * @param url string url pointing to the image part of the map - * @param map string <area> tags defining active + * @param string $url + * @param WikiDB $dbi + * @param array $argarray + * @param request Request ??? + * @internal param string $url url pointing to the image part of the map + * @internal param string $map <area> tags defining active * regions in the map - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce + * @internal param \WikiDB $dbi database abstraction class + * @internal param array $argarray complete (!) arguments to produce * image. It is not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? * @return string html output */ function embedImg($url, &$dbi, $argarray, &$request) @@ -606,7 +619,8 @@ * Translates a value from 0.0 to 1.0 into rainbow color. * red -> orange -> green -> blue -> gray * - * @param promille float value between 0.0 and 1.0 + * @param float $promille + * @internal param float $promille value between 0.0 and 1.0 * @return array(red,green,blue) */ function getColor($promille) @@ -623,6 +637,9 @@ /** * Linear interpolates a value between two point a and b * at a value pos. + * @param $a + * @param $b + * @param $pos * @return float interpolated value */ function interpolate($a, $b, $pos) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-08 09:07:31
|
Revision: 8400 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8400&view=rev Author: vargenau Date: 2012-10-08 09:07:20 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Fix comment Modified Paths: -------------- trunk/lib/plugin/OldStyleTable.php Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2012-10-06 11:05:48 UTC (rev 8399) +++ trunk/lib/plugin/OldStyleTable.php 2012-10-08 09:07:20 UTC (rev 8400) @@ -26,7 +26,7 @@ * * Usage: * <pre> - * <<OldStyleTable border||=0 summary="" + * <<OldStyleTable border||=0 * || __Name__ |v __Cost__ |v __Notes__ * | __First__ | __Last__ * |> Jeff |< Dairiki |^ Cheap |< Not worth it This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-06 11:05:57
|
Revision: 8399 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8399&view=rev Author: vargenau Date: 2012-10-06 11:05:48 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Reformat CSS Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX-topbottombars.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/IE60Fixes.css trunk/themes/MonoBook/IE70Fixes.css trunk/themes/MonoBook/commonPrint.css trunk/themes/MonoBook/main.css trunk/themes/MonoBook/rtl.css trunk/themes/MonoBook/wikiprintable.css trunk/themes/MonoBook/wikistandard.css trunk/themes/Portland/portland.css trunk/themes/Sidebar/jscalendar/calendar-phpwiki.css trunk/themes/Sidebar/jscalendar/calendar-win2k-1.css trunk/themes/Sidebar/jscalendar/calendar-win2k-cold-1.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/IEFixes.css trunk/themes/blog/Kubrick.css trunk/themes/default/IEFixes.css trunk/themes/default/highlight.css trunk/themes/default/phpwiki-modern.css trunk/themes/default/phpwiki-printer.css trunk/themes/default/phpwiki-topbottombars.css trunk/themes/default/phpwiki.css trunk/themes/default/toolbar.css trunk/themes/fusionforge/fusionforge-autonumbering.css trunk/themes/fusionforge/fusionforge-fullscreen.css trunk/themes/fusionforge/fusionforge-print.css trunk/themes/fusionforge/fusionforge-rereading.css trunk/themes/fusionforge/fusionforge.css trunk/themes/shamino_com/shamino_com.css trunk/themes/smaller/IEFixes.css trunk/themes/smaller/phpwiki.css trunk/themes/wikilens/wikilens.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/Crao/crao.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -12,50 +12,62 @@ */ body { - background-color: #ccc;/* MODIFY-color */ - font-family: Helvetica, Verdana, Arial, sans-serif; - font-size: 12px ; - line-height: 14px ; - margin: 0; - padding: 0; - border: 0 none ; - color: #000; - text-align: left; + background-color: #ccc; /* MODIFY-color */ + font-family: Helvetica, Verdana, Arial, sans-serif; + font-size: 12px; + line-height: 14px; + margin: 0; + padding: 0; + border: 0 none; + color: #000; + text-align: left; } img { - border: 0; - vertical-align: middle; + border: 0; + vertical-align: middle; } table { - border-spacing: 0; - /* For Mozilla */ - empty-cells: show; + border-spacing: 0; + /* For Mozilla */ + empty-cells: show; } -a:link, a {/* MODIFY-TXT */ + +a:link, a { + /* MODIFY-TXT */ color: #33c; text-decoration: underline; background-color: transparent; } -a:visited {/* MODIFY-TXT */ + +a:visited { + /* MODIFY-TXT */ color: #33c; text-decoration: underline; background-color: transparent; } -a:hover {/* MODIFY-TXT */ + +a:hover { + /* MODIFY-TXT */ color: #03f; - text-decoration:underline; + text-decoration: underline; background-color: transparent; } + a.wiki, a.wikiadmin, a.named-wiki { } + hr { - background-color: #ccc;/* MODIFY-color */ + background-color: #ccc; /* MODIFY-color */ height: 1px; - border: 1px solid #ccc; /* MODIFY-color */ + border: 1px solid #ccc; /* MODIFY-color */ } -div.wikitext pre { font-family: monospace; } + +div.wikitext pre { + font-family: monospace; +} + p { font-size: 1em; margin: 0; @@ -64,19 +76,38 @@ /* generic classes ----------------------------------------------- */ -.tt { font-family: monospace; } -.strike { text-decoration:line-through; } +.tt { + font-family: monospace; +} -.align-left {text-align: left;} -.align-right {text-align: right;} -.align-center {text-align: center;} - -.top {vertical-align: top;} +.strike { + text-decoration: line-through; +} -.nowrap {white-space: nowrap;} +.align-left { + text-align: left; +} -.fullwidth { width: 100%; } +.align-right { + text-align: right; +} +.align-center { + text-align: center; +} + +.top { + vertical-align: top; +} + +.nowrap { + white-space: nowrap; +} + +.fullwidth { + width: 100%; +} + /* --------------------------------------------------------------- */ /* @@ -84,9 +115,9 @@ *****LISTES ****************************** */ -ul{ +ul { position: relative; - padding : 0; + padding: 0; margin: 0; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 100%; @@ -94,8 +125,9 @@ list-style: inside; background-color: transparent; } -ul ul{ - position: relative; + +ul ul { + position: relative; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 100%; margin-left: 2em; @@ -104,48 +136,53 @@ li.rc-major { list-style: none; display: block; - background-color: #fff;/* MODIFY-color */ + background-color: #fff; /* MODIFY-color */ margin: 6px 0; - border: 1px #666 dashed;/* MODIFY-color */ - padding:0.5ex; + border: 1px #666 dashed; /* MODIFY-color */ + padding: 0.5ex; } -li.evenrow{ - border: 0; - padding:1ex; +li.evenrow { + border: 0; + padding: 1ex; } -li.oddrow{ - border: 0; - padding:1ex; + +li.oddrow { + border: 0; + padding: 1ex; } -li strong{ - font-weight: normal; - background-color: transparent; + +li strong { + font-weight: normal; + background-color: transparent; } -strong.wiki-summary{ - display: block; - padding:5px 0; - background-color: transparent; +strong.wiki-summary { + display: block; + padding: 5px 0; + background-color: transparent; } -li a.wiki-rc-action{ - display:inline; - } li a.wiki-rc-action { - border: 0; -/*border-left: 1.2em solid #FC0;*/ -/*la puce de dernieres modifs*/ + display: inline; } + +li a.wiki-rc-action { + border: 0; + /*border-left: 1.2em solid #FC0;*/ + /*la puce de dernieres modifs*/ +} + li.rc-major a.wiki { - font-size: 1.2em; - font-weight: bold; + font-size: 1.2em; + font-weight: bold; } + li>p { - display: inline; + display: inline; } -p.wiki-rc-action -{ + +p.wiki-rc-action { text-align: center; vertical-align: middle; padding: 5px 5px 5px 5px; @@ -153,10 +190,9 @@ background-color: transparent; } -p a.wiki-rc-action -{ +p a.wiki-rc-action { display: inline; - padding:0 10px; + padding: 0 10px; font-weight: bold; background-color: transparent; } @@ -167,25 +203,29 @@ ****************************** */ #header { - background-color: #333;/* MODIFY-color */ + background-color: #333; /* MODIFY-color */ } -#logo {/* MODIFY-TXT */ - color: #ccc; + +#logo { + /* MODIFY-TXT */ + color: #ccc; display: inline; margin-top: 0; margin-left: 0; height: 50px; - width:auto; + width: auto; background-color: transparent; - font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif; + font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif; letter-spacing: -0.1em; } + #logo img { border: 0; } + #logo a { - color: #ccc; - font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif; + color: #ccc; + font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif; text-decoration: none; } @@ -199,7 +239,8 @@ div.ie-actionbuttons { position: relative; height: 22px; - right: 0; bottom: 0; + right: 0; + bottom: 0; margin: 0; background-color: transparent; background-image: url(images/BG.png); @@ -218,7 +259,8 @@ position: fixed; max-width: 30%; height: 22px; - right: 0; bottom: 0; + right: 0; + bottom: 0; margin: 0; background-color: transparent; background-image: url(images/BG.png); @@ -230,7 +272,10 @@ padding-bottom: 0.5ex; border: 0 none; } -#actionbuttons div { } + +#actionbuttons div { +} + #actionbuttons a, #actionbuttons a:link { position: relative; display: inline; @@ -248,43 +293,51 @@ ****************************** */ #content { - margin-top: 0; - margin-left:7%; + margin-top: 0; + margin-left: 7%; margin-right: 7%; - margin-bottom:7%; - background-color: #f2f2f2;/* MODIFY-color */ - border: 1px #999 solid;/* MODIFY-color */ + margin-bottom: 7%; + background-color: #f2f2f2; /* MODIFY-color */ + border: 1px #999 solid; /* MODIFY-color */ padding-left: 2em; padding-right: 15px; - padding-top: 15px; + padding-top: 15px; padding-bottom: 0.5ex; } + /* titre */ -div.boxtitrehead {} -div.boxtitrehead a.backlinks {} +div.boxtitrehead { +} + +div.boxtitrehead a.backlinks { +} + div.wikitext { font-size: 1em; line-height: 130%; text-align: left; } + blockquote.mail-style-quote { - border-left: #FF9933;/* MODIFY-color */ + border-left: #FF9933; /* MODIFY-color */ margin: 0; margin-bottom: 1em; - border: 1px solid #FF9933;/* MODIFY-color */ + border: 1px solid #FF9933; /* MODIFY-color */ padding: 0.5em; } + .mail-style-quote blockquote.mail-style-quote { margin-left: 0.3em; - margin-bottom : 0; + margin-bottom: 0; background-color: transparent; border-style: none; - border-left: 2px solid #FF9933;/* MODIFY-color */ + border-left: 2px solid #FF9933; /* MODIFY-color */ padding: 0; padding-left: 0.5em; } + blockquote p { - margin-top: 0.5ex; + margin-top: 0.5ex; margin-bottom: 0.5ex; } @@ -293,77 +346,96 @@ *****NAVBAR ****************************** */ -.toolbar, input.button, #signin { font-family:Verdana, Arial, Helvetica, sans-serif; } +.toolbar, input.button, #signin { + font-family: Verdana, Arial, Helvetica, sans-serif; +} -div.toolbar{ - display:block; - background-color:#f2f2f2;/* MODIFY-color */ - border: 1px #666 solid;/* MODIFY-color */ - margin: 2% 7%; +div.toolbar { + display: block; + background-color: #f2f2f2; /* MODIFY-color */ + border: 1px #666 solid; /* MODIFY-color */ + margin: 2% 7%; } + .toolbar { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } + .edit-toolbar { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } + .edit-toolbar img, .edit-toolbar input { - background-color: #fff; - border: 1px solid ButtonFace; + background-color: #fff; + border: 1px solid ButtonFace; } #navbuttons { display: inline; } -#navbuttons img{ - margin:5px 0 5px 10px; + +#navbuttons img { + margin: 5px 0 5px 10px; } -#navbuttons a:link, #navbuttons a{/* MODIFY-TXT */ + +#navbuttons a:link, #navbuttons a { + /* MODIFY-TXT */ font-weight: bold; padding-left: 1ex; padding-right: 1ex; - color:#333; + color: #333; } -#navbuttons a:visited{} -#navbuttons a:hover{} +#navbuttons a:visited { +} + +#navbuttons a:hover { +} + /* ****************************** *****SIGNIN ****************************** */ -#signin{/* MODIFY-TXT */ - width: auto; +#signin { + /* MODIFY-TXT */ + width: auto; text-align: right; padding-right: 10px; background-color: transparent; - color:#ccc; - font-size:12px; + color: #ccc; + font-size: 12px; } -#signin form{/* MODIFY-TXT */ - text-align: center; + +#signin form { + /* MODIFY-TXT */ + text-align: center; padding: 1px; margin: 0; display: inline; } -#signin input{/* MODIFY-TXT */ + +#signin input { + /* MODIFY-TXT */ padding: 0; padding-left: 3px; margin: 0; - font-family: Verdana, Arial, Helvetica, sans-serif ; - color:#333; + font-family: Verdana, Arial, Helvetica, sans-serif; + color: #333; font-size: 12px; } -#signin input.wikisignin{ + +#signin input.wikisignin { padding: 0; margin: 0; border: 0 none; } -#signin a.wiki{/* MODIFY-TXT */ - color:#FFF; +#signin a.wiki { + /* MODIFY-TXT */ + color: #FFF; background-color: transparent; } @@ -378,49 +450,61 @@ /*padding-right: 10px;*/ float: right; } -#search form{ - text-align: center; + +#search form { + text-align: center; padding: 1px; margin: 0; display: inline; } -#search input{ + +#search input { padding: 0; padding-left: 3px; margin: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; + font-family: Verdana, Arial, Helvetica, sans-serif; color: #333; font-size: 12px; } -#search input.wikiaction{ + +#search input.wikiaction { padding: 0; margin: 0; border: 0 none; } -.search-context { background: white; font-style: oblique; } + +.search-context { + background: white; + font-style: oblique; +} + .search-term { - background: yellow; - font-weight: normal; + background: yellow; + font-weight: normal; } + #livesearch { - height: 13px; - width: 100px; + height: 13px; + width: 100px; } + #LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; + position: absolute; + text-align: left; + display: none; + z-index: 100; + background-color: white; + border: 1px solid #d0d0d0; + font-size: 9px; + overflow: hidden; } + #LSHighlight { - background-color: #f08000; + background-color: #f08000; } + #LSResult .evenrow { - background-color: #f0f0f0; + background-color: #f0f0f0; } /* @@ -429,15 +513,22 @@ ****************************** */ body.sidebar { - font-size: smaller; - margin: 0.5em; + font-size: smaller; + margin: 0.5em; } + body.sidebar div.wikitext { - padding: 0.5em; + padding: 0.5em; } -body.sidebar { padding-left: 1em; } -body.sidebar h2 { margin-top: 0; } +body.sidebar { + padding-left: 1em; +} + +body.sidebar h2 { + margin-top: 0; +} + /* ****************************** *****WIKI-FORM @@ -449,15 +540,24 @@ * have a class yet, so it must be referenced indirectly */ /*div.wikiaction { background-color: #f2f2f2; }*/ - /*div.wikiadmin { background-color: #fee; } */ -form.wikiadmin div { color: #000; background-color: #f2f2f2; } +/*div.wikiadmin { background-color: #fee; } */ +form.wikiadmin div { + color: #000; + background-color: #f2f2f2; +} + div.wikiaction, form.wikiadmin div { } + /* Prevent buttons from overlapping when the toolbar is wrapped. */ -a.wikiaction, a.wikiadmin { line-height: 2.6ex; } +a.wikiaction, a.wikiadmin { + line-height: 2.6ex; +} /* Add space between the input field and following buttons, but not after the last button. */ -div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; } +div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { + margin-right: 0.5em; +} /* ****************************** @@ -466,9 +566,14 @@ */ /* Link icons */ -img.linkicon { vertical-align: middle; } -img.rssicon { vertical-align: baseline; } +img.linkicon { + vertical-align: middle; +} +img.rssicon { + vertical-align: baseline; +} + /* ****************************** *****ADMIN-ACTION @@ -481,10 +586,13 @@ .wikiunsafe { color: #000; - background-color: #f2f2f2;/* MODIFY-color */ + background-color: #f2f2f2; /* MODIFY-color */ } -input.wikiadmin {color: #000; background-color: #fff; } +input.wikiadmin { + color: #000; + background-color: #fff; +} /* ****************************** @@ -498,14 +606,15 @@ font-size: 100%; background-color: transparent; } - /* QuestionMark #600 */ + +/* QuestionMark #600 */ .wikiunknown a, .named-wikiunknown a { color: #FFFFFF; - background-color: #000000;/* MODIFY-color */ + background-color: #000000; /* MODIFY-color */ text-decoration: none; font-weight: normal; font-size: 1em; - padding: 1px; + padding: 1px; padding-top: 0; padding-bottom: 0; border-top: 1px solid #000000; @@ -520,44 +629,66 @@ color: #006; } - /* Interwiki links */ -.wikipage { font-weight: bold; } -.interwiki { text-decoration: none; } -.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; } -.interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; } +.wikipage { + font-weight: bold; +} +.interwiki { + text-decoration: none; +} + +.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { + font-style: oblique; +} + +.interwiki .wikipage, i .interwiki, em .interwiki { + font-style: normal; +} + /* ****************************** *****HEADING ****************************** */ -h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; } +h1, h2, h3, h4, h5, h6 { + font-family: Arial, Helvetica, sans-serif; +} -h1 { /* MODIFY-TXT */ - margin-top: 10px; +h1 { + /* MODIFY-TXT */ + margin-top: 10px; background-color: transparent; color: #555; } -h1 a.backlinks{ /* MODIFY-TXT */ +h1 a.backlinks { + /* MODIFY-TXT */ color: #777; - text-decoration:none; + text-decoration: none; } -h1 a.wiki{ /* MODIFY-TXT */ + +h1 a.wiki { + /* MODIFY-TXT */ color: #777; - text-decoration:none; + text-decoration: none; } -h1 a.pagetitle{ /* MODIFY-TXT */ + +h1 a.pagetitle { + /* MODIFY-TXT */ color: #555; - text-decoration:none; + text-decoration: none; } -h1 a:hover{ /* MODIFY-TXT */ + +h1 a:hover { + /* MODIFY-TXT */ color: #888; - text-decoration:underline; + text-decoration: underline; } -h4, h5, h6 { /* MODIFY-TXT */ - margin-bottom: 0; + +h4, h5, h6 { + /* MODIFY-TXT */ + margin-bottom: 0; background-color: transparent; color: #111; } @@ -572,15 +703,15 @@ div.rss { background-color: #fff; - color:#000; + color: #000; border: 2px solid #ddd; } - div.feed { font-size: 1.4em; padding: 0.5em; } + .chandesc { font-size: 0.9em; } @@ -588,7 +719,7 @@ div.rssitem { display: block; background-color: #fff; - color:#000; + color: #000; border-top: 1px solid #ddd; padding: 0 0.5em; @@ -599,6 +730,7 @@ border: 0; margin-top: 0.5em; } + div.itemdesc { font-size: 1em; margin-bottom: 0.5em; @@ -609,57 +741,74 @@ *****TABLES ****************************** */ -table, td { font-family: Verdana, Arial, Helvetica, sans-serif; } +table, td { + font-family: Verdana, Arial, Helvetica, sans-serif; +} + caption { font-family: Verdana, Arial, Helvetica, sans-serif; width: auto; } + .pagelist { - background-color: white;/* MODIFY-color */ - border:1px #333 dashed;/* MODIFY-color */ + background-color: white; /* MODIFY-color */ + border: 1px #333 dashed; /* MODIFY-color */ } -.pagelist thead, .pagelist thead u {} -.pagelist tr.evenrow { background-color: white ;} -.pagelist tr.oddrow { background-color: white; } -.pagelist td { padding:3px; } + +.pagelist thead, .pagelist thead u { +} + +.pagelist tr.evenrow { + background-color: white; +} + +.pagelist tr.oddrow { + background-color: white; +} + +.pagelist td { + padding: 3px; +} + th.gridbutton { - background-color: ThreeDLightShadow; - color: black; - font-size: small; - font-weight: normal; - font-family: Tahoma, Arial, Helvetica, sans-serif; - height: 18px; - margin: 5px 0; - float: none; - white-space: nowrap; - max-height: 24px; - padding: 5px 0 5px 0; - border-width: 1px; - border-style: solid; - border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight; + background-color: ThreeDLightShadow; + color: black; + font-size: small; + font-weight: normal; + font-family: Tahoma, Arial, Helvetica, sans-serif; + height: 18px; + margin: 5px 0; + float: none; + white-space: nowrap; + max-height: 24px; + padding: 5px 0 5px 0; + border-width: 1px; + border-style: solid; + border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight; } + input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton { - text-decoration: none; - font-size: small; - font-weight: normal; - font-family: Tahoma, Arial, Helvetica, sans-serif; - background-color: ThreeDLightShadow; - color: black; + text-decoration: none; + font-size: small; + font-weight: normal; + font-family: Tahoma, Arial, Helvetica, sans-serif; + background-color: ThreeDLightShadow; + color: black; } -.wikilink{ - display:block; +.wikilink { + display: block; } -#revision{ - font-size:10px; - text-align:right; - background-color: #f2f2f2;/* MODIFY-color */ +#revision { + font-size: 10px; + text-align: right; + background-color: #f2f2f2; /* MODIFY-color */ /* "paper" borders */ padding-left: 2em; padding-right: 1em; - padding-top: 0.5ex; + padding-top: 0.5ex; padding-bottom: 0.5ex; clear: both; } @@ -670,35 +819,43 @@ padding: 0; padding-top: 0.25ex; } -#xhtml-validator -{ + +#xhtml-validator { font-size: small; text-align: center; margin-top: 1em; } - /* ****************************** *****EDIT-PAGE ****************************** */ -form { margin: 0; } +form { + margin: 0; +} + input, textarea { margin: 0.1em; background-color: #FFF; vertical-align: middle; font-size: 1em; } -input.wikisignin{ + +input.wikisignin { border: 0 none; - background-color:#FFF; + background-color: #FFF; } -input.wikiaction{ + +input.wikiaction { border: 1px solid black; - background-color:#D7FA8C; + background-color: #D7FA8C; } -input.numeric { text-align: center; } + +input.numeric { + text-align: center; +} + /* Make the textarea the full page width */ textarea.wikiedit { width: 90%; @@ -714,13 +871,15 @@ font-size: smaller; border: 1px none; } -#editarea-size legend{ + +#editarea-size legend { text-align: right; font-size: smaller; border: 1px solid #CCC; background-color: #ccc; } -.editarea legend{ + +.editarea legend { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 1em; line-height: 1em; @@ -728,19 +887,21 @@ border: 1px solid #333; background-color: #eee; } + fieldset.editarea { - margin : 1ex; + margin: 1ex; margin-top: 1em; text-align: center; - padding : 10px; + padding: 10px; border: 1px solid #333; background-color: #E8E8E5; } + fieldset.toolbar { - margin : 1ex; + margin: 1ex; margin-top: 0; text-align: center; - padding : 3px; + padding: 3px; border: 1px solid #FFF; background-color: #FFF; } @@ -750,50 +911,53 @@ .transclusion-title { text-align: right; font-style: oblique; - font-size: smaller; + font-size: smaller; text-decoration: underline; margin-bottom: 0.25ex; - margin-right: 0.25em; + margin-right: 0.25em; } + .transclusion, .wiki-edithelp { font-size: smaller; } + .transclusion { - border: 1px solid gray;/* MODIFY-color */ - padding-left: 0.8em; + border: 1px solid gray; /* MODIFY-color */ + padding-left: 0.8em; padding-right: 0.8em; - padding-top: 0; - padding-bottom: 0; - margin-left: 0.25em; - margin-right: 0.25em; + padding-top: 0; + padding-bottom: 0; + margin-left: 0.25em; + margin-right: 0.25em; margin-bottom: 0.1ex; } + .wiki-edithelp { background-color: white; border: medium solid #fff8dc; /* MODIFY-color */ - padding-left: 0.5em; + padding-left: 0.5em; padding-right: 0.5em; - padding-top: 0.75ex; + padding-top: 0.75ex; padding-bottom: 0.75ex; - margin-left: 0; + margin-left: 0; margin-right: 0; margin-top: 1ex; margin-bottom: 1ex; } + .wiki-edithelp .wiki { /* color: #5454ff;*/ } + .wiki-edithelp p { font-family: Verdana, Helvetica, Arial, sans-serif; - padding-left: 0.5em; + padding-left: 0.5em; padding-right: 0.5em; - padding-top: 0.5ex; + padding-top: 0.5ex; padding-bottom: 0.5ex; margin: 0; } - - /* ****************************** *****CALENDAR @@ -801,14 +965,15 @@ */ table.cal { - float:right; - font-size:10px; + float: right; + font-size: 10px; border: 1px solid #333; - background-color: #ccc;/* MODIFY-color */ + background-color: #ccc; /* MODIFY-color */ margin: 10px; padding: 1px; /* For Mozilla */ - empty-cells: hide;} + empty-cells: hide; +} /* cells */ table.cal td { @@ -816,73 +981,98 @@ } /* Month-name header */ -table.cal-header { /* MODIFY-TXT */ -font-size: larger; -background-color: #333;/* MODIFY-color */ -color: #f2f2f2;} -table.cal-header tr, table.cal-header td { text-align: center; } -.cal-arrow {/* MODIFY-TXT */ +table.cal-header { + /* MODIFY-TXT */ + font-size: larger; + background-color: #333; /* MODIFY-color */ + color: #f2f2f2; +} + +table.cal-header tr, table.cal-header td { + text-align: center; +} + +.cal-arrow { + /* MODIFY-TXT */ font-weight: bold; text-decoration: none; color: #fff; } -a.cal-arrow {/* MODIFY-TXT */ - color:#fff; + +a.cal-arrow { + /* MODIFY-TXT */ + color: #fff; } /* Day-names header */ -table.cal tbody tr .cal-dayname { } +table.cal tbody tr .cal-dayname { +} .cal-dayname td { - text-align: center; + text-align: center; font-size: smaller; text-decoration: none; - background-color: #f2f2f2;/* MODIFY-color */ + background-color: #f2f2f2; /* MODIFY-color */ } /* Individual days */ a.cal-hide { - font-size: 9px; -text-decoration: none; } + font-size: 9px; + text-decoration: none; +} /* Today */ - /* cell */ +/* cell */ table.cal td.cal-today { margin: 1px; - border: 1px solid #333;/* MODIFY-color */ + border: 1px solid #333; /* MODIFY-color */ color: #000; - background-color: #f2f2f2;/* MODIFY-color */ + background-color: #f2f2f2; /* MODIFY-color */ } - /* text */ -table.cal td.cal-day a.cal-day {font-size: 9px; -text-decoration: underline; } +/* text */ +table.cal td.cal-day a.cal-day { + font-size: 9px; + text-decoration: underline; +} + /* ****************************** *****DIFF ****************************** */ -.diff .block div { position: relative; padding-left: 1.5em; } -.diff .prefix { position: absolute; left: 0.5em; top: 0; } +.diff .block div { + position: relative; + padding-left: 1.5em; +} + +.diff .prefix { + position: absolute; + left: 0.5em; + top: 0; +} + /* main box */ .diff { -color: #000; + color: #000; background-color: transparent; border: 1px solid black; } + .diff .block { -color: #000; + color: #000; background-color: #ccc; padding-left: 1em; } /* individual blocks */ .diff .context { -color: #000; + color: #000; background-color: transparent; border: none; } + /* + - line prefix */ .diff .block tt { font-weight: normal; @@ -892,6 +1082,7 @@ margin-left: 0; border: none; } + /* changed words */ .diff del, .diff ins { font-weight: bold; @@ -901,33 +1092,45 @@ /* blocks containing deleted or added words */ .diff .original, .diff .deleted, .diff .final, .diff .added { -color: #000; + color: #000; background-color: white; } + /* blocks containing deleted words */ .diff .original, .diff .deleted { -color: #000; + color: #000; background-color: #fcc; border: none; } + /* blocks containing added words */ .diff .final, .diff .added { -color: #000; + color: #000; background-color: #cfc; border: none; } /* deleted words */ -.diff del {color: #000; background-color: #f99; } +.diff del { + color: #000; + background-color: #f99; +} + /* added words */ -.diff ins {color: #000; background-color: #9f9; } +.diff ins { + color: #000; + background-color: #9f9; +} /* ****************************** *****INFO-HISTORY ****************************** */ -td.pageinfo { font-weight: bold; } +td.pageinfo { + font-weight: bold; +} + .pageinfo-minoredit, .pageinfo-authorid { font-size: smaller; font-style: oblique; @@ -953,47 +1156,46 @@ ****************************** */ -#clear - { - clear : both; - margin : 0; - margin-top : -7px; - padding : 2px; - text-align : center; - color : #000; - background-color : #FFF; - border : solid 0; +#clear { + clear: both; + margin: 0; + margin-top: -7px; + padding: 2px; + text-align: center; + color: #000; + background-color: #FFF; + border: solid 0; } + /* reset post NN4 */ /*/*/ -#clear - { - margin-top : 0; +#clear { + margin-top: 0; } - /* ****************************** *****IMG-HACK ****************************** */ -img.inlineimage{ +img.inlineimage { border: 0; vertical-align: middle; - margin : 0 5px 0 5px; + margin: 0 5px 0 5px; } -em > img.inlineimage{ + +em > img.inlineimage { float: left; border: 0; vertical-align: middle; - margin : 5px 15px 15px 0; + margin: 5px 15px 15px 0; } -strong > img.inlineimage{ +strong > img.inlineimage { float: right; border: 0; vertical-align: middle; - margin : 5px 0 15px 15px; + margin: 5px 0 15px 15px; } /* @@ -1005,7 +1207,7 @@ h2.wikiblog-heading { font-size: 2em; padding-bottom: 0.5em; - border-bottom: 2px solid gray;/* MODIFY-color */ + border-bottom: 2px solid gray; /* MODIFY-color */ } /* @@ -1014,17 +1216,22 @@ ****************************** */ -.interwiki-map thead td { text-decoration: underline; } -.printer { display: none; } +.interwiki-map thead td { + text-decoration: underline; +} +.printer { + display: none; +} + .error { color: black; background-color: #eee; - margin-top: 1em; + margin-top: 1em; margin-bottom: 1em; - padding-left: 0.8em; + padding-left: 0.8em; padding-right: 0.8em; - padding-top: 0.8ex; + padding-top: 0.8ex; padding-bottom: 0; border: medium solid red; clear: both; Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/Hawaiian/Hawaiian.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -11,41 +11,70 @@ * General */ img { - border: 0; - vertical-align: baseline; + border: 0; + vertical-align: baseline; } -form { margin: 0; } -input { margin: 0.1em; } -input.numeric { text-align: right; } +form { + margin: 0; +} + +input { + margin: 0.1em; +} + +input.numeric { + text-align: right; +} + table { - border-spacing: 1px; - /* For Mozilla */ - empty-cells: show; + border-spacing: 1px; + /* For Mozilla */ + empty-cells: show; } + caption { - caption-side: top; - text-align: left; - margin-bottom: .5ex; - /* Allow the caption to extend to the full page width */ - width: 100%; + caption-side: top; + text-align: left; + margin-bottom: .5ex; + /* Allow the caption to extend to the full page width */ + width: 100%; } /* generic classes ----------------------------------------------- */ -.tt { font-family: monospace; } -.strike { text-decoration:line-through; } +.tt { + font-family: monospace; +} -.align-left {text-align: left;} -.align-right {text-align: right;} -.align-center {text-align: center;} - -.top {vertical-align: top;} +.strike { + text-decoration: line-through; +} -.nowrap {white-space: nowrap;} +.align-left { + text-align: left; +} -.fullwidth { width: 100%; } +.align-right { + text-align: right; +} +.align-center { + text-align: center; +} + +.top { + vertical-align: top; +} + +.nowrap { + white-space: nowrap; +} + +.fullwidth { + width: 100%; +} + /* --------------------------------------------------------------- */ /** @@ -54,426 +83,542 @@ /* Main wiki text box */ body { - color: black; - background-color: white; - background-image: url("images/uhhbackground.jpg"); - background-repeat: repeat; - font-family: Arial, Helvetica, sans-serif; - margin: 1ex 0.5em; + color: black; + background-color: white; + background-image: url("images/uhhbackground.jpg"); + background-repeat: repeat; + font-family: Arial, Helvetica, sans-serif; + margin: 1ex 0.5em; } + body p { - margin-left: 1em; + margin-left: 1em; } #logo img { - border: 1px outset gray; - margin-left: 1em; - margin-bottom: 1ex; + border: 1px outset gray; + margin-left: 1em; + margin-bottom: 1ex; } + img#signature { - background-color: white; - border: 1px outset gray; - padding-left: 8px; - padding-right: 8px; - padding-top: 8px; - padding-bottom: 14px; + background-color: white; + border: 1px outset gray; + padding-left: 8px; + padding-right: 8px; + padding-top: 8px; + padding-bottom: 14px; } + div.wikitext { - margin-top: 1ex; - margin-bottom: 0.5ex; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - clear: both; + margin-top: 1ex; + margin-bottom: 0.5ex; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + clear: both; } -div.wikitext hr { height: 1px; } -div.wikitext pre { font-family: monospace; } +div.wikitext hr { + height: 1px; +} +div.wikitext pre { + font-family: monospace; +} /* Mozilla RecentChanges Sidebar */ body.sidebar { - font-size: smaller; - margin: 0.5em; + font-size: smaller; + margin: 0.5em; } + body.sidebar div.wikitext { - padding: 0.5em; + padding: 0.5em; } -body.sidebar div.wikitext ul { padding-left: 1em; } -body.sidebar h2 { margin-top: 0; } +body.sidebar div.wikitext ul { + padding-left: 1em; +} +body.sidebar h2 { + margin-top: 0; +} + /** * Link styles */ .wiki, .named-wiki { - font-weight: bold; - color: #87785c; + font-weight: bold; + color: #87785c; } -.wiki { text-decoration: none; } -.named-wiki { text-decoration: underline; } +.wiki { + text-decoration: none; +} + +.named-wiki { + text-decoration: underline; +} + /** * wikiaction, wikiadmin, wikiunsafe: */ -.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks { text-decoration: none; } -.wikiaction, .wikiadmin { font-weight: bold; } +.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks { + text-decoration: none; +} -.wikiaction, .wikiaction table, span.wikiaction { color: #4d5a6b; } -.wikiadmin, .wikiadmin table { color :#ff7e00; } -.wikiunsafe { } +.wikiaction, .wikiadmin { + font-weight: bold; +} -.backlinks { color: #1d4fc0; } -h1 .backlinks { text-decoration: underline; } +.wikiaction, .wikiaction table, span.wikiaction { + color: #4d5a6b; +} +.wikiadmin, .wikiadmin table { + color: #ff7e00; +} +.wikiunsafe { +} + +.backlinks { + color: #1d4fc0; +} + +h1 .backlinks { + text-decoration: underline; +} + /* Unknown links */ -.wikiunknown a, .named-wikiunknown a, .wikiunknown u { color: #a6977a; } +.wikiunknown a, .named-wikiunknown a, .wikiunknown u { + color: #a6977a; +} /* Interwiki links */ -.wikipage { font-weight: bold; } -.interwiki { text-decoration: none; } +.wikipage { + font-weight: bold; +} + +.interwiki { + text-decoration: none; +} + .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { - font-style: oblique; + font-style: oblique; } + .interwiki .wikipage, i .interwiki, em .interwiki { - font-style: normal; + font-style: normal; } - /** * headings */ -h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; } +h1, h2, h3, h4, h5, h6 { + font-family: Arial, Helvetica, sans-serif; +} -h1 { margin: 0; } +h1 { + margin: 0; +} /** * tables */ -caption { font-family: Arial, Helvetica, sans-serif; } +caption { + font-family: Arial, Helvetica, sans-serif; +} + .pagelist { } + .pagelist thead, .pagelist thead u { } -.pagelist tr.evenrow { background-color: #eee; } -.pagelist tr.oddrow { background-color: white; } + +.pagelist tr.evenrow { + background-color: #eee; +} + +.pagelist tr.oddrow { + background-color: white; +} + th.gridbutton { - background-color: ThreeDLightShadow; - color: black; - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-size: small; - font-weight: normal; - margin: 5px 0; - white-space: nowrap; - max-height: 24px; - padding: 5px 0 5px 0; - border-width: 1px; - border-style: solid; - border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight; + background-color: ThreeDLightShadow; + color: black; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-size: small; + font-weight: normal; + margin: 5px 0; + white-space: nowrap; + max-height: 24px; + padding: 5px 0 5px 0; + border-width: 1px; + border-style: solid; + border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight; } + input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton { - text-decoration: none; - font-size: small; - font-weight: normal; - font-family: Tahoma, Arial, Helvetica, sans-serif; - background-color: ThreeDLightShadow; - color: black; + text-decoration: none; + font-size: small; + font-weight: normal; + font-family: Tahoma, Arial, Helvetica, sans-serif; + background-color: ThreeDLightShadow; + color: black; } /** * Toolbar */ -.toolbar, input.button { font-family: Arial, Helvetica, sans-serif; } +.toolbar, input.button { + font-family: Arial, Helvetica, sans-serif; +} .toolbar { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } + /* Prevent buttons from overlapping when wrapped */ -#navbar, #actionbar { line-height: 140%; } +#navbar, #actionbar { + line-height: 140%; +} .editdate { - font-family: Arial, Helvetica, sans-serif; - margin: 0; - padding: 0; - padding-top: 0.25ex; + font-family: Arial, Helvetica, sans-serif; + margin: 0; + padding: 0; + padding-top: 0.25ex; } - /** * Edit Page & View Source */ /* Make the textarea the full page width */ .wikiedit { - width: 100%; - margin-bottom: 0.5ex; - margin-top: 0.5ex; - padding: 2px; + width: 100%; + margin-bottom: 0.5ex; + margin-top: 0.5ex; + padding: 2px; } -input.button { font-family: Arial, Helvetica, sans-serif; } +input.button { + font-family: Arial, Helvetica, sans-serif; +} + #editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; + margin-top: 1ex; + text-align: right; + font-size: smaller; } /* IncludePage plugin ================================================= */ .transclusion-title { - text-align: right; - font-style: oblique; - font-size: smaller; - text-decoration: underline; - margin-bottom: 0.25ex; - margin-right: 0.25em; + text-align: right; + font-style: oblique; + font-size: smaller; + text-decoration: underline; + margin-bottom: 0.25ex; + margin-right: 0.25em; } + .transclusion, .wiki-edithelp { - font-size: smaller; + font-size: smaller; } + .transclusion { - background: inherit; - border: 1px dotted #a6977a; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0; - padding-bottom: 0; - margin-left: 0.25em; - margin-right: 0.25em; - margin-bottom: 0.1ex; + background: inherit; + border: 1px dotted #a6977a; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0; + padding-bottom: 0; + margin-left: 0.25em; + margin-right: 0.25em; + margin-bottom: 0.1ex; } + .wiki-edithelp { - border: medium solid #d8caae; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.75ex; - padding-bottom: 0.75ex; - margin-left: 0; - margin-right: 0; - margin-top: 1ex; - margin-bottom: 1ex; + border: medium solid #d8caae; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.75ex; + padding-bottom: 0.75ex; + margin-left: 0; + margin-right: 0; + margin-top: 1ex; + margin-bottom: 1ex; } + .wiki-edithelp .wiki { - color: #87785c; + color: #87785c; } + .wiki-edithelp p { - font-family: Arial, Helvetica, sans-serif; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - margin: 0; + font-family: Arial, Helvetica, sans-serif; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + margin: 0; } - /** * Calendar plugin */ table.cal { - border: 1px outset gray; - margin: 0.5ex 0.5em; - padding: 1px; - /* For Mozilla */ - empty-cells: hide; + border: 1px outset gray; + margin: 0.5ex 0.5em; + padding: 1px; + /* For Mozilla */ + empty-cells: hide; } + /* Month-name & arrows area */ table.cal thead { } + table.cal table.cal-header td { - padding-top: 110px; + padding-top: 110px; } + table.cal thead tr:first-child { - background-image: url("images/pictures/SteamVolcanoDusk.jpg"); - background-repeat: no-repeat; - background-position: center; - font-size: larger; + background-image: url("images/pictures/SteamVolcanoDusk.jpg"); + background-repeat: no-repeat; + background-position: center; + font-size: larger; } - /* Month-name & arrows cells */ + +/* Month-name & arrows cells */ table.cal table.cal-header td { - text-align: center; - color: white; - background-color: transparent; - border: 0; + text-align: center; + color: white; + background-color: transparent; + border: 0; } - /* arrow text */ + +/* arrow text */ .cal-arrow { - text-decoration: none; - color: white; - font-weight: bold; + text-decoration: none; + color: white; + font-weight: bold; } /* Day-names header */ table.cal tr .cal-dayname { - background: inherit; + background: inherit; } + .cal-dayname td { - text-align: center; - font-size: smaller; - text-decoration: none; - color: black; - padding-bottom: 0.5ex; + text-align: center; + font-size: smaller; + text-decoration: none; + color: black; + padding-bottom: 0.5ex; } /* Individual days */ - /* cells */ +/* cells */ table.cal tbody td { - border: 0.5pt solid #ddd; - background-color: white; - text-align: right; + border: 0.5pt solid #ddd; + background-color: white; + text-align: right; } - /* text */ + +/* text */ a.cal-hide { - text-decoration: none; - color: black; - font-weight: normal; + text-decoration: none; + color: black; + font-weight: normal; } - /* Today */ - /* cell */ + +/* Today */ +/* cell */ table.cal td.cal-today { - margin: 1px; - background-color: white; - border: 0.5pt solid black; + margin: 1px; + background-color: white; + border: 0.5pt solid black; } - /* text */ + +/* text */ table.cal td.cal-today a { - color: blue; + color: blue; } - /* Day with a data page */ - /* cell */ + +/* Day with a data page */ +/* cell */ table.cal td.cal-day { - margin: 1px; - background-color: white; - border: 0.5pt solid black; + margin: 1px; + background-color: white; + border: 0.5pt solid black; } - /* text */ + +/* text */ table.cal td.cal-day a { - color: red; - text-decoration: none; + color: red; + text-decoration: none; } - /** * Diff Output */ /* main box */ .diff .block { - background-color: #ccc; - padding: 0.5ex 0.5em; - margin: 0.5ex 0; + background-color: #ccc; + padding: 0.5ex 0.5em; + margin: 0.5ex 0; } /* individual lines */ -.diff .context { background-color: white; } +.diff .context { + background-color: white; +} /* + - line prefix */ -.diff .block tt{ - font-weight: bold; - font-family: monospace; - margin-left: -.6em; - color: black; +.diff .block tt { + font-weight: bold; + font-family: monospace; + margin-left: -.6em; + color: black; } .diff del, .diff ins { - font-weight: bold; - text-decoration: none; + font-weight: bold; + text-decoration: none; } -.diff .original, .diff .deleted { background-color: #fcc; } -.diff .final, .diff .added { background-color: #cfc; } -.diff del { background-color: #f99; } -.diff ins { background-color: #9f9; } +.diff .original, .diff .deleted { + background-color: #fcc; +} +.diff .final, .diff .added { + background-color: #cfc; +} + +.diff del { + background-color: #f99; +} + +.diff ins { + background-color: #9f9; +} + /** * Other */ -.printer { display: none; } +.printer { + display: none; +} div.error { - color: black; - border: medium solid #d8caae; - margin-top: 1em; - margin-bottom: 1em; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.8ex; - padding-bottom: 0; - font-size: smaller; - clear: both; + color: black; + border: medium solid #d8caae; + margin-top: 1em; + margin-bottom: 1em; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.8ex; + padding-bottom: 0; + font-size: smaller; + clear: both; } /* Debug */ .debug { - color: black; - font-family: monospace; - margin: 1ex 0; - padding: 0.5ex 0.5em; - border: medium solid #d8caae; + color: black; + font-family: monospace; + margin: 1ex 0; + padding: 0.5ex 0.5em; + border: medium solid #d8caae; } .clear-floats { - clear: both; + clear: both; } /** * Search Results */ -.search-context { background-color: white; font-style: oblique; } +.search-context { + background-color: white; + font-style: oblique; +} + .search-term { - background-color: yellow; - font-weight: normal; + background-color: yellow; + font-weight: normal; } + #LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; + position: absolute; + text-align: left; + display: none; + z-index: 100; + background-color: white; + border: 1px solid #d0d0d0; + font-size: 9px; + overflow: hidden; } + #LSHighlight { - background-color: #f08000; + background-color: #f08000; } + #LSResult .evenrow { - background-color: #f0f0f0; + background-color: #f0f0f0; } -.toolbar, div.toolbar { margin: 0.5ex 0; } +.toolbar, div.toolbar { + margin: 0.5ex 0; +} /* Link icons */ -img.linkicon { vertical-align: middle; } +img.linkicon { + vertical-align: middle; +} div.wikitext { - width: auto; - background-image: url("images/tchecker-white.png"); - background-repeat: repeat; + width: auto; + background-image: url("images/tchecker-white.png"); + background-repeat: repeat; } + .wiki-edithelp { - background-image: url("images/tchecker-sand.png"); - background-repeat: repeat; + background-image: url("images/tchecker-sand.png"); + background-repeat: repeat; } + .wiki-edithelp p { - background-image: url("images/tchecker-white.png"); - background-repeat: repeat; + background-image: url("images/tchecker-white.png"); + background-repeat: repeat; } /** * Diff Output */ -.diff .block div { position: relative; padding-left: 1.5em; } -.diff .prefix { position: absolute; left: 0.5em; top: 0; } +.diff .block div { + position: relative; + padding-left: 1.5em; +} +.diff .prefix { + position: absolute; + left: 0.5em; + top: 0; +} + /** * Other */ .debug { - background-image: url("images/tchecker-sand.png"); - background-repeat: repeat; + background-image: url("images/tchecker-sand.png"); + background-repeat: repeat; } /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ Modified: trunk/themes/MacOSX/MacOSX-topbottombars.css =================================================================== --- trunk/themes/MacOSX/MacOSX-topbottombars.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/MacOSX/MacOSX-topbottombars.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -4,9 +4,9 @@ * General settings */ body { - /* Odd large top padding is needed for Mozilla */ - padding-top: 16ex; - padding-bottom: 9ex; + /* Odd large top padding is needed for Mozilla */ + padding-top: 16ex; + padding-bottom: 9ex; } /** @@ -15,45 +15,47 @@ * #navbar and #actionbar, such as in editpage and removepage */ div#header, div#footer { - background: white url("images/bgpaper8.png"); - margin: 0; - padding: 0; - position: fixed; - left: 0; - right: 0; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - padding-left: 1em; - padding-right: 1em; + background: white url("images/bgpaper8.png"); + margin: 0; + padding: 0; + position: fixed; + left: 0; + right: 0; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + padding-left: 1em; + padding-right: 1em; } + hr.toolbar { - display: none; + display: none; } - /** * Navbar */ div#header { - top: 0; - border-bottom: 1px solid #b2b2b2; + top: 0; + border-bottom: 1px solid #b2b2b2; } + div#navbuttons { - padding-bottom: 0.25ex; + padding-bottom: 0.25ex; } /** * Actionbar */ div#footer { - border-top: 1px solid #b2b2b2; - /* kludge for Mozilla */ - bottom: -1ex; - padding-bottom: 0; + border-top: 1px solid #b2b2b2; + /* kludge for Mozilla */ + bottom: -1ex; + padding-bottom: 0; } + p.editdate { - margin-top: 0.75ex; - margin-bottom: 0.5ex; + margin-top: 0.75ex; + margin-bottom: 0.5ex; } /* For emacs users Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/MacOSX/MacOSX.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -23,713 +23,1000 @@ TODO: Get rid of tables in wikiaction forms. */ -body { background: #fafafa url("images/bgpaper8.png"); } -body.edit { background: #fafafa url("images/bggranular.png"); } +body { + background: #fafafa url("images/bgpaper8.png"); +} -body { } +body.edit { + background: #fafafa url("images/bggranular.png"); +} +body { +} + /* Ensure identical vertical alignment for adjacent form buttons, whether image based (Theme buttons) or not */ input[type=submit], input[type=cancel], -input[type=image] { vertical-align: middle } +input[type=image] { + vertical-align: middle +} -h1, h2, h3, .toolbar, td { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; } +h1, h2, h3, .toolbar, td { + font-family: "Lucida Grande", Helvetica, Arial, sans-serif; +} -input.button { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; } +input.button { + font-family: "Lucida Grande", Helvetica, Arial, sans-serif; +} input.numeric { - text-align: right; + text-align: right; } -.wikitext pre { font-family: Monaco, monospace; } +.wikitext pre { + font-family: Monaco, monospace; +} + input[type=text] { - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; } /* Add space between the input field and following buttons, but not after the last button. */ div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { - margin-right: 0.5em; + margin-right: 0.5em; } /* generic classes ----------------------------------------------- */ -.tt { font-family: monospace; } -.strike { text-decoration:line-through; } +.tt { + font-family: monospace; +} -.align-left {text-align: left;} -.align-right {text-align: right;} -.align-center {text-align: center;} - -.top {vertical-align: top;} +.strike { + text-decoration: line-through; +} -.nowrap {white-space: nowrap;} +.align-left { + text-align: left; +} -.fullwidth { width: 100%; } +.align-right { + text-align: right; +} +.align-center { + text-align: center; +} + +.top { + vertical-align: top; +} + +.nowrap { + white-space: nowrap; +} + +.fullwidth { + width: 100%; +} + /* --------------------------------------------------------------- */ /** * Wiki */ div.wikitext { - background: white; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.5em; - padding-bottom: 0.5em; - margin: 0.5ex 0; - clear: both; + background: white; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.5em; + padding-bottom: 0.5em; + margin: 0.5ex 0; + clear: both; } -input.wikitext { margin:0; } +input.wikitext { + margin: 0; +} + input[type=text] { - height: 2.7ex; - padding: 0.4ex 0.3ex; + height: 2.7ex; + padding: 0.4ex 0.3ex; } -div.toolbar { margin: 1ex 0; } +div.toolbar { + margin: 1ex 0; +} /** * PageTypes */ .interwiki-map thead td { - background: #e8e8e8; - font-weight: bold; - font-size: smaller; + background: #e8e8e8; + font-weight: bold; + font-size: smaller; } -.interwiki-map thead td:first-child { text-decoration: underline; } -.interwiki-moniker { background: #eee; } -.interwiki-url { background: #f8f8f8; } +.interwiki-map thead td:first-child { + text-decoration: underline; +} + +.interwiki-moniker { + background: #eee; +} + +.interwiki-url { + background: #f8f8f8; +} + /* Mozilla RecentChanges Sidebar */ body.sidebar { - font-size: smaller; - margin: 0.5em; + font-size: smaller; + margin: 0.5em; } + body.sidebar div.wikitext { - padding: 0.5em; + padding: 0.5em; } -body.sidebar div.wikitext ul { padding-left: 1em; } -body.sidebar h2 { margin-top: 0; } +body.sidebar div.wikitext ul { + padding-left: 1em; +} + +body.sidebar h2 { + margin-top: 0; +} + div.error { - background: #eee; - border: 1px solid gray; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.8ex; - padding-bottom: 0; - margin-top: 1em; - clear: both; - font-size: smaller; + background: #eee; + border: 1px solid gray; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.8ex; + padding-bottom: 0; + margin-top: 1em; + clear: both; + font-size: smaller; } /* Debug */ .debug { - color: black; - background: white; - font-family: monospace; - font-size: smaller; - margin: 1ex 0; - padding: 0.5ex 0.5em; - border: 1px solid #eee; + color: black; + background: white; + font-family: monospace; + font-size: smaller; + margin: 1ex 0; + padding: 0.5ex 0.5em; + border: 1px solid #eee; } /* * Link styles */ /* Wiki Links */ -a.wiki { text-decoration: none; } -.wiki, .named-wiki { font-weight: bold; color:#1d42be; } /*blue*/ +a.wiki { + text-decoration: none; +} +.wiki, .named-wiki { + font-weight: bold; + color: #1d42be; +} + +/*blue*/ + /* Unknown links */ -.wikiunknown a, .named-wikiunknown a, .wikiunknown U { text-decoration: none; } +.wikiunknown a, .named-wikiunknown a, .wikiunknown U { + text-decoration: none; +} -.wikiunknown, .named-wikiunknown {color: #555; } +.wikiunknown, .named-wikiunknown { + color: #555; +} /* Interwiki links */ -a.interwiki { text-decoration: none; } -.wikipage { font-weight: bold; } +a.interwiki { + text-decoration: none; +} +.wikipage { + font-weight: bold; +} + .interwiki, -i .interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; } +i .interwiki .wikipage, em .interwiki .wikipage { + font-style: oblique; +} .interwiki .wikipage, -i .interwiki, em .interwiki { font-style: normal; } +i .interwiki, em .interwiki { + font-style: normal; +} /* * wikiaction, wikiadmin, wikiunsafe: */ -a.wikiaction, a.wikiadmin { text-decoration: none; } +a.wikiaction, a.wikiadmin { + text-decoration: none; +} -img { border: 0; } -img.rssicon { vertical-align: middle; } -img.wiki-button { vertical-align: middle; } -.wiki-button { border:0; } +img { + border: 0; +} -a.wikiaction { border: 0; } +img.rssicon { + vertical-align: middle; +} +img.wiki-button { + vertical-align: middle; +} + +.wiki-button { + border: 0; +} + +a.wikiaction { + border: 0; +} + /* backlinks */ -a.backlinks { color: #006; } +a.backlinks { + color: #006; +} /* Make the textarea on the edit page full width */ -textarea.wikiedit { width: 100%; margin-top: 1ex; } +textarea.wikiedit { + width: 100%; + margin-top: 1ex; +} -p.editdate { font-size: smaller; margin-bottom: 0; font-family: "Lucida Grande", Helvetica, Arial, sans-serif; } +p.editdate { + font-size: smaller; + margin-bottom: 0; + font-family: "Lucida Grande", Helvetica, Arial, sans-serif; +} /* Calendar plugin */ a.cal-hide, -a.cal-arrow { text-decoration: none; } -.cal-arrow { font-weight: bold; } +a.cal-arrow { + text-decoration: none; +} + +.cal-arrow { + font-weight: bold; +} + .cal-dayname { - font-size: smaller; - text-decoration: none; + font-size: smaller; + text-decoration: none; } + table.cal td { - background: white; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; + background: white; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; } + table.cal-header td { - font-size: larger; - background: white; - border: 0; + font-size: larger; + background: white; + border: 0; } -table.cal td.cal-dayname { background: #e8e8e8; } + +table.cal td.cal-dayname { + background: #e8e8e8; +} + table.cal td.cal-today { - background: #f4f4f4; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; + background: #f4f4f4; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; } /* IncludePage plugin ================================================= */ .transclusion-title { - font-family: "Lucida Grande", Helvetica, Arial, sans-serif; - font-size: smaller; - text-decoration: underline; - text-align: right; - font-style: oblique; - margin-bottom: 0.25ex; - margin-right: 0.25em; + font-family: "Lucida Grande", Helvetica, Arial, sans-serif; + font-size: smaller; + text-decoration: underline; + text-align: right; + font-style: oblique; + margin-bottom: 0.25ex; + margin-right: 0.25em; } .transclusion { - background: #fdfdfd; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0; - padding-bottom: 0; - margin: 0.5ex ; - margin-left: 0.25em; - margin-right: 0.25em; - margin-bottom: 0.1ex; - font-size: smaller; + background: #fdfdfd; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0; + padding-bottom: 0; + margin: 0.5ex; + margin-left: 0.25em; + margin-right: 0.25em; + margin-bottom: 0.1ex; + font-size: smaller; } /* The transclusion of the TextEditingRules Synopsis on templates/editpage.html */ .wiki-edithelp .transclusion { - font-size: smaller; - background: inherit; - padding: 0.5ex 0.5em; - margin: 0.2ex 5%; + font-size: smaller; + background: inherit; + padding: 0.5ex 0.5em; + margin: 0.2ex 5%; } -.wiki-edithelp .transclusion p { margin: 0; } + +.wiki-edithelp .transclusion p { + margin: 0; +} + .wiki-edithelp { - background: white; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.75ex; - padding-bottom: 0.75ex; - margin-left: 0; - margin-right: 0; - margin-top: 1ex; - margin-bottom: 1ex; - font-size: smaller; + background: white; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.75ex; + padding-bottom: 0.75ex; + margin-left: 0; + margin-right: 0; + margin-top: 1ex; + margin-bottom: 1ex; + font-size: smaller; } + .wiki-edithelp p { - font-family: Arial, Helvetica, sans-serif; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - margin: 0; + font-family: Arial, Helvetica, sans-serif; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + margin: 0; } + div.wiki-message { - background: #fff url("images/bggranular.png"); - border: solid 1px #d8d8d8; - padding: 6pt; + background: #fff url("images/bggranular.png"); + border: solid 1px #d8d8d8; + padding: 6pt; } -.printer { display: none; } +.printer { + display: none; +} /** * Diff Output */ /* main box */ .diff { - background: white; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; + background: white; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; } + .diff .block { - background: #d8d8d8; + background: #d8d8d8; } /* individual blocks */ .diff .context { - background: white; - border: none; + background: white; + border: none; } + /* + - line prefix */ .diff .block tt.prefix { - font-weight: normal; - font-family: monospace; - margin-left: -1.6em; - color: black; - border: none; + font-weight: normal; + font-family: monospace; + margin-left: -1.6em; + color: black; + border: none; } + /* changed words */ -.diff ins { font-weight: bolder; } -.diff ins { text-decoration: none; } +.diff ins { + font-weight: bolder; +} +.diff ins { + text-decoration: none; +} + /* blocks containing deleted or added words */ .diff .original, .diff .deleted, .diff .final, .diff .added { - background: white; + background: white; } + /* blocks containing deleted words */ .diff .original:first-child, .diff .deleted:first-child { - border-top: 2px solid #f99; /* fcc */ + border-top: 2px solid #f99; /* fcc */ } + .diff .original, .diff .deleted { - background: white; - border-left: 2px solid #f99; /* fcc */ - border-right: 2px solid #f99; /* fcc */ + background: white; + border-left: 2px solid #f99; /* fcc */ + border-right: 2px solid #f99; /* fcc */ } + .diff .original:last-child, .diff .deleted:last-child { - border-bottom: 2px solid #f99; /* fcc */ + border-bottom: 2px solid #f99; /* fcc */ } + /* blocks containing added words */ .diff .final:first-child, .diff .added:first-child { - border-top: 2px solid #9f9; /* cfc */ + border-top: 2px solid #9f9; /* cfc */ } + .diff .final, .diff .added { - background: white; - border-left: 2px solid #9f9; /* cfc */ - border-right: 2px solid #9f9; /* cfc */ + background: white; + border-left: 2px solid #9f9; /* cfc */ + border-right: 2px solid #9f9; /* cfc */ } + .diff .final:last-child, .diff .added:last-child { - border-bottom: 2px solid #9f9; /* cfc */ + border-bottom: 2px solid #9f9; /* cfc */ } + /* deleted words */ -.diff del { background: #fcc; } /* f99 */ +.diff del { + background: #fcc; +} + +/* f99 */ /* added words */ -.diff ins { background: #cfc; } /* 9f9 */ +.diff ins { + background: #cfc; +} +/* 9f9 */ /** * PageList output */ .pagelist { - font-size: smaller; + font-size: smaller; } -.pagelist tr.evenrow { background: #f8f8f8; } -.pagelist tr.oddrow { background: #eee; } + +.pagelist tr.evenrow { + background: #f8f8f8; +} + +.pagelist tr.oddrow { + background: #eee; +} + .pagelist thead td { - background: #e8e8e8; - text-decoration: none; - font-weight: bold; + background: #e8e8e8; + text-decoration: none; + font-weight: bold; } -.pagelist thead td u { text-decoration: none; } + +.pagelist thead td u { + text-decoration: none; +} + /* Yellow highlight for every td of mouseover'd tr in pagelist tbody ie mac ignores all these */ .pagelist tbody tr:hover>td { - border: solid #ffff99 2px; + border: solid #ffff99 2px; } + /* some browsers give wacky expanding :hover cells, use transparent border here instead of padding change */ .pagelist tbody tr>td { - border: solid transparent 2px; + border: solid transparent 2px; } + th.gridbutton { - background-color: ThreeDLightShadow; - color: black; - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-size: small; - font-weight: normal; - height: 18px; - white-space: nowrap; - max-height: 24px; - padding: 5px 0 5px 0; - margin: 5px 0; - float: none; - border-width: 1px; - border-style: solid; - border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight; + background-color: ThreeDLightShadow; + color: black; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-size: small; + font-weight: normal; + height: 18px; + white-space: nowrap; + max-height: 24px; + padding: 5px 0 5px 0; + margin: 5px 0; + float: none; + border-width: 1px; + border-style: solid; + border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight; } + input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton { - text-decoration: none; - font-size: small; - font-weight: normal; - font-family: Tahoma, Arial, Helvetica, sans-serif; - background-color: ThreeDLightShadow; - color: black; + text-decoration: none; + font-size: small; + font-weight: normal; + font-family: Tahoma, Arial, Helvetica, sans-serif; + background-color: ThreeDLightShadow; + color: black; } /** * Search */ -#searchholder { display: inline; } +#searchholder { + display: inline; +} /** * Search Results */ -.search-context { background: white; font-style: oblique; } +.search-context { + background: white; + font-style: oblique; +} + .search-term { - background: #9bdaff; - font-weight: normal; + background: #9bdaff; + font-weight: normal; } + #LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; + position: absolute; + text-align: left; + display: none; + z-index: 100; + background-color: white; + border: 1px solid #d0d0d0; + font-size: 9px; + overflow: hidden; } + #LSHighlight { - background-color: #f08000; + background-color: #f08000; } + #LSResult .evenrow { - background-color: #f0f0f0; + background-color: #f0f0f0; } .clear-floats { - clear: both; + clear: both; } dl { - display:table; + display: table; } + /* dotted underline each dt. use display:table to shrink width */ dt { - display: table; - font-weight: bold; - vertical-align: baseline; - margin-top: 1.25ex; - margin-bottom: 0.25ex; - padding-left: 0.25ex; - padding-right: 0.25ex; - border-bottom-style: dotted; - border-bottom-width: 2pt; - border-bottom-color: #9999cc; + display: table; + font-weight: bold; + vertical-align: baseline; + margin-top: 1.25ex; + margin-bottom: 0.25ex; + padding-left: 0.25ex; + padding-right: 0.25ex; + border-bottom-style: dotted; + border-bottom-width: 2pt; + border-bottom-color: #9999cc; } + /* No underlines for wiki-links in dt, we already have dotted underline */ dt a.wiki, dt a.named-wiki { - text-decoration: none; + text-decoration: none; } + /* No top margin for first dt */ dl>dt:first-child { - margin-top: 0; + margin-top: 0; } + /* underline each dd. */ /* use display:table to shrink width */ dd { -/* overflows wide text beyond containing dl */ -/* in most browsers :( Would have been nice */ -/* display: table; */ - position: relative; - margin-left: 3.5em; - margin-bottom: 0.5ex; - padding-left: 0.125em; - padding-bottom: 0.5ex; - padding-right: 0.125em; - border-bottom-style: solid; - border-bottom-width: thin; - border-bottom-color: #9999cc; + /* overflows wide text beyond containing dl */ + /* in most browsers :( Would have been nice */ + /* display: table; */ + position: relative; + margin-left: 3.5em; + margin-bottom: 0.5ex; + padding-left: 0.125em; + padding-bottom: 0.5ex; + padding-right: 0.125em; + border-bottom-style: solid; + border-bottom-width: thin; + border-bottom-color: #9999cc; } + pre, div.plugin code { - color: black; - display: block; - background-color: #fcfcfc; - font-size: 90%; - line-height: 1.25em; - margin-top: 0.25em; - margin-left: 0; - margin-bottom: 2ex; - margin-right: 0; - padding-top: 0.25em; - padding-left: 0.5em; - padding-bottom: 0.25em; - padding-right: 0.5em; - border-style: solid; - border-width: 1px; - border-color: #ccc; + color: black; + display: block; + background-color: #fcfcfc; + font-size: 90%; + line-height: 1.25em; + margin-top: 0.25em; + margin-left: 0; + margin-bottom: 2ex; + margin-right: 0; + padding-top: 0.25em; + padding-left: 0.5em; + padding-bottom: 0.25em; + padding-right: 0.5em; + border-style: solid; + border-width: 1px; + border-color: #ccc; } + pre { - background: #fafafa url("images/bgpaper8.png"); + background: #fafafa url("images/bgpaper8.png"); } + /* Indented wrap past diff buttons in RecentChanges */ ul li.rc-major, ul li.rc-minor { - margin-left: 0; - padding-left: 3em; - text-indent: -3em; + margin-left: 0; + padding-left: 3em; + text-indent: -3em; } /** * PageHistory, Info */ -td.pageinfo { font-weight: bold; } +td.pageinfo { + font-weight: bold; +} + .pageinfo-minoredit, .pageinfo-authorid { - font-size: smaller; - font-style: oblique; + font-size: smaller; + font-style: oblique; } /** * Other */ -.printer, .no-css { display: none; } +.printer, .no-css { + display: none; +} /* Disabled Plugins */ -.disabled-plugin -{ - clear: both; - margin: 1ex 0; - padding: 0; +.disabled-plugin { + clear: both; + margin: 1ex 0; + padding: 0; } + .disabled-plugin .title { - color: #400; - background-color: inherit; - font-size: x-small; - text-align: right; - padding: 0 0.5em; + color: #400; + background-color: inherit; + font-size: x-small; + text-align: right; + padding: 0 0.5em; } + .disabled-plugin pre { - color: black; - background: #ddd; - margin: 0; - padding: 0.3ex 0.5em; + color: black; + background: #ddd; + margin: 0; + padding: 0.3ex 0.5em; } /* "(Redirected from ...)" message. */ span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; + font-size: small; + font-style: oblique; + font-weight: normal; + padding-left: 1em; } /* * "E-mail" style blockquote */ blockquote.mail-style-quote { - border-left: medium #284 solid; - padding-left: 1em; - margin-left: 0; - margin-right: 0; + border-left: medium #284 solid; + padding-left: 1em; + margin-left: 0; + margin-right: 0; } + .mail-style-quote blockquote.mail-style-quote { - margin-left: -0.6em; + margin-left: -0.6em; } /* * wikiblog */ -.floatleft { float: left; } -.floatright { float: right; } +.floatleft { + float: left; +} +.floatright { + float: right; +} + div.wikiblog { - /* border: thin black solid; */ - margin: 1ex 2em; - padding: 0 0; + /* border: thin black solid; */ + margin: 1ex 2em; + padding: 0 0; } + div.wikiblog > div { - margin: 0 0; - padding: 0.5ex 0.5em; + margin: 0 0; + padding: 0.5ex 0.5em; } + div.wikiblog > div.wikiblog-footer { - padding: 0.2ex 0.5em; + padding: 0.2ex 0.5em; } + h3.wikiblog-summary { - font-size: medium; - font-weight: bold; - margin: 0 0 1ex 0; + font-size: medium; + font-weight: bold; + margin: 0 0 1ex 0; } table.wikiblog-form { - width: auto; - border-collapse: collapse; - margin: 0.25em 0; + width: auto; + border-collapse: collapse; + margin: 0.25em 0; } + .wikiblog-form caption { - caption-side: top; - font-weight: bold; - text-align: left; - padding: 0.5ex 0.5em; + caption-side: top; + font-weight: bold; + text-align: left; + padding: 0.5ex 0.5em; } + .wikiblog-form th { - vertical-align: top; - text-align: right; - padding: 0 0 0.3em 0.5em; + vertical-align: top; + text-align: right; + padding: 0 0 0.3em 0.5em; } + .wikiblog-form td { - padding: 0.25em 0.5em; + padding: 0.25em 0.5em; } + .wikiblog-form td.submit-button { - padding: 0; + padding: 0; } + .wikiblog-form input[type=text], .wikiblog-form textarea { - margin: 0 0; - width: 100%; + margin: 0 0; + width: 100%; } + div.wikicomment div.wikicomment-footer { - padding: 0.2ex 0.5em; + padding: 0.2ex 0.5em; } + div.wikicomment div.wikicomment-footer named-wiki { - font-size: small; + font-size: small; } + table.interwiki-map { - margin: 1em 2em; + margin: 1em 2em; } + .interwiki-map th { - text-decoration: underline; - text-align: left; - padding-left: 1em; + text-decoration: underline; + text-align: left; + padding-left: 1em; } + .interwiki-map td.interwiki-url { - padding-left: 2em; + padding-left: 2em; } + .interwiki-map th.interwiki-url { - padding-left: 3em; + padding-left: 3em; } .dialog { - background-color: #cdf; - color: black; - margin: 2em auto 2em auto; - border: thin black solid; - width: 50%; + background-color: #cdf; + color: black; + margin: 2em auto 2em auto; + border: thin black solid; + width: 50%; } + .dialog h1, .dialog p, .dialog div { - text-align: center; + text-align: center; } + .dialog h1 { - font-size: large; - margin: 0.5em 0 1em 0; + font-size: large; + margin: 0.5em 0 1em 0; } + .dialog div.message { - background-color: white; - color: black; - color: black; - margin: 0 1em; - padding: 0.5em 0.5em; + background-color: white; + color: black; + color: black; + margin: 0 1em; + padding: 0.5em 0.5em; } + .dialog p.buttons { - margin: 1em 0 0.5em 0; + margin: 1em 0 0.5em 0; } /* postnuke css:*/ -.gensmall{font-size:10px} -.genmed{font-size:11px} -td.cat{font-weight:bold;letter-spacing:1px;color:#000000;background: url(./images/cellpic1.png);height:27px} +.gensmall { + font-size: 10px +} + +.genmed { + font-size: 11px +} + +td.cat { + font-weight: bold; + letter-spacing: 1px; + color: #000000; + background: url(./images/cellpic1.png); + height: 27px +} + /* Main table cell colours and backgrounds */ -td.row1{background:#eaedf4;color:#000000} -td.row2{background:#d9e2ec;color:#000000} -td.row3{background:#cad9ea;color:#000000} -td.spacerow{background:#cad9ea;color:#000000} +td.row1 { + background: #eaedf4; + color: #000000 +} +td.row2 { + background: #d9e2ec; + color: #000000 +} + +td.row3 { + background: #cad9ea; + color: #000000 +} + +td.spacerow { + background: #cad9ea; + color: #000000 +} + /* This is the outline round the main forum tables */ -.forumline{background:#ffffff;color:#000000;border:1px solid #006699} +.forumline { + background: #ffffff; + color: #000000; + border: 1px solid #006699 +} /* Sidebar */ -.box { background:#ffffff; border: 1px solid silver } -.box-title { font-family: Tahoma, sans-serif; font-weight: normal; background-color: #ccc; color: black; text-align: center; border: none; padding: 2px 0 2px 0;} -.box-data { width: 160px; font-size: 9pt; font-weight: normal; border: none; } -.box-data .wiki { font-weight: normal; } -td.sidebar { border-spacing: 0; margin: 0;} +.box { + background: #ffffff; + border: 1px solid silver +} +.box-title { + font-family: Tahoma, sans-serif; + font-weight: normal; + background-color: #ccc; + color: black; + text-align: center; + border: none; + padding: 2px 0 2px 0; +} + +.box-data { + width: 160px; + font-size: 9pt; + font-weight: normal; + border: none; +} + +.box-data .wiki { + font-weight: normal; +} + +td.sidebar { + border-spacing: 0; + margin: 0; +} + /* plugin BoxRight */ div.boxright { - background-color: #e9fbff; - width: 200px; - right: 10px; - padding: 0.5em; - float: right; - border: thin solid #888888; - padding: 0.5em; + background-color: #e9fbff; + width: 200px; + right: 10px; + padding: 0.5em; + float: right; + border: thin solid #888888; + padding: 0.5em; } /* RssFeed */ -div.rss { margin: 1em; padding: 1em; font-size: 0.9em; background-color: #eeeeee; border: thin dashed #aaa; } -div.feed { color: #333; margin: -0.5em; margin-bottom: 0; padding: 0.3em; font-weight: bold; background-color: #f2f2f2; font-size: 1.2em; } -div.itemdesc { padding-left: 1em; } -div.rssitem { border-top: thin dashed #aaa; } +div.rss { + margin: 1em; + padding: 1em; + font-size: 0.9em; + background-color: #eeeeee; + border: thin dashed #aaa; +} +div.feed { + color: #333; + margin: -0.5em; + margin-bottom: 0; + padding: 0.3em; + font-weight: bold; + background-color: #f2f2f2; + font-size: 1.2em; +} + +div.itemdesc { + padding-left: 1em; +} + +div.rssitem { + border-top: thin dashed #aaa; +} + /* SqlResult */ table.sqlresult { - border: 1px outset gray; - background: white; - margin: 0.5ex 0.5em; - padding: 1px; + border: 1px outset gray; + background: white; + margin: 0.5ex 0.5em; + padding: 1px; } -.sqlresult tr.evenrow { background: #eee; } -.sqlresult tr.oddrow { background: white; } + +.sqlresult tr.evenrow { + background: #eee; +} + +.sqlresult tr.oddrow { + background: white; +} + table.sqlresult td { - margin: 1px; - border: 1px solid gray; + margin: 1px; + border: 1px solid gray; } /** * TeX2png plugin */ img.tex { - vertical-align: middle; + vertical-align: middle; } /** * PhotoAlbum plugin */ .boldsmall { - font-weight: bold; - font-size: 11px; + font-weight: bold; + font-size: 11px; } .wikiwyg_toolbar { @@ -788,26 +1075,26 @@ * Wiki */ textarea.wikiedit, input.wikitext, textarea.summary { - background: white; - border-top: 1px solid #7c7c7c; - border-left: 1px solid #c3c3c3; - border-bottom: 1px solid #dddddd; - border-right: 1px solid #c3c3c3; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.5em; - padding-bottom: 0.5em; - margin: 0.5ex 0; - clear: both; + background: white; + border-top: 1px solid #7c7c7c; + border-left: 1px solid #c3c3c3; + border-bottom: 1px solid #dddddd; + border-right: 1px solid #c3c3c3; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.5em; + padding-bottom: 0.5em; + margin: 0.5ex 0; + clear: both; } -.toolbar , div.toolbar { - margin : 0.5ex 0; +.toolbar, div.toolbar { + margin: 0.5ex 0; } /* Link icons */ -img.linkicon { - vertical-align : middle; +img.linkicon { + vertical-align: middle; } /** @@ -816,8 +1103,8 @@ .interwiki-map thead td, .interwiki-moniker, .interwiki-url { - padding-left: 1em; - padding-right: 1em; + padding-left: 1em; + padding-right: 1em; } /** @@ -825,32 +1112,35 @@ */ /* main box */ .diff { - margin: 0.5ex 0; - padding: 1px; + margin: 0.5ex 0; + padding: 1px; } + .diff .block { - padding: 0.5ex 0.5em; + padding: 0.5ex 0.5em; } + /* blocks containing deleted or added words */ .diff .original, .diff .deleted, .diff .final, .diff .added { - padding: 1px; + padding: 1px; } .diff .block div { - position: relative; - padding-left: 1.5em; + position: relative; + padding-left: 1.5em; } + .diff .prefix { - position: absolute; - left: 0; - top: 0; + position: absolute; + left: 0; + top: 0; } /* deleted & added words */ .diff del, .diff ins { - padding-left: 0.5ex; - padding-right: 0.5ex; + padding-left: 0.5ex; + padding-right: 0.5ex; } /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ Modified: trunk/themes/MonoBook/IE60Fixes.css =================================================================== --- trunk/themes/MonoBook/IE60Fixes.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/MonoBook/IE60Fixes.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -6,25 +6,33 @@ margin-left: 0; height: 1%; } + #column-content #content { margin-left: 12.2em; margin-top: 3em; height: 1%; } + #column-one { position: absolute; z-index: 4; top: 0; left: 0; } + #footer { margin-left: 13.6em; border-left: 1px solid #fabd23; } -body { font-size: 80%;} -tt { font-size: 110%; } +body { + font-size: 80%; +} +tt { + font-size: 110%; +} + /* the tabs */ #p-cactions { @@ -38,6 +46,7 @@ cursor: default; float: none !important; } + #p-cactions li a { display: inline-block !important; vertical-align: top; @@ -45,20 +54,25 @@ border: solid #aaa; border-width: 1px 1px 0; } + #p-cactions li.selected a { border-color: #fabd23; padding-bottom: 0.17em !important; } + #p-cactions li a:hover { padding-bottom: 0.17em; } + #p-navigation a { display: inline-block; width: 100%; } + #portal-personaltools { padding-bottom: 0.1em; } + #bodyContent a.external { background: url(images/external.png) center right no-repeat; padding-right: 13px; @@ -69,10 +83,12 @@ #p-logo a:hover { cursor: pointer; } + div.visualClear { - width:100%; + width: 100%; line-height: 0; } + textarea { width: 96%; } @@ -85,10 +101,11 @@ } span.rateit { - text-decoration: none; - font-family: Arial, Helvetica, sans-serif; - line-height: 1em; + text-decoration: none; + font-family: Arial, Helvetica, sans-serif; + line-height: 1em; } + div#rateit-widget-top { - top: 38px; + top: 38px; } Modified: trunk/themes/MonoBook/IE70Fixes.css =================================================================== --- trunk/themes/MonoBook/IE70Fixes.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/MonoBook/IE70Fixes.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -15,6 +15,7 @@ */ padding-top: 0; } + .rtl #column-one #p-navigation { margin-top: 160px; } @@ -40,23 +41,29 @@ border: solid #aaa; border-width: 1px 1px 0; } + #p-cactions li.selected a { border-color: #fabd23; padding-bottom: 0.17em !important; } + #p-cactions li a:hover { padding-bottom: 0.17em !important; } + #p-navigation a { display: inline-block; width: 100%; } + #portal-personaltools { padding-bottom: 0.1em; } + textarea { width: 96%; } + tt { font-size: 110%; } Modified: trunk/themes/MonoBook/commonPrint.css =================================================================== --- trunk/themes/MonoBook/commonPrint.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/MonoBook/commonPrint.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -7,49 +7,54 @@ */ @page { - size: A4 portrait; - margin: 17mm 10mm 17mm 10mm; + size: A4 portrait; + margin: 17mm 10mm 17mm 10mm; } h1 { - string-set: header content(); + string-set: header content(); } @page :left { - @top-left { + +@top-left { content: "Phpwiki"; } - @top-right { +@top-right { content: string(header); } - @bottom-left { +@bottom-left { content: "Page " counter(page) " of " counter(pages); } -} + } @page :right { - @top-left { + +@top-left { content: string(header); } - @top-right { +@top-right { content: "Phpwiki"; } - @bottom-right { +@bottom-right { content: "Page " counter(page) " of " counter(pages); } -} + } @page :first { - @top-right { + +@top-right { content: normal; } - @top-left { +@top-left { content: normal; } + } + +h1, h2, h3, h4, h5, h6 { + page-break-after: avoid; } -h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } - /* Do not cut tables with class "nobreak" */ table.nobreak { @@ -58,20 +63,26 @@ /* Thanks to A List Apart (http://alistapart.com/) for useful extras */ a.stub, -a.new{ color:#ba0000; text-decoration:none; } +a.new { + color: #ba0000; + text-decoration: none; +} .toc, #toc { - border:1px solid #aaaaaa; - background-color:#f9f9f9; - padding:5px; + border: 1px solid #aaaaaa; + background-color: #f9f9f9; + padding: 5px; } + .tocindent { margin-left: 2em; } + .tocline { margin-bottom: 0; } + .toctoggle, .editsection { font-size: smaller; } @@ -84,59 +95,76 @@ div.floatright { float: right; margin: 0; - position:relative; + position: relative; border: 0.5em solid White; border-width: 0.5em 0 0.8em 1.4em; } -div.floatright p { font-style: italic;} + +div.floatright p { + font-style: italic; +} + div.floatleft { float: left; margin: 0.3em 0.5em 0.5em 0; - position:relative; + position: relative; border: 0.5em solid White; border-width: 0.5em 1.4em 0.8em 0; } -div.floatleft p { font-style: italic; } + +div.floatleft p { + font-style: italic; +} + /* thumbnails */ div.thumb { margin-bottom: 0.5em; - border-style: solid; border-color: White; + border-style: solid; + border-color: White; width: auto; } + div.thumb div { - border:1px solid #cccccc; + border: 1px solid #cccccc; padding: 3px !important; - background-color:#f9f9f9; + background-color: #f9f9f9; font-size: 94%; text-align: center; } + div.thumb div a img { - border:1px solid #cccccc; + border: 1px solid #cccccc; } + div.thumb div div.thumbcaption { border: none; text-align: left; padding: 0.3em 0 0.1em 0; } -div.magnify { display: none; } + +div.magnify { + display: none; +} + div.tright { float: right; border-width: 0.5em 0 0.8em 1.4em; } + div.tleft { float: left; - margin-right:0.5em; + margin-right: 0.5em; border-width: 0.5em 1.4em 0.8em 0; } /* table standards */ table.rimage { - float:right; - width:1pt; - position:relative; - margin-left:1em; - margin-bottom:1em; - text-align:center; + float: right; + width: 1pt; + position: relative; + margin-left: 1em; + margin-bottom: 1em; + text-align: center; } body { @@ -181,12 +209,12 @@ margin: 0 ! important; text-align: left; } + #footer { border: 1px solid black; } -h1, h2, h3, h4, h5, h6 -{ +h1, h2, h3, h4, h5, h6 { font-weight: bold; } @@ -219,6 +247,7 @@ background-color: transparent; text-decoration: underline; } + /* #content a:link:after, #content a:visited:after { @@ -238,6 +267,7 @@ padding: 1em; margin: 0 !important; } + /* MSIE/Win doesn't understand 'inherit' */ a, a.external, a.new, a.stub { color: black ! important; @@ -250,32 +280,34 @@ text-decoration: inherit ! important; } - /* Show some stuff */ .urlexpansion { display: inline ! important; } div.townBox { - position:relative; - float:right; - background:white; - margin-left:1em; + position: relative; + float: right; + background: white; + margin-left: 1em; border: 1px solid gray; - padding:0.3em; + padding: 0.3em; width: 200px; overflow: hidden; clear: right; } + div.townBox dl { padding: 0; margin: 0 0 0.3em 0; font-size: 96%; } + div.townBox dl dt { background: none; margin: 0.4em 0 0 0; } + div.townBox dl dd { margin: 0.1em 0 0 1.1em; background-color: #f3f3f3; Modified: trunk/themes/MonoBook/main.css =================================================================== --- trunk/themes/MonoBook/main.css 2012-10-06 10:28:33 UTC (rev 8398) +++ trunk/themes/MonoBook/main.css 2012-10-06 11:05:48 UTC (rev 8399) @@ -18,6 +18,7 @@ padding: 0; height: 1%; } + #content { position: relative; z-index: 2; @@ -29,6 +30,7 @@ border-right: none; line-height: 1.5em; } + #column-one { position: absolute; /*z-index: 3;*/ @@ -36,6 +38,7 @@ top: 0; left: 0; } + /* the left column width is specified in class .portlet */ /* Font size: @@ -59,6 +62,7 @@ margin: 0; padding: 0; } + .visualClear { clear: both; } @@ -66,34 +70,42 @@ /* general styles */ table { - font-size: 100%; + font-size: 100%; color: black; } + a { text-decoration: none; color: #002bb8; background-image: none; } + a:visited { color: #5a3696; } + a:active { color: #faa700; } + a:hover { text-decoration: underline; } + a.stub { color: #772233; } + img { border: 0; vertical-align: middle; } + p { margin: .4em 0 .5em 0; line-height: 1.5em; } + p img { margin: 0; } @@ -116,42 +128,70 @@ padding-bottom: 0.17em; border-bottom: 1px solid #aaa; } -h1 { font-size: 188%; } -h2 { font-size: 150%; } -h3 { font-size: 132%; } -h4 { font-size: 116%; } -h5 { font-size: 100%; } -h6 { font-size: 80%; } + +h1 { + font-size: 188%; +} + +h2 { + font-size: 150%; +} + +h3 { + font-size: 132%; +} + +h4 { + font-size: 116%; +} + +h5 { + font-size: 100%; +} + +h6 { + font-size: 80%; +} + h4, h5, h6 { border-bottom: none; font-weight: normal; } /* Because in some cases there is a <p> in nested lists */ -li p { margin:0; } +li p { + margin: 0; +} ul { line-height: 1.5em; list-style-type: square; margin: 0.3em 0 0 1.5em; - padding:0; + padding: 0; list-style-image: url("images/bullet.png"); } + ol { line-height: 1.5em; margin: 0.3em 0 0 3.2em; - padding:0; + padding: 0; list-style-image: none; } -li { margin-bottom: 0.1em; } + +li { + margin-bottom: 0.1em; +} + dt { - font-weight: bold; + font-weight: bold; margin-bottom: .1em; } + dl { margin-top: .2em; margin-bottom: .5em; } + dd { line-height: 1.5em; margin-left: 2em; @@ -164,11 +204,13 @@ padding: 0 1em 1em 1em; line-height: 1.5em; } + legend { /*background: white;*/ padding: 0.5em; font-size: 95%; } + form { border: none; margin: 0; @@ -186,19 +228,23 @@ height: 1.7em !important; margin-left: 1.6em; } + select { vertical-align: top; } + abbr, acronym, .explain { border-bottom: 1px dotted black; color: black; background-image: none; cursor: help; } + q { font-family: Times, "Times New Roman", serif; font-style: italic; } + /* disabled for now blockquote { font-family: Times, "Times New Roman", serif; @@ -207,6 +253,7 @@ code { background-color: #f9f9f9; } + pre { padding: 1em; border: 1px dashed #2f6fab; @@ -217,29 +264,52 @@ /* generic classes ----------------------------------------------- */ -.tt { font-family: monospace; } -.strike { text-decoration:line-through; } +.tt { + font-family: monospace; +} -.align-left {text-align: left;} -.align-right {text-align: right;} -.align-center {text-align: center;} - -.top {vertical-align: top;} +.strike { + text-decoration: line-through; +} -.nowrap {white-space: nowrap;} +.align-left { + text-align: left; +} -.fullwidth { width: 100%; } +.align-right { + text-align: right; +} +.align-center { + text-align: center; +} + +.top { + vertical-align: top; +} + +.nowrap { + white-space: nowrap; +} + +.fullwidth { + width: 100%; +} + /* --------------------------------------------------------------- */ /* ** the main content area */ -#siteSub { display: none; } +#siteSub { + display: none; +} + #jump-to-nav { display: none; } + #contentSub { font-size: 84%; line-height: 1.2em; @@ -247,17 +317,24 @@ color: #7d7d7d; width: auto; } -span.subpages { display: block; } +span.subpages { + display: block; +} + /* Some space under the headers in the content area */ #bodyContent h1, #bodyContent h2 { margin-bottom: .6em; } + #bodyContent h3, #bodyContent h4, #bodyContent h5 { margin-bottom: .3em; } -.firstHeading { margin-bottom:0.1em; } +.firstHeading { + margin-bottom: 0.1em; +} + /* user notification thing */ .usermessage { background-color: #ffce7b; @@ -268,15 +345,18 @@ padding: .5em 1em; vertical-align: middle; } + #siteNotice { text-align: center; font-size: 95%; padding: 0 .9em; } + #siteNotice p { margin: 0; padding: 0; } + .errorbox, .successbox { font-size: larger; border: 2px solid; @@ -285,14 +365,17 @@ margin-bottom: 2em; color: #000; } + .errorbox { border-color: red; background-color: #fff2f2; } + .successbox { border-color: green; background-color: #dfd; } + .errorbox h2, .successbox h2 { font-size: 1em; font-weight: bold; @@ -308,6 +391,7 @@ margin-top: 1em; clear: both; } + /* currently unused, intended to be used by a metadata box in the bottom-right corner of the content area */ .documentDescription { @@ -317,6 +401,7 @@ margin: 1em 0; line-height: 1.5em; } + .documentByLine { text-align: right; font-size: 90%; @@ -330,14 +415,17 @@ width: 100%; text-align: center; } + *.center * { margin-left: auto; margin-right: auto; } + /* small for tables and similar */ .small, .small * { font-size: 94%; } + table.small { font-size: 100%; } @@ -347,14 +435,15 @@ */ #toc, .toc { - width: 200px; + width: 200px; border: 1px solid #aaa; background-color: #f9f9f9; padding: 5px; font-size: 95%; - float: right; - clear: right; + float: right; + clear: right; } + #toc #toctitle, .toc .toctitle, .toc #toctitle { @@ -364,21 +453,25 @@ font-size: 110%; font-weight: bold; } + .toc .toclist, .toc #toclist { width: auto; border: none; } + #toc #toctitle, .toc #toctitle, #toc .toctitle, .toc .toctitle { text-align: center; } + #toc p, .toc p { - margin: 0; + margin: 0; } + #toc ul, .toc ul { width: auto; @@ -390,10 +483,12 @@ margin-left: 5px; padding-left: 5px; } + #toc ul ul, .toc ul ul { margin: 0 0 0 2em; } + #toc .toctoggle, .toc .toctoggle { font-size: 94%; @@ -405,6 +500,7 @@ padding: 5px; font-size: 95%; } + .mw-warning { margin-left: 50px; margin-right: 50px; @@ -419,14 +515,22 @@ margin: 0 0 .5em .5em; border: 0; } -div.floatright p { font-style: italic; } + +div.floatright p { + font-style: italic; +} + div.floatleft, table.floatleft { float: left; position: relative; margin: 0 .5em .5em 0; border: 0; } -div.floatleft p { font-style: italic; } + +div.floatleft p { + font-style: italic; +} + /* thumbnails */ div.thumb { margin-bottom: .5em; @@ -434,6 +538,7 @@ border-color: white; width: auto; } + div.thumb div { border: 1px solid #ccc; padding: 3px !important; @@ -442,30 +547,36 @@ text-align: center; overflow: hidden; } + div.thumb div a img { border: 1px solid #ccc; } + div.thumb div div.thumbcaption { border: none; text-align: left; line-height: 1.4em; padding: .3em 0 .1em 0; } + div.magnify { float: right; border-style: none !important; background: none !important; } + div.magnify a, div.magnify img { display: block; border-style: none !important; background: none !important; } + div.tright { clear: right; float: right; border-width: .5em 0 .8em 1.4em; } + div.tleft { float: left; margin-right: .5em; @@ -476,9 +587,11 @@ display: none; speak: none; } + img.tex { vertical-align: middle; } + span.texhtml { font-family: serif; } @@ -499,12 +612,14 @@ margin-bottom: 1em; text-align: center; } + .toccolours { border: 1px solid #aaa; background-color: #f9f9f9; padding: 5px; font-size: 95%; } + div.townBox { position: relative; float: right; @@ -516,15 +631,18 @@ overflow: hidden; clear: right; } + div.townBox dl { padding: 0; margin: 0 0 .3em; font-size: 96%; } + div.townBox dl dt { background-image: none; margin: .4em 0 0; } + div.townBox dl dd { margin: .1em 0 0 1.1em; background-color: #f3f3f3; @@ -545,9 +663,10 @@ .pageinfo-majoredit { font-weight: normal; /*bold;*/ } + .wiki-summary { - font-size: 94%; - font-style: italic; + font-size: 94%; + font-style: italic; } /* Page history styling */ @@ -555,16 +674,20 @@ .autocomment { color: gray; } + #pagehistory span.user { margin-left: 1.4em; margin-right: .4em; } + #pagehistory span.minor { font-weight: bold; } + #pagehistory li { border: 1px solid white; } + #pagehistory li.selected { background-color: #f9f9f9; border: 1px dashed #aaa; @@ -576,18 +699,22 @@ table.diff, td.diff-otitle, td.diff-ntitle { background-color: white; } + td.diff-addedline { background-color: #cfc; font-size: smaller; } + td.diff-deletedline { background-color: #ffa; font-size: smaller; } + td.diff-context { background-color: #eee; font-size: smaller; } + span.diffchange { color: red; font-weight: bold; @@ -598,21 +725,22 @@ */ /* main box */ .diff { - margin-top: 1ex; + margin-top: 1ex; margin-bottom: 0.5ex; background-color: white; color: black; border-top: 1px solid #494f5d; - border-left: 1px solid #494f5d; - border-bottom: 1px solid #c6d2de; + border-left: 1px solid #494f5d; + border-bottom: 1px solid #c6d2de; border-right: 1px solid #c6d2de; - padding-top: 1px; + padding-top: 1px; padding-bottom: 1px; - padding-left: .125em; + padding-left: .125em; padding-right: .125em; padding: 0; clear: both; } + .diff .block { background-color: #ddd; padding-left: 1em; @@ -623,21 +751,23 @@ background-color: white; border: none; } + /* entire difftextblock */ .difftext { - margin-top: 0; + margin-top: 0; margin-bottom: 0; background-color: white; - border-top: 1px #e8e6df solid; + border-top: 1px #e8e6df solid; border-left: 1px #e8e6df solid; border-bottom: 1px #d2d2d2 solid; - border-right: 1px #b2b2b2 solid; - padding-left: 0; + border-right: 1px #b2b2b2 solid; + padding-left: 0; padding-right: 0; - padding-top: 0; + padding-top: 0; padding-bottom: 0; clear: both; } + /* + - line prefix */ .diff .block tt { font-weight: normal; @@ -646,6 +776,7 @@ margin-left: 0; border: none; } + /* changed words */ .diff del, .diff ins { font-weight: bold; @@ -657,11 +788,13 @@ .diff .final, .diff .added { background-color: white; } + /* blocks containing deleted words */ .diff .original, .diff .deleted { background-color: #fcc; border: none; } + /* blocks containing added words */ .diff .final, .diff .added { background-color: #cfc; @@ -669,26 +802,60 @@ } /* deleted words */ -.diff del { background-color: #f99; } +.diff del { + background-color: #f99; +} + /* added words */ -.diff ins { background-color: #9f9; } +.diff ins { + background-color: #9f9; +} /** * PageHistory, Info */ -td.pageinfo { font-weight: bold; } +td.pageinfo { + font-weight: bold; +} + .pageinfo-minoredit, .pageinfo-authorid { font-size: smaller; font-style: oblique; } /* RssFeed */ -div.rss { margin: 1em; padding: 1em; font-size: 0.9em; background-color: #eeeeee; border: thin dashed #aaaaaa; } -div.feed { color: #333; margin: -0.5em; margin-bottom: 0; padding: 0.3em; font-weight: bold; background-color: #f2f2f2; font-size: 1.2em; } -div.itemdesc { padding-left: 1em; } -div.rssitem { border-top: thin dashed #aaaaaa; } -a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; } +div.rss { + margin: 1em; + padding: 1em; + font-size: 0.9em; + background-color: #eeeeee; + border: thin dashed #aaaaaa; +} +div.feed { + color: #333; + margin: -0.5em; + margin-bottom: 0; + padding: 0.3em; + font-weight: bold; + background-color: #f2f2f2; + font-size: 1.2em; +} + +div.itemdesc { + padding-left: 1em; +} + +div.rssitem { + border-top: thin dashed #aaaaaa; +} + +a.rssicon { + font-weight: normal; + font-size: small; + vertical-align: middle; +} + /** * Calendar plugin */ @@ -708,15 +875,23 @@ } /* Month-name header */ -table.cal-header { font-size: larger; } -table.cal-header tr, table.cal-header td { text-align: center; } +table.cal-header { + font-size: larger; +} + +table.cal-header tr, table.cal-header td { + text-align: center; +} + .cal-arrow { font-weight: bold; text-decoration: none; } /* Day-names header */ -table.cal tbody tr .cal-dayname { } +table.cal tbody tr .cal-dayname { +} + .cal-dayname td { text-align: center; font-size: smaller; @@ -724,17 +899,21 @@ } /* Individual days */ -a.cal-hide { text-decoration: none; } +a.cal-hide { + text-decoration: none; +} /* Today */ - /* cell */ +/* cell */ table.cal td.cal-today { margin: 1px; border: 1px solid gray; } - /* text */ -table.cal td.cal-today a.cal-hide { } +/* text */ +table.cal td.cal-today a.cal-hide { +} + /* ** keep the whitespace in front of the ^=, hides rule from konqueror ** this is css3, the validator doesn't like it when validating as css2 @@ -744,30 +923,36 @@ background: url("images/url.png") center right no-repeat; padding-right: 13px; } + #bodyContent a[href ^="https://";], .link-https { background: url("images/lock_icon.png") center right no-repeat; padding-right: 16px; } + #bodyContent a[href ^="mailto:"], .link-mailto { background: url("images/mail_icon.png") center right no-repeat; padding-right: 18px; } + #bodyContent a[href ^="news://";] { background: url("images/news_icon.png") center right no-repeat; padding-right: 18px; } + #bodyContent a[href ^="ftp://";], .link-ftp { background: url("images/file_icon.png") center right no-repeat; padding-right: 18px; } + #bodyContent a[href ^="irc://";], .link-irc { - background: url("images/discussionitem_icon.png") center right no-repeat; + background: url("images/discussionitem_icon.png") center right no-repeat; padding-right: 18px; } + /* disable interwiki styling */ #bodyContent a.extiw, #bodyContent a.extiw:active { @@ -775,15 +960,18 @@ background-image: none; padding: 0; } + #bodyContent a.external { color: #36b; } + /* this can be used in the content area to switch off special external link styling */ #bodyContent .plainlinks a { background: none !important; padding: 0 !important; } + /* ** Structural Elements */ @@ -799,11 +987,13 @@ width: 11.6em; overflow: hidden; } + .portlet h4 { font-size: 95%; font-weight: normal; white-space: nowrap; } + .portlet h5 { background-color: transparent; padding: 0 1em 0 0.5em; @@ -814,6 +1004,7 @@ font-weight: normal; white-space: nowrap; } + .portlet h6 { background-color: #ffae2e; border: 1px solid #2f6fab; @@ -826,6 +1017,7 @@ font-weight: normal; white-space: nowrap; } + .pBody { font-size: 95%; background-color: white; @@ -834,6 +1026,7 @@ border: 1px solid #aaa; padding: 0 .8em .3em .5em; } + .portlet h1, .portlet h2, .portlet h3, @@ -841,14 +1034,16 @@ margin: 0; padding: 0; } + .portlet ul { line-height: 1.5em; list-style-type: square; list-style-image: url("images/bullet.png"); - font-size:95%; + font-size: 95%; } + .portlet li { - padding:0; + padding: 0; margin: 0 0 0 0; margin-bottom: 0; } @@ -867,9 +1062,11 @@ width: 12em; overflow: visible; } + #p-logo h5 { display: none; } + #p-logo a, #p-logo a:hover { display: block; @@ -879,11 +1076,12 @@ background-position: 35% 50% !important; text-decoration: none; } + /* At the right we put a small "wiki star" */ #img-logo-right { position: absolute; z-index: 4; - top: 0; + top: 0; right: 0; height: 86px; width: 86px; @@ -900,6 +1098,7 @@ position: relative; z-index: 3; } + #p-navigation .pBody { padding-right: 0; } @@ -914,27 +1113,29 @@ font-weight: bold; } - /* ** Search portlet */ #p-search { - position:relative; + position: relative; z-index: 3; } + input.searchButton { - margin-top:1px; + margin-top: 1px; padding: 0 0.4em !important; font-size: 95%; cursor: pointer; background-color: White; border: 1px solid #2f6fab; } + #searchGoButton { padding-left: .5em; padding-right: .5em; font-weight: bold; } + /*#searchInput, */ #livesearch, #p-search input.dropdown { text-align: left; @@ -942,6 +1143,7 @@ /*margin: 0;*/ font-size: 95%; } + #p-search .pBody { padding: .5em .4em .4em .4em; text-align: center; @@ -952,14 +1154,14 @@ */ #p-personal { - position:absolute; + position: absolute; z-index: 4; - width:40em; - white-space:nowrap; - padding:0 0 0 0; - margin:0; + width: 40em; + white-space: nowrap; + padding: 0 0 0 0; + margin: 0; right: 90px; - top:0.1em; + top: 0.1em; border: none; overflow: visible; color: black; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vargenau@us...> - 2012-10-06 10:28:43
|
Revision: 8398 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8398&view=rev Author: vargenau Date: 2012-10-06 10:28:33 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Reformat code Modified Paths: -------------- trunk/ImageTile.php trunk/RPC2.php trunk/SOAP.php trunk/admin/wiki2public.php trunk/configurator.php trunk/index.php trunk/lib/AccessLog.php trunk/lib/ArchiveCleaner.php trunk/lib/AtomParser.php trunk/lib/BlockParser.php trunk/lib/CachedMarkup.php trunk/lib/Captcha.php trunk/lib/DbSession/ADODB.php trunk/lib/DbSession/PDO.php trunk/lib/DbSession/SQL.php trunk/lib/DbSession/dba.php trunk/lib/DbSession.php trunk/lib/DbaDatabase.php trunk/lib/DbaListSet.php trunk/lib/DbaPartition.php trunk/lib/EditToolbar.php trunk/lib/ErrorManager.php trunk/lib/ExternalReferrer.php trunk/lib/FileFinder.php trunk/lib/Google.php trunk/lib/HtmlElement.php trunk/lib/HtmlElement5.php trunk/lib/HtmlParser.php trunk/lib/HttpClient.php trunk/lib/IniConfig.php trunk/lib/InlineParser.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PagePerm.php trunk/lib/PageType.php trunk/lib/RSSWriter091.php trunk/lib/Request.php trunk/lib/RssParser.php trunk/lib/RssWriter.php trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/SpamBlocklist.php trunk/lib/Template.php trunk/lib/TextSearchQuery.php trunk/lib/Units.php trunk/lib/WikiCallback.php trunk/lib/WikiDB/ADODB.php trunk/lib/WikiDB/PDO.php trunk/lib/WikiDB/SQL.php trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php trunk/lib/WikiDB/adodb/adodb-error.inc.php trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php trunk/lib/WikiDB/adodb/adodb-iterator.inc.php trunk/lib/WikiDB/adodb/adodb-lib.inc.php trunk/lib/WikiDB/adodb/adodb-pear.inc.php trunk/lib/WikiDB/adodb/adodb-php4.inc.php trunk/lib/WikiDB/adodb/adodb-time.inc.php trunk/lib/WikiDB/adodb/adodb.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php trunk/lib/WikiDB/adodb/readme.htm trunk/lib/WikiDB/backend/ADODB.php trunk/lib/WikiDB/backend/ADODB_mssql.php trunk/lib/WikiDB/backend/ADODB_mssqlnative.php trunk/lib/WikiDB/backend/ADODB_mysql.php trunk/lib/WikiDB/backend/ADODB_oci8po.php trunk/lib/WikiDB/backend/ADODB_postgres7.php trunk/lib/WikiDB/backend/ADODB_sqlite.php trunk/lib/WikiDB/backend/PDO.php trunk/lib/WikiDB/backend/PDO_mysql.php trunk/lib/WikiDB/backend/PDO_oci8.php trunk/lib/WikiDB/backend/PDO_pgsql.php trunk/lib/WikiDB/backend/PearDB.php trunk/lib/WikiDB/backend/PearDB_ffpgsql.php trunk/lib/WikiDB/backend/PearDB_mysql.php trunk/lib/WikiDB/backend/PearDB_oci8.php trunk/lib/WikiDB/backend/PearDB_pgsql.php trunk/lib/WikiDB/backend/PearDB_sqlite.php trunk/lib/WikiDB/backend/cvs.php trunk/lib/WikiDB/backend/dba.php trunk/lib/WikiDB/backend/dbaBase.php trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php trunk/lib/WikiDB/backend/dumb/BackLinkIter.php trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php trunk/lib/WikiDB/backend/dumb/MostPopularIter.php trunk/lib/WikiDB/backend/dumb/MostRecentIter.php trunk/lib/WikiDB/backend/dumb/TextSearchIter.php trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php trunk/lib/WikiDB/backend/file.php trunk/lib/WikiDB/backend/flatfile.php trunk/lib/WikiDB/backend.php trunk/lib/WikiDB/cvs.php trunk/lib/WikiDB/dba.php trunk/lib/WikiDB/file.php trunk/lib/WikiDB/flatfile.php trunk/lib/WikiDB.php trunk/lib/WikiGroup.php trunk/lib/WikiPlugin.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser/AdoDb.php trunk/lib/WikiUser/BogoLogin.php trunk/lib/WikiUser/Db.php trunk/lib/WikiUser/EMailConfirm.php trunk/lib/WikiUser/Facebook.php trunk/lib/WikiUser/File.php trunk/lib/WikiUser/Forbidden.php trunk/lib/WikiUser/FusionForge.php trunk/lib/WikiUser/HttpAuth.php trunk/lib/WikiUser/HttpAuthUpper.php trunk/lib/WikiUser/IMAP.php trunk/lib/WikiUser/LDAP.php trunk/lib/WikiUser/LdapUpper.php trunk/lib/WikiUser/OpenID.php trunk/lib/WikiUser/POP3.php trunk/lib/WikiUser/PdoDb.php trunk/lib/WikiUser/PearDb.php trunk/lib/WikiUser/PersonalPage.php trunk/lib/WikiUser/Session.php trunk/lib/WikiUser.php trunk/lib/WikiUserNew.php trunk/lib/WysiwygEdit/FCKeditor.php trunk/lib/WysiwygEdit/Wikiwyg.php trunk/lib/WysiwygEdit/htmlarea2.php trunk/lib/WysiwygEdit/htmlarea3.php trunk/lib/WysiwygEdit/spaw.php trunk/lib/WysiwygEdit/tinymce.php trunk/lib/WysiwygEdit.php trunk/lib/XMLRPC/utils.php trunk/lib/XMLRPC/xmlrpc.inc trunk/lib/XMLRPC/xmlrpc_emu.inc trunk/lib/XMLRPC/xmlrpcs.inc trunk/lib/XMLRPC/xmlrpcs_emu.inc trunk/lib/XmlElement.php trunk/lib/XmlParser.php trunk/lib/XmlRpcClient.php trunk/lib/XmlRpcServer.php trunk/lib/config.php trunk/lib/diff.php trunk/lib/diff3.php trunk/lib/difflib.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/fortune.php trunk/lib/fpdf/chinese.php trunk/lib/fpdf/courier.php trunk/lib/fpdf/helvetica.php trunk/lib/fpdf/helveticab.php trunk/lib/fpdf/helveticabi.php trunk/lib/fpdf/helveticai.php trunk/lib/fpdf/japanese.php trunk/lib/fpdf/symbol.php trunk/lib/fpdf/times.php trunk/lib/fpdf/timesb.php trunk/lib/fpdf/timesbi.php trunk/lib/fpdf/timesi.php trunk/lib/fpdf/zapfdingbats.php trunk/lib/fpdf.php trunk/lib/gif.php trunk/lib/imagecache.php trunk/lib/imdb.php trunk/lib/install.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/nusoap/nusoap.php trunk/lib/pdf.php trunk/lib/plugin/SystemInfo.php trunk/lib/prepend.php trunk/lib/purgepage.php trunk/lib/removepage.php trunk/lib/spam_babycart.php trunk/lib/stdlib.php trunk/lib/wikilens/Buddy.php trunk/lib/wikilens/CustomPrefs.php trunk/lib/wikilens/PageListColumns.php trunk/lib/wikilens/RatingsDb.php trunk/lib/wikilens/RatingsUser.php trunk/lib/wikilens/Utils.php trunk/lib/ziplib.php trunk/passencrypt.php trunk/themes/Crao/themeinfo.php trunk/themes/Hawaiian/lib/random.php trunk/themes/Hawaiian/themeinfo.php trunk/themes/MacOSX/images/index.php trunk/themes/MacOSX/lib/RecentChanges.php trunk/themes/MacOSX/themeinfo.php trunk/themes/MonoBook/themeinfo.php trunk/themes/Portland/lib/RecentChanges.php trunk/themes/Portland/themeinfo.php trunk/themes/Sidebar/clock.php trunk/themes/Sidebar/hyperapplet.php trunk/themes/Sidebar/hyperwiki.php trunk/themes/Sidebar/themeinfo.php trunk/themes/SpaceWiki/lib/RecentChanges.php trunk/themes/SpaceWiki/themeinfo.php trunk/themes/Wordpress/lib/RecentChanges.php trunk/themes/Wordpress/themeinfo.php trunk/themes/alphatest.php trunk/themes/blog/lib/RecentChanges.php trunk/themes/blog/themeinfo.php trunk/themes/fusionforge/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php trunk/themes/wikilens/themeinfo.php trunk/uploads/index.php trunk/view.php trunk/wikiadmin.php trunk/wikilist.php Modified: trunk/ImageTile.php =================================================================== --- trunk/ImageTile.php 2012-10-05 16:47:39 UTC (rev 8397) +++ trunk/ImageTile.php 2012-10-06 10:28:33 UTC (rev 8398) @@ -3,38 +3,38 @@ require_once 'lib/stdlib.php'; $remove = 0; -if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) { +if (preg_match('/^(http|ftp|https):\/\//i', $_REQUEST['url'])) { $data_path = ''; list($usec, $sec) = explode(" ", microtime()); - $fp = fopen('config/config.ini','r'); - while ($config = fgetcsv($fp,1024,';')) { - if (preg_match('/DATA_PATH/',$config[0])) { - list($key,$value) = explode('=', $config[0]); - $data_path = trim($value).'/'; - break; + $fp = fopen('config/config.ini', 'r'); + while ($config = fgetcsv($fp, 1024, ';')) { + if (preg_match('/DATA_PATH/', $config[0])) { + list($key, $value) = explode('=', $config[0]); + $data_path = trim($value) . '/'; + break; + } } - } fclose($fp); - @mkdir($data_path."uploads/thumbs",0775); - $file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec); + @mkdir($data_path . "uploads/thumbs", 0775); + $file = $data_path . "uploads/thumbs/image_" . ((float)$usec + (float)$sec); $source = url_get_contents($_REQUEST['url']); - @$fp = fopen($file,'w+'); + @$fp = fopen($file, 'w+'); if (!$fp) { - header ("Content-type: text/html"); + header("Content-type: text/html"); echo "<html><head></head><body>ERROR : unable to open $file in write mode</body></html>"; } - fwrite($fp,$source); + fwrite($fp, $source); $remove = 1; } else { - @$fp = fopen($_REQUEST['url'],"r"); + @$fp = fopen($_REQUEST['url'], "r"); if (!$fp) { - header ("Content-type: text/html"); + header("Content-type: text/html"); echo "<html><head></head><body>Not an image</body></html>"; exit(); @@ -43,83 +43,83 @@ fclose($fp); } } -list ($a, $b, $type, $attr) = @getimagesize ($file); +list ($a, $b, $type, $attr) = @getimagesize($file); if (!$type) { - $type = basename ($_REQUEST['url']); - $type = preg_split ('/\./',$type); - $type = array_pop ($type); + $type = basename($_REQUEST['url']); + $type = preg_split('/\./', $type); + $type = array_pop($type); } switch ($type) { case '2': if (function_exists("imagecreatefromjpeg")) - $img = @imagecreatefromjpeg ($file); + $img = @imagecreatefromjpeg($file); else - show_plain ($file); + show_plain($file); break; case '3': if (function_exists("imagecreatefrompng")) - $img = @imagecreatefrompng ($file); + $img = @imagecreatefrompng($file); else - show_plain ($file); + show_plain($file); break; case '1': if (function_exists("imagecreatefromgif")) - $img = @imagecreatefromgif ($file); + $img = @imagecreatefromgif($file); else - show_plain ($file); + show_plain($file); break; case '15': if (function_exists("imagecreatefromwbmp")) - $img = @imagecreatefromwbmp ($file); + $img = @imagecreatefromwbmp($file); else - show_plain ($file); + show_plain($file); break; case '16': if (function_exists("imagecreatefromxbm")) - $img = @imagecreatefromxbm ($file); + $img = @imagecreatefromxbm($file); else - show_plain ($file); + show_plain($file); break; case 'xpm': if (function_exists("imagecreatefromxpm")) - $img = @imagecreatefromxpm ($file); + $img = @imagecreatefromxpm($file); else - show_plain ($file); + show_plain($file); break; case 'gd': if (function_exists("imagecreatefromgd")) - $img = @imagecreatefromgd ($file); + $img = @imagecreatefromgd($file); else - show_plain ($file); + show_plain($file); break; case 'gd2': if (function_exists("imagecreatefromgd2")) - $img = @imagecreatefromgd2 ($file); + $img = @imagecreatefromgd2($file); else - show_plain ($file); + show_plain($file); break; default: //we are not stupid... - header ("Content-type: text/html"); + header("Content-type: text/html"); echo "<html><head></head><body>Not an image</body></html>"; exit(); break; } -$width = @imagesx($img); +$width = @imagesx($img); $height = @imagesy($img); $newwidth = $_REQUEST['width']; if (empty($newidth)) $newidth = 50; $newheight = $_REQUEST['height']; -if (empty($newheight)) $newheight = round($newwidth * ($height / $width)) ; +if (empty($newheight)) $newheight = round($newwidth * ($height / $width)); // php-4.2.x is stupid enough to define on gd only a stub for imagecopyresampled. // So function_exists('imagecopyresampled') will fail. -if (!extension_loaded('gd2') and (substr(PHP_OS,0,3) != 'WIN')) +if (!extension_loaded('gd2') and (substr(PHP_OS, 0, 3) != 'WIN')) loadPhpExtension('gd2'); if (extension_loaded('gd2')) { $thumb = imagecreatetruecolor($newwidth, $newheight); @@ -129,14 +129,15 @@ $img = imagecopyresized($thumb, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height); } -if ($remove == 1) unlink ($file); +if ($remove == 1) unlink($file); -header ("Content-type: image/png"); +header("Content-type: image/png"); imagepng($thumb); -function show_plain () { - $mime = mime_content_type ($_REQUEST['url']); - header ("Content-type: $mime"); +function show_plain() +{ + $mime = mime_content_type($_REQUEST['url']); + header("Content-type: $mime"); readfile($_REQUEST['url']); exit(); } Modified: trunk/RPC2.php =================================================================== --- trunk/RPC2.php 2012-10-05 16:47:39 UTC (rev 8397) +++ trunk/RPC2.php 2012-10-06 10:28:33 UTC (rev 8398) @@ -10,9 +10,8 @@ // Intercept GET requests from confused users. Only POST is allowed here! if (empty($GLOBALS['HTTP_SERVER_VARS'])) - $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER; -if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST") -{ + $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER; +if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST") { die('This is the address of the XML-RPC interface.' . ' You must use XML-RPC calls to access information here.'); } Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2012-10-05 16:47:39 UTC (rev 8397) +++ trunk/SOAP.php 2012-10-06 10:28:33 UTC (rev 8398) @@ -37,11 +37,12 @@ require_once 'lib/WikiGroup.php'; */ -function checkCredentials(&$server, &$credentials, $access, $pagename) { +function checkCredentials(&$server, &$credentials, $access, $pagename) +{ // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header if (isset($server->header['Authorization'])) { - $line = base64_decode(str_replace("Basic ","",trim($server->header['Authorization']))); - list($credentials['username'],$credentials['password']) = explode(':',$line); + $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization']))); + list($credentials['username'], $credentials['password']) = explode(':', $line); } else { if (!isset($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; @@ -50,8 +51,7 @@ if (isset($_SERVER['REMOTE_ADDR'])) $credentials['username'] = $_SERVER['REMOTE_ADDR']; elseif (isset($GLOBALS['REMOTE_ADDR'])) - $credentials['username'] = $GLOBALS['REMOTE_ADDR']; - else + $credentials['username'] = $GLOBALS['REMOTE_ADDR']; else $credentials['username'] = $server->host; } } @@ -64,9 +64,9 @@ $request->_user = new WikiUser($request, $credentials['username']); } $request->_user->AuthCheck(array('userid' => $credentials['username'], - 'passwd' => $credentials['password'])); - if (! mayAccessPage ($access, $pagename)) - $server->fault(401,'',"no permission"); + 'passwd' => $credentials['password'])); + if (!mayAccessPage($access, $pagename)) + $server->fault(401, '', "no permission"); } $GLOBALS['SERVER_NAME'] = SERVER_URL; @@ -76,22 +76,22 @@ // Local or external wdsl support is experimental. // It works without also. Just the client has to // know the wdsl definitions. -$server = new soap_server(/* 'PhpWiki.wdsl' */); +$server = new soap_server( /* 'PhpWiki.wdsl' */); // Now change the server url to ours, because in the wdsl is the original PhpWiki address // <soap:address location="http://phpwiki.sourceforge.net/phpwiki/SOAP.php"; /> // <soap:operation soapAction="http://phpwiki.sourceforge.net/phpwiki/SOAP.php"; /> $server->ports[$server->currentPort]['location'] = $url; -$server->bindings[ $server->ports[$server->currentPort]['binding'] ]['endpoint'] = $url; +$server->bindings[$server->ports[$server->currentPort]['binding']]['endpoint'] = $url; $server->soapaction = $url; // soap_transport_http -$actions = array('getPageContent','getPageRevision','getCurrentRevision', - 'getPageMeta','doSavePage','getAllPagenames', - 'getBackLinks','doTitleSearch','doFullTextSearch', - 'getRecentChanges','listLinks','listPlugins', - 'getPluginSynopsis','callPlugin','listRelations', - 'linkSearch' - ); +$actions = array('getPageContent', 'getPageRevision', 'getCurrentRevision', + 'getPageMeta', 'doSavePage', 'getAllPagenames', + 'getBackLinks', 'doTitleSearch', 'doFullTextSearch', + 'getRecentChanges', 'listLinks', 'listPlugins', + 'getPluginSynopsis', 'callPlugin', 'listRelations', + 'linkSearch' +); foreach ($actions as $action) { $server->register($actions); $server->operations[$actions]['soapaction'] = $url; @@ -100,9 +100,10 @@ //todo: check and set credentials // requiredAuthorityForPage($action); // require 'edit' access -function doSavePage($pagename,$content,$credentials=false) { +function doSavePage($pagename, $content, $credentials = false) +{ global $server; - checkCredentials($server, $credentials,'edit',$pagename); + checkCredentials($server, $credentials, 'edit', $pagename); $dbi = WikiDB::open($GLOBALS['DBParams']); $page = $dbi->getPage($pagename); $current = $page->getCurrentRevision(); @@ -113,41 +114,48 @@ } // require 'view' access -function getPageContent($pagename,$credentials=false) { +function getPageContent($pagename, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',$pagename); + checkCredentials($server, $credentials, 'view', $pagename); $dbi = WikiDB::open($GLOBALS['DBParams']); $page = $dbi->getPage($pagename); $rev = $page->getCurrentRevision(); $text = $rev->getPackedContent(); return $text; } + // require 'view' access -function getPageRevision($pagename,$revision,$credentials=false) { +function getPageRevision($pagename, $revision, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',$pagename); + checkCredentials($server, $credentials, 'view', $pagename); $dbi = WikiDB::open($GLOBALS['DBParams']); $page = $dbi->getPage($pagename); $rev = $page->getCurrentRevision(); $text = $rev->getPackedContent(); return $text; } + // require 'view' access -function getCurrentRevision($pagename,$credentials=false) { +function getCurrentRevision($pagename, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',$pagename); - if (!mayAccessPage ('view',$pagename)) - $server->fault(401,'',"no permission"); + checkCredentials($server, $credentials, 'view', $pagename); + if (!mayAccessPage('view', $pagename)) + $server->fault(401, '', "no permission"); $dbi = WikiDB::open($GLOBALS['DBParams']); $page = $dbi->getPage($pagename); $rev = $page->getCurrentRevision(); $version = $current->getVersion(); return (double)$version; } + // require 'change' or 'view' access ? -function getPageMeta($pagename,$credentials=false) { +function getPageMeta($pagename, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',$pagename); + checkCredentials($server, $credentials, 'view', $pagename); $dbi = WikiDB::open($GLOBALS['DBParams']); $page = $dbi->getPage($pagename); $rev = $page->getCurrentRevision(); @@ -155,10 +163,12 @@ //todo: reformat the meta hash return $meta; } + // require 'view' access to AllPages -function getAllPagenames($credentials=false) { +function getAllPagenames($credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',_("AllPages")); + checkCredentials($server, $credentials, 'view', _("AllPages")); $dbi = WikiDB::open($GLOBALS['DBParams']); $page_iter = $dbi->getAllPages(); $pages = array(); @@ -167,13 +177,15 @@ } return $pages; } + // require 'view' access -function getBacklinks($pagename,$credentials=false) { +function getBacklinks($pagename, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',$pagename); + checkCredentials($server, $credentials, 'view', $pagename); $dbi = WikiDB::open($GLOBALS['DBParams']); $backend = &$dbi->_backend; - $result = $backend->get_links($pagename); + $result = $backend->get_links($pagename); $page_iter = new WikiDB_PageIterator($dbi, $result); $pages = array(); while ($page = $page_iter->next()) { @@ -181,10 +193,12 @@ } return $pages; } + // require 'view' access to TitleSearch -function doTitleSearch($s, $credentials=false) { +function doTitleSearch($s, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',_("TitleSearch")); + checkCredentials($server, $credentials, 'view', _("TitleSearch")); $dbi = WikiDB::open($GLOBALS['DBParams']); $query = new TextSearchQuery($s); $page_iter = $dbi->titleSearch($query); @@ -194,10 +208,12 @@ } return $pages; } + // require 'view' access to FullTextSearch -function doFullTextSearch($s, $credentials=false) { +function doFullTextSearch($s, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',_("FullTextSearch")); + checkCredentials($server, $credentials, 'view', _("FullTextSearch")); $dbi = WikiDB::open($GLOBALS['DBParams']); $query = new TextSearchQuery($s); $page_iter = $dbi->fullSearch($query); @@ -209,28 +225,31 @@ } // require 'view' access to RecentChanges -function getRecentChanges($limit=false, $since=false, $include_minor=false, $credentials=false) { +function getRecentChanges($limit = false, $since = false, $include_minor = false, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',_("RecentChanges")); + checkCredentials($server, $credentials, 'view', _("RecentChanges")); $dbi = WikiDB::open($GLOBALS['DBParams']); $params = array('limit' => $limit, 'since' => $since, - 'include_minor_revisions' => $include_minor); + 'include_minor_revisions' => $include_minor); $page_iter = $dbi->mostRecent($params); $pages = array(); while ($page = $page_iter->next()) { $pages[] = array('pagename' => $page->getName(), - 'lastModified' => $page->get('mtime'), - 'author' => $page->get('author'), - 'summary' => $page->get('summary'), // added with 1.3.13 - 'version' => $page->getVersion() - ); + 'lastModified' => $page->get('mtime'), + 'author' => $page->get('author'), + 'summary' => $page->get('summary'), // added with 1.3.13 + 'version' => $page->getVersion() + ); } return $pages; } + // require 'view' access -function listLinks($pagename, $credentials=false) { +function listLinks($pagename, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',$pagename); + checkCredentials($server, $credentials, 'view', $pagename); $dbi = WikiDB::open($GLOBALS['DBParams']); $page = $dbi->getPage($pagename); $linkiterator = $page->getPageLinks(); @@ -241,9 +260,11 @@ } return $links; } -function listPlugins($credentials=false) { + +function listPlugins($credentials = false) +{ global $server; - checkCredentials($server,$credentials,'change',_("HomePage")); + checkCredentials($server, $credentials, 'change', _("HomePage")); $plugin_dir = 'lib/plugin'; if (defined('PHPWIKI_DIR')) $plugin_dir = PHPWIKI_DIR . "/$plugin_dir"; @@ -266,9 +287,11 @@ } return $RetArray; } -function getPluginSynopsis($pluginname, $credentials=false) { + +function getPluginSynopsis($pluginname, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin"); + checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin"); require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; $synopsis = ''; @@ -277,21 +300,24 @@ if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') { $plugin_args = ''; $desc = $p->getArgumentsDescription(); - $src = array("\n",'"',"'",'|','[',']','\\'); - $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C'); - $desc = str_replace("<br />",' ',$desc->asXML()); + $src = array("\n", '"', "'", '|', '[', ']', '\\'); + $replace = array('%0A', '%22', '%27', '%7C', '%5B', '%5D', '%5C'); + $desc = str_replace("<br />", ' ', $desc->asXML()); if ($desc) - $plugin_args = '\n'.str_replace($src, $replace, $desc); - $synopsis = "<?plugin ".$pluginName.$plugin_args."?>"; // args? + $plugin_args = '\n' . str_replace($src, $replace, $desc); + $synopsis = "<?plugin " . $pluginName . $plugin_args . "?>"; // args? } return $synopsis; } + // only plugins returning pagelists will return something useful. so omit the html output -function callPlugin($pluginname, $pluginargs, $credentials=false) { +function callPlugin($pluginname, $pluginargs, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin"); + checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin"); - $basepage = '';; + $basepage = ''; + ; require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; $p = $w->getPlugin($pluginName, false); // second arg? @@ -303,6 +329,7 @@ } return $pages; } + /** * array listRelations([ Integer option = 1 ]) * @@ -315,20 +342,23 @@ * * @author: Reini Urban */ -function listRelations($option = 1, $credentials=false) { +function listRelations($option = 1, $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',_("HomePage")); + checkCredentials($server, $credentials, 'view', _("HomePage")); $also_attributes = $option & 2; $only_attributes = $option & 2 and !($option & 1); $sorted = !($option & 4); return $dbh->listRelations($also_attributes, - $only_attributes, - $sorted); + $only_attributes, + $sorted); } + // some basic semantic search -function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) { +function linkSearch($linktype, $search, $pages = "*", $relation = "*", $credentials = false) +{ global $server; - checkCredentials($server,$credentials,'view',_("HomePage")); + checkCredentials($server, $credentials, 'view', _("HomePage")); $dbi = WikiDB::open($GLOBALS['DBParams']); require_once 'lib/TextSearchQuery.php'; $pagequery = new TextSearchQuery($pages); Modified: trunk/admin/wiki2public.php =================================================================== --- trunk/admin/wiki2public.php 2012-10-05 16:47:39 UTC (rev 8397) +++ trunk/admin/wiki2public.php 2012-10-06 10:28:33 UTC (rev 8398) @@ -1,4 +1,4 @@ <?php - // cronjob script to copy pages marked as "public" to a seperate public wiki area. - // If ENABLE_PAGE_PUBLIC = true - // can only run via localhost for security reasons +// cronjob script to copy pages marked as "public" to a seperate public wiki area. +// If ENABLE_PAGE_PUBLIC = true +// can only run via localhost for security reasons Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2012-10-05 16:47:39 UTC (rev 8397) +++ trunk/configurator.php 2012-10-06 10:28:33 UTC (rev 8398) @@ -54,17 +54,17 @@ */ global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth; -if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; -if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS']; -if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS']; -if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS']; +if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; +if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS']; +if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS']; +if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS']; if (empty($configurator)) $configurator = "configurator.php"; if (!strstr($_SERVER["SCRIPT_NAME"], $configurator) and defined('DATA_PATH')) $configurator = DATA_PATH . "/" . $configurator; $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]); -if (strstr($_SERVER["SCRIPT_NAME"],"/php")) { // cgi got this different +if (strstr($_SERVER["SCRIPT_NAME"], "/php")) { // cgi got this different if (defined('DATA_PATH')) $scriptname = DATA_PATH . "/index.php"; else @@ -72,13 +72,14 @@ } $tdwidth = 700; -$config_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini'; -$fs_config_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $config_file; -if (isset($_POST['create'])) header('Location: '.$configurator.'?show=_part1&create=1#create'); +$config_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini'; +$fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file; +if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create'); // helpers from lib/WikiUser/HttpAuth.php if (!function_exists('_http_user')) { - function _http_user() { + function _http_user() + { if (!isset($_SERVER)) $_SERVER = $GLOBALS['HTTP_SERVER_VARS']; if (!empty($_SERVER['PHP_AUTH_USER'])) @@ -87,7 +88,7 @@ return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']); if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'])) return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'], - $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']); + $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']); if (!empty($GLOBALS['REMOTE_USER'])) return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']); @@ -96,14 +97,16 @@ list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6))); return array($userid, $passwd); } - return array('',''); + return array('', ''); } - function _http_logout() { + + function _http_logout() + { if (!isset($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; // maybe we should random the realm to really force a logout. but the next login will fail. // better_srand(); $realm = microtime().rand(); - header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"'); + header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"'); if (strstr(php_sapi_name(), 'apache')) header('HTTP/1.0 401 Unauthorized'); else @@ -122,22 +125,21 @@ if (file_exists($fs_config_file)) { // Require admin user if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) { - if (!function_exists("IniConfig")) { - include_once 'lib/prepend.php'; + if (!function_exists("IniConfig")) { + include_once 'lib/prepend.php'; include_once 'lib/IniConfig.php'; - } + } IniConfig($fs_config_file); } if (!defined('ADMIN_USER') or ADMIN_USER == '') { trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n" - . "Cannot continue: You have to fix that manually.", E_USER_ERROR); + . "Cannot continue: You have to fix that manually.", E_USER_ERROR); exit(); } list($admin_user, $admin_pw) = _http_user(); //$required_user = ADMIN_USER; - if (empty($admin_user) or $admin_user != ADMIN_USER) - { + if (empty($admin_user) or $admin_user != ADMIN_USER) { _http_logout(); } // check password @@ -152,121 +154,167 @@ include_once 'lib/prepend.php'; include_once 'lib/IniConfig.php'; } - $def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini'; - $fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file; + $def_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini'; + $fs_def_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $def_file; IniConfig($fs_def_file); } -echo '<','?xml version="1.0" encoding="utf-8"?',">\n"; +echo '<', '?xml version="1.0" encoding="utf-8"?', ">\n"; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Configuration tool for PhpWiki <?php echo $config_file ?></title> -<style type="text/css" media="screen"> -<!-- -/* TABLE { border: thin solid black } */ -body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 80%; } -pre { font-size: 120%; } -td { border: thin solid black } -tr { border: none } -div.hint { background-color: #eeeeee; } -tr.hidden { border: none; display: none; } -td.part { background-color: #eeeeee; color: inherit; } -td.instructions { background-color: #ffffee; width: <?php echo $tdwidth ?>px; color: inherit; } -td.unchangeable-variable-top { border-bottom: none; background-color: #ffffee; color:inherit; } -td.unchangeable-variable-left { border-top: none; background-color: #ffffee; color:inherit; } ---> -</style> -<script type="text/javascript"> -<!-- -function update(accepted, error, value, output) { - var msg = document.getElementById(output); - if (accepted) { - /* MSIE 5.0 fails here */ - if (msg && msg.innerHTML) { msg.innerHTML = "<font color=\"green\">Input accepted.</font>"; } - } else { - while ((index = error.indexOf("%s")) > -1) { - error = error.substring(0, index) + value + error.substring(index+2); - } - if (msg) { msg.innerHTML = "<font color=\"red\">" + error + "</font>"; } - } - if (submit = document.getElementById('submit')) submit.disabled = accepted ? false : true; -} + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>Configuration tool for PhpWiki <?php echo $config_file ?></title> + <style type="text/css" media="screen"> + <!-- + /* TABLE { border: thin solid black } */ + body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 80%; + } -function validate(error, value, output, field) { - update(field.value == value, error, field.value, output); -} + pre { + font-size: 120%; + } -function validate_ereg(error, ereg, output, field) { - regex = new RegExp(ereg); - update(regex.test(field.value), error, field.value, output); -} + td { + border: thin solid black + } -function validate_range(error, low, high, empty_ok, output, field) { - update((empty_ok == 1 && field.value == "") || - (field.value >= low && field.value <= high), - error, field.value, output); -} + tr { + border: none + } -function toggle_group(id) { - var text = document.getElementById(id + "_text"); - var do_hide = false; - if (text.innerHTML == "Hide options.") { - do_hide = true; - text.innerHTML = "Show options."; - } else { - text.innerHTML = "Hide options."; - } + div.hint { + background-color: #eeeeee; + } - var rows = document.getElementsByTagName('tr'); - var i = 0; - for (i = 0; i < rows.length; i++) { - var tr = rows[i]; - if (tr.className == 'header' && tr.id == id) { - i++; - break; - } - } - for (; i < rows.length; i++) { - var tr = rows[i]; - if (tr.className == 'header') - break; - tr.className = do_hide ? 'hidden': 'nonhidden'; - } -} + tr.hidden { + border: none; + display: none; + } -function do_init() { - // Hide all groups. We do this via JavaScript to avoid - // hiding the groups if JavaScript is not supported... - var rows = document.getElementsByTagName('tr'); - var show = '<?php echo $_GET["show"] ?>'; - for (var i = 0; i < rows.length; i++) { - var tr = rows[i]; - if (tr.className == 'header') - if (!show || tr.id != show) - toggle_group(tr.id); - } + td.part { + background-color: #eeeeee; + color: inherit; + } - // Select text in textarea upon focus - var area = document.getElementById('config-output'); - if (area) { - listener = { handleEvent: function (e) { area.select(); } }; - area.addEventListener('focus', listener, false); - } -} + td.instructions { + background-color: #ffffee; + width: <?php echo $tdwidth ?>px; + color: inherit; + } ---> -</script> + td.unchangeable-variable-top { + border-bottom: none; + background-color: #ffffee; + color: inherit; + } + + td.unchangeable-variable-left { + border-top: none; + background-color: #ffffee; + color: inherit; + } + + --> + </style> + <script type="text/javascript"> + < + !-- + function update(accepted, error, value, output) { + var msg = document.getElementById(output); + if (accepted) { + /* MSIE 5.0 fails here */ + if (msg && msg.innerHTML) { + msg.innerHTML = "<font color=\"green\">Input accepted.</font>"; + } + } else { + while ((index = error.indexOf("%s")) > -1) { + error = error.substring(0, index) + value + error.substring(index + 2); + } + if (msg) { + msg.innerHTML = "<font color=\"red\">" + error + "</font>"; + } + } + if (submit = document.getElementById('submit')) submit.disabled = accepted ? false : true; + } + + function validate(error, value, output, field) { + update(field.value == value, error, field.value, output); + } + + function validate_ereg(error, ereg, output, field) { + regex = new RegExp(ereg); + update(regex.test(field.value), error, field.value, output); + } + + function validate_range(error, low, high, empty_ok, output, field) { + update((empty_ok == 1 && field.value == "") || + (field.value >= low && field.value <= high), + error, field.value, output); + } + + function toggle_group(id) { + var text = document.getElementById(id + "_text"); + var do_hide = false; + if (text.innerHTML == "Hide options.") { + do_hide = true; + text.innerHTML = "Show options."; + } else { + text.innerHTML = "Hide options."; + } + + var rows = document.getElementsByTagName('tr'); + var i = 0; + for (i = 0; i < rows.length; i++) { + var tr = rows[i]; + if (tr.className == 'header' && tr.id == id) { + i++; + break; + } + } + for (; i < rows.length; i++) { + var tr = rows[i]; + if (tr.className == 'header') + break; + tr.className = do_hide ? 'hidden' : 'nonhidden'; + } + } + + function do_init() { + // Hide all groups. We do this via JavaScript to avoid + // hiding the groups if JavaScript is not supported... + var rows = document.getElementsByTagName('tr'); + var show = '<?php echo $_GET["show"] ?>'; + for (var i = 0; i < rows.length; i++) { + var tr = rows[i]; + if (tr.className == 'header') + if (!show || tr.id != show) + toggle_group(tr.id); + } + + // Select text in textarea upon focus + var area = document.getElementById('config-output'); + if (area) { + listener = { handleEvent:function (e) { + area.select(); + } }; + area.addEventListener('focus', listener, false); + } + } + + -- > + </script> </head> <body onload="do_init();"> - <h1>Configuration for PhpWiki <?php echo $config_file ?></h1> +<h1>Configuration for PhpWiki <?php echo $config_file ?></h1> <div class="hint"> - Using this configurator.php is experimental!<br /> + Using this configurator.php is experimental!<br/> On any configuration problems, please edit the resulting config.ini manually. </div> @@ -330,121 +378,121 @@ // grep \'$x\' configurator.php >/dev/null || echo $x ; done $properties["Part Zero"] = -new part('_part0', $SEPARATOR."\n", " + new part('_part0', $SEPARATOR . "\n", " Part Zero: (optional) Latest Development and Tricky Options"); if (defined('INCLUDE_PATH')) $include_path = INCLUDE_PATH; else { - if (substr(PHP_OS,0,3) == 'WIN') { - $include_path = dirname(__FILE__) . ';' . ini_get('include_path'); - if (strchr(ini_get('include_path'),'/')) - $include_path = strtr($include_path,'\\','/'); - } else { - $include_path = dirname(__FILE__) . ':' . ini_get('include_path'); - } + if (substr(PHP_OS, 0, 3) == 'WIN') { + $include_path = dirname(__FILE__) . ';' . ini_get('include_path'); + if (strchr(ini_get('include_path'), '/')) + $include_path = strtr($include_path, '\\', '/'); + } else { + $include_path = dirname(__FILE__) . ':' . ini_get('include_path'); + } } $properties["PHP include_path"] = -new _define('INCLUDE_PATH', $include_path); + new _define('INCLUDE_PATH', $include_path); // TODO: Convert this to a checkbox row as in tests/unit/test.php $properties["DEBUG"] = -new numeric_define_optional('DEBUG', DEBUG); + new numeric_define_optional('DEBUG', DEBUG); $properties["ENABLE_EDIT_TOOLBAR"] = -new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR'); + new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR'); $properties["JS_SEARCHREPLACE"] = -new boolean_define_commented_optional('JS_SEARCHREPLACE'); + new boolean_define_commented_optional('JS_SEARCHREPLACE'); // TESTME: use config-default: = false $properties["ENABLE_DOUBLECLICKEDIT"] = -new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT'); + new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT'); $properties["ENABLE_WYSIWYG"] = -new boolean_define_commented_optional('ENABLE_WYSIWYG'); + new boolean_define_commented_optional('ENABLE_WYSIWYG'); $properties["WYSIWYG_BACKEND"] = -new _define_selection( -'WYSIWYG_BACKEND', -array('Wikiwyg' => 'Wikiwyg', - 'tinymce' => 'tinymce', - 'FCKeditor' => 'FCKeditor', - 'spaw' => 'spaw', - 'htmlarea3' => 'htmlarea3', - 'htmlarea2' => 'htmlarea2', -)); + new _define_selection( + 'WYSIWYG_BACKEND', + array('Wikiwyg' => 'Wikiwyg', + 'tinymce' => 'tinymce', + 'FCKeditor' => 'FCKeditor', + 'spaw' => 'spaw', + 'htmlarea3' => 'htmlarea3', + 'htmlarea2' => 'htmlarea2', + )); $properties["WYSIWYG_DEFAULT_PAGETYPE_HTML"] = -new boolean_define_commented_optional('WYSIWYG_DEFAULT_PAGETYPE_HTML'); + new boolean_define_commented_optional('WYSIWYG_DEFAULT_PAGETYPE_HTML'); $properties["UPLOAD_USERDIR"] = -new boolean_define_commented_optional('UPLOAD_USERDIR'); + new boolean_define_commented_optional('UPLOAD_USERDIR'); $properties["DISABLE_UNITS"] = -new boolean_define_commented_optional('DISABLE_UNITS'); + new boolean_define_commented_optional('DISABLE_UNITS'); $properties["UNITS_EXE"] = -new _define_commented_optional('UNITS_EXE'); + new _define_commented_optional('UNITS_EXE'); $properties["ENABLE_XHTML_XML"] = -new boolean_define_commented_optional('ENABLE_XHTML_XML'); + new boolean_define_commented_optional('ENABLE_XHTML_XML'); $properties["ENABLE_OPEN_GRAPH"] = -new boolean_define_commented_optional('ENABLE_OPEN_GRAPH'); + new boolean_define_commented_optional('ENABLE_OPEN_GRAPH'); $properties["ENABLE_SPAMASSASSIN"] = -new boolean_define_commented_optional('ENABLE_SPAMASSASSIN'); + new boolean_define_commented_optional('ENABLE_SPAMASSASSIN'); $properties["ENABLE_SPAMBLOCKLIST"] = -new boolean_define_optional('ENABLE_SPAMBLOCKLIST'); + new boolean_define_optional('ENABLE_SPAMBLOCKLIST'); $properties["NUM_SPAM_LINKS"] = -new numeric_define_optional('NUM_SPAM_LINKS'); + new numeric_define_optional('NUM_SPAM_LINKS'); $properties["GOOGLE_LINKS_NOFOLLOW"] = -new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW'); + new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW'); $properties["ENABLE_LIVESEARCH"] = -new boolean_define_commented_optional('ENABLE_LIVESEARCH'); + new boolean_define_commented_optional('ENABLE_LIVESEARCH'); $properties["ENABLE_ACDROPDOWN"] = -new boolean_define_commented_optional('ENABLE_ACDROPDOWN'); + new boolean_define_commented_optional('ENABLE_ACDROPDOWN'); $properties["ENABLE_DISCUSSION_LINK"] = -new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK'); + new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK'); $properties["ENABLE_CAPTCHA"] = -new boolean_define_commented_optional('ENABLE_CAPTCHA'); + new boolean_define_commented_optional('ENABLE_CAPTCHA'); $properties["USE_CAPTCHA_RANDOM_WORD"] = -new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD'); + new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD'); $properties["USE_SAFE_DBSESSION"] = -new boolean_define_commented_optional('USE_SAFE_DBSESSION'); + new boolean_define_commented_optional('USE_SAFE_DBSESSION'); $properties["BLOG_DEFAULT_EMPTY_PREFIX"] = -new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX'); + new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX'); $properties["ENABLE_SEARCHHIGHLIGHT"] = -new boolean_define_commented_optional('ENABLE_SEARCHHIGHLIGHT'); + new boolean_define_commented_optional('ENABLE_SEARCHHIGHLIGHT'); $properties["Part One"] = -new part('_part1', $SEPARATOR."\n", " + new part('_part1', $SEPARATOR . "\n", " Part One: Authentication and security settings. See Part Three for more."); $properties["Wiki Name"] = -new _define_optional('WIKI_NAME', WIKI_NAME); + new _define_optional('WIKI_NAME', WIKI_NAME); $properties["Admin Username"] = -new _define_notempty('ADMIN_USER', ADMIN_USER, " + new _define_notempty('ADMIN_USER', ADMIN_USER, " You must set this! Username and password of the administrator.", -"onchange=\"validate_ereg('Sorry, ADMIN_USER cannot be empty.', '^.+$', 'ADMIN_USER', this);\""); + "onchange=\"validate_ereg('Sorry, ADMIN_USER cannot be empty.', '^.+$', 'ADMIN_USER', this);\""); $properties["Admin Password"] = -new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, " + new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, " You must set this! For heaven's sake pick a good password. @@ -453,74 +501,74 @@ Use the \"Create Random Password\" button to create a good (random) password. ADMIN_PASSWD is ignored on HttpAuth", -"onchange=\"validate_ereg('Sorry, ADMIN_PASSWD must be at least 4 chars long.', '^....+$', 'ADMIN_PASSWD', this);\""); + "onchange=\"validate_ereg('Sorry, ADMIN_PASSWD must be at least 4 chars long.', '^....+$', 'ADMIN_PASSWD', this);\""); $properties["Encrypted Passwords"] = -new boolean_define -('ENCRYPTED_PASSWD', - array('true' => "true. use crypt for all passwords", - 'false' => "false. use plaintest passwords (not recommended)")); + new boolean_define + ('ENCRYPTED_PASSWD', + array('true' => "true. use crypt for all passwords", + 'false' => "false. use plaintest passwords (not recommended)")); $properties["Reverse DNS"] = -new boolean_define_optional -('ENABLE_REVERSE_DNS', - array('true' => "true. perform additional reverse dns lookups", - 'false' => "false. just record the address as given by the httpd server")); + new boolean_define_optional + ('ENABLE_REVERSE_DNS', + array('true' => "true. perform additional reverse dns lookups", + 'false' => "false. just record the address as given by the httpd server")); $properties["ZIP Dump Authentication"] = -new boolean_define_optional('ZIPDUMP_AUTH', - array('false' => "false. Everyone may download zip dumps", - 'true' => "true. Only admin may download zip dumps")); + new boolean_define_optional('ZIPDUMP_AUTH', + array('false' => "false. Everyone may download zip dumps", + 'true' => "true. Only admin may download zip dumps")); $properties["Enable RawHtml Plugin"] = -new boolean_define_commented_optional('ENABLE_RAW_HTML'); + new boolean_define_commented_optional('ENABLE_RAW_HTML'); $properties["Allow RawHtml Plugin only on locked pages"] = -new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY'); + new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY'); $properties["Allow RawHtml Plugin if safe HTML code"] = - new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE','', " + new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE', '', " If this is set, all unsafe html code is stripped automatically (experimental!) See <a href=\"http://chxo.com/scripts/safe_html-test.php\"; target=\"_new\">chxo.com/scripts/safe_html-test.php</a> "); $properties["Maximum Upload Size"] = -new numeric_define_optional('MAX_UPLOAD_SIZE', MAX_UPLOAD_SIZE); + new numeric_define_optional('MAX_UPLOAD_SIZE', MAX_UPLOAD_SIZE); $properties["Minor Edit Timeout"] = -new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT); + new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT); $properties["Disabled Actions"] = -new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/); + new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/); $properties["Moderate all Pagechanges"] = -new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL'); + new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL'); $properties["Access Log File"] = -new _define_commented_optional('ACCESS_LOG', ACCESS_LOG); + new _define_commented_optional('ACCESS_LOG', ACCESS_LOG); $properties["Access Log SQL"] = -new _define_selection( -'ACCESS_LOG_SQL', -array('0' => 'disabled', - '1' => 'read only', - '2' => 'read + write')); + new _define_selection( + 'ACCESS_LOG_SQL', + array('0' => 'disabled', + '1' => 'read only', + '2' => 'read + write')); $properties["Compress Output"] = -new boolean_define_commented_optional -( 'COMPRESS_OUTPUT', - array('' => 'undefined - GZIP compress when appropriate.', - 'false' => 'Never compress output.', - 'true' => 'Always try to compress output.')); + new boolean_define_commented_optional + ('COMPRESS_OUTPUT', + array('' => 'undefined - GZIP compress when appropriate.', + 'false' => 'Never compress output.', + 'true' => 'Always try to compress output.')); $properties["HTTP Cache Control"] = -new _define_selection_optional -('CACHE_CONTROL', - array('LOOSE' => 'LOOSE', - 'STRICT' => 'STRICT', - 'NO_CACHE' => 'NO_CACHE', - 'ALLOW_STALE' => 'ALLOW_STALE'), -" + new _define_selection_optional + ('CACHE_CONTROL', + array('LOOSE' => 'LOOSE', + 'STRICT' => 'STRICT', + 'NO_CACHE' => 'NO_CACHE', + 'ALLOW_STALE' => 'ALLOW_STALE'), + " HTTP CACHE_CONTROL This controls how PhpWiki sets the HTTP cache control @@ -559,46 +607,46 @@ The default is currently LOOSE."); $properties["HTTP Cache Control Max Age"] = -new numeric_define_optional('CACHE_CONTROL_MAX_AGE', CACHE_CONTROL_MAX_AGE); + new numeric_define_optional('CACHE_CONTROL_MAX_AGE', CACHE_CONTROL_MAX_AGE); $properties["Markup Caching"] = -new boolean_define_commented_optional -('WIKIDB_NOCACHE_MARKUP', - array('false' => 'Enable markup cache', - 'true' => 'Disable markup cache')); + new boolean_define_commented_optional + ('WIKIDB_NOCACHE_MARKUP', + array('false' => 'Enable markup cache', + 'true' => 'Disable markup cache')); $properties["COOKIE_EXPIRATION_DAYS"] = -new numeric_define_optional('COOKIE_EXPIRATION_DAYS', COOKIE_EXPIRATION_DAYS); + new numeric_define_optional('COOKIE_EXPIRATION_DAYS', COOKIE_EXPIRATION_DAYS); $properties["COOKIE_DOMAIN"] = -new _define_commented_optional('COOKIE_DOMAIN', COOKIE_DOMAIN); + new _define_commented_optional('COOKIE_DOMAIN', COOKIE_DOMAIN); $properties["Path for PHP Session Support"] = -new _define_optional('SESSION_SAVE_PATH', defined('SESSION_SAVE_PATH') ? SESSION_SAVE_PATH : ini_get('session.save_path')); + new _define_optional('SESSION_SAVE_PATH', defined('SESSION_SAVE_PATH') ? SESSION_SAVE_PATH : ini_get('session.save_path')); $properties["Force PHP Database Sessions"] = -new boolean_define_commented_optional -('USE_DB_SESSION', - array('false' => 'Disable database sessions, use files', - 'true' => 'Enable database sessions')); + new boolean_define_commented_optional + ('USE_DB_SESSION', + array('false' => 'Disable database sessions, use files', + 'true' => 'Enable database sessions')); ///////// database selection $properties["Part Two"] = -new part('_part2', $SEPARATOR."\n", " + new part('_part2', $SEPARATOR . "\n", " Part Two: Database Configuration "); $properties["Database Type"] = -new _define_selection("DATABASE_TYPE", - array('dba' => "dba", - 'SQL' => "SQL PEAR", - 'ADODB' => "SQL ADODB", - 'PDO' => "PDO (php5 only)", - 'file' => "flatfile", - 'cvs' => "CVS File handler")/*, " + new _define_selection("DATABASE_TYPE", + array('dba' => "dba", + 'SQL' => "SQL PEAR", + 'ADODB' => "SQL ADODB", + 'PDO' => "PDO (php5 only)", + 'file' => "flatfile", + 'cvs' => "CVS File handler")/*, " Select the database backend type: Choose dba (default) to use one of the standard UNIX dba libraries. This is the fastest. Choose ADODB or SQL to use an SQL database with ADODB or PEAR. @@ -608,7 +656,7 @@ Recommended is dba or SQL: PEAR or ADODB."*/); $properties["SQL DSN Setup"] = -new unchangeable_variable('_sqldsnstuff', "", " + new unchangeable_variable('_sqldsnstuff', "", " For SQL based backends, specify the database as a DSN The most general form of a DSN looks like: <pre> @@ -632,30 +680,30 @@ // Choose dba to use one of the standard UNIX dbm libraries. $properties["SQL Type"] = -new _variable_selection('_dsn_sqltype', - array('mysql' => "MySQL", - 'pgsql' => "PostgreSQL", - 'mssql' => "Microsoft SQL Server", - 'mssqlnative' => "Microsoft SQL Server (native)", - 'oci8' => "Oracle 8", - 'mysqli' => "mysqli (only ADODB)", - 'mysqlt' => "mysqlt (only ADODB)", - 'ODBC' => "ODBC (only ADODB or PDO)", - 'firebird' => "Firebird (only PDO)", - 'oracle' => "Oracle (only PDO)", -), " + new _variable_selection('_dsn_sqltype', + array('mysql' => "MySQL", + 'pgsql' => "PostgreSQL", + 'mssql' => "Microsoft SQL Server", + 'mssqlnative' => "Microsoft SQL Server (native)", + 'oci8' => "Oracle 8", + 'mysqli' => "mysqli (only ADODB)", + 'mysqlt' => "mysqlt (only ADODB)", + 'ODBC' => "ODBC (only ADODB or PDO)", + 'firebird' => "Firebird (only PDO)", + 'oracle' => "Oracle (only PDO)", + ), " SQL DB types. The DSN hosttype."); $properties["SQL User"] = -new _variable('_dsn_sqluser', "wikiuser", " + new _variable('_dsn_sqluser', "wikiuser", " SQL User Id:"); $properties["SQL Password"] = -new _variable('_dsn_sqlpass', "", " + new _variable('_dsn_sqlpass', "", " SQL Password:"); $properties["SQL Database Host"] = -new _variable('_dsn_sqlhostorsock', "localhost", " + new _variable('_dsn_sqlhostorsock', "localhost", " SQL Database Hostname: To connect over a local named socket, use something like @@ -666,7 +714,7 @@ mysql on Windows via named pipes might need 127.0.0.1"); $properties["SQL Database Name"] = -new _variable('_dsn_sqldbname', "phpwiki", " + new _variable('_dsn_sqldbname', "phpwiki", " SQL Database Name:"); $dsn_sqltype = $properties["SQL Type"]->value(); @@ -674,15 +722,15 @@ $dsn_sqlpass = $properties["SQL Password"]->value(); $dsn_sqlhostorsock = $properties["SQL Database Host"]->value(); $dsn_sqldbname = $properties["SQL Database Name"]->value(); -$dsn_sqlstring = $dsn_sqltype."://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}"; +$dsn_sqlstring = $dsn_sqltype . "://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}"; $properties["SQL dsn"] = -new unchangeable_define("DATABASE_DSN", - $dsn_sqlstring, " + new unchangeable_define("DATABASE_DSN", + $dsn_sqlstring, " Calculated from the settings above:"); $properties["Filename / Table name Prefix"] = -new _define_commented('DATABASE_PREFIX', DATABASE_PREFIX, " + new _define_commented('DATABASE_PREFIX', DATABASE_PREFIX, " Used by all DB types: Prefix for filenames or table names, e.g. \"phpwiki_\" @@ -696,13 +744,13 @@ "); $properties["DATABASE_PERSISTENT"] = -new boolean_define_commented_optional -('DATABASE_PERSISTENT', - array('false' => "Disabled", - 'true' => "Enabled")); + new boolean_define_commented_optional + ('DATABASE_PERSISTENT', + array('false' => "Disabled", + 'true' => "Enabled")); $properties["DB Session table"] = -new _define_optional("DATABASE_SESSION_TABLE", DATABASE_SESSION_TABLE, " + new _define_optional("DATABASE_SESSION_TABLE", DATABASE_SESSION_TABLE, " Tablename to store session information. Only supported by SQL backends. A word of warning - any prefix defined above will be prepended to whatever is given here. @@ -711,40 +759,40 @@ //TODO: $TEMP $temp = !empty($_ENV['TEMP']) ? $_ENV['TEMP'] : "/tmp"; $properties["dba directory"] = -new _define("DATABASE_DIRECTORY", $temp); + new _define("DATABASE_DIRECTORY", $temp); // TODO: list the available methods $properties["dba handler"] = -new _define_selection('DATABASE_DBA_HANDLER', - array('gdbm' => "gdbm - GNU database manager (not recommended anymore)", - 'dbm' => "DBM - Redhat default. On sf.net there's dbm and not gdbm anymore", - 'db2' => "DB2 - BerkeleyDB (Sleepycat) DB2", - 'db3' => "DB3 - BerkeleyDB (Sleepycat) DB3. Default on Windows but not on every Linux", - 'db4' => "DB4 - BerkeleyDB (Sleepycat) DB4."), " + new _define_selection('DATABASE_DBA_HANDLER', + array('gdbm' => "gdbm - GNU database manager (not recommended anymore)", + 'dbm' => "DBM - Redhat default. On sf.net there's dbm and not gdbm anymore", + 'db2' => "DB2 - BerkeleyDB (Sleepycat) DB2", + 'db3' => "DB3 - BerkeleyDB (Sleepycat) DB3. Default on Windows but not on every Linux", + 'db4' => "DB4 - BerkeleyDB (Sleepycat) DB4."), " Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br /> " - . join(", ",dba_handlers()) - . "\n\nBetter not use other hacks such as inifile, flatfile or cdb"); + . join(", ", dba_handlers()) + . "\n\nBetter not use other hacks such as inifile, flatfile or cdb"); $properties["dba timeout"] = -new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, " + new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, " Recommended values are 10-20 seconds. The more load the server has, the higher the timeout."); $properties["DATABASE_OPTIMISE_FREQUENCY"] = -new numeric_define_optional('DATABASE_OPTIMISE_FREQUENCY', DATABASE_OPTIMISE_FREQUENCY); + new numeric_define_optional('DATABASE_OPTIMISE_FREQUENCY', DATABASE_OPTIMISE_FREQUENCY); $properties["DBADMIN_USER"] = -new _define_optional('DBADMIN_USER', DBADMIN_USER); + new _define_optional('DBADMIN_USER', DBADMIN_USER); $properties["DBADMIN_PASSWD"] = -new _define_password_optional('DBADMIN_PASSWD', DBADMIN_PASSWD); + new _define_password_optional('DBADMIN_PASSWD', DBADMIN_PASSWD); $properties["USECACHE"] = -new boolean_define_commented_optional('USECACHE'); + new boolean_define_commented_optional('USECACHE'); /////////////////// $properties["Page Revisions"] = -new unchangeable_variable('_parttworevisions', "", " + new unchangeable_variable('_parttworevisions', "", " Section 2a: Archive Cleanup The next section controls how many old revisions of each page are kept in the database. @@ -840,35 +888,35 @@ ///////////////////////////////////////////////////////////////////// $properties["Part Three"] = -new part('_part3', $SEPARATOR."\n", " + new part('_part3', $SEPARATOR . "\n", " Part Three: (optional) Basic User Authentication Setup "); $properties["Publicly viewable"] = -new boolean_define_optional('ALLOW_ANON_USER', - array('true' => "true. Permit anonymous view. (Default)", - 'false' => "false. Force login even on view (strictly private)"), " + new boolean_define_optional('ALLOW_ANON_USER', + array('true' => "true. Permit anonymous view. (Default)", + 'false' => "false. Force login even on view (strictly private)"), " If ALLOW_ANON_USER is false, you have to login before viewing any page or doing any other action on a page."); $properties["Allow anonymous edit"] = -new boolean_define_optional('ALLOW_ANON_EDIT', - array('true' => "true. Permit anonymous users to edit. (Default)", - 'false' => "false. Force login on edit (moderately locked)"), " + new boolean_define_optional('ALLOW_ANON_EDIT', + array('true' => "true. Permit anonymous users to edit. (Default)", + 'false' => "false. Force login on edit (moderately locked)"), " If ALLOW_ANON_EDIT is false, you have to login before editing or changing any page. See below."); $properties["Allow Bogo Login"] = -new boolean_define_optional('ALLOW_BOGO_LOGIN', - array('true' => "true. Users may Sign In with any WikiWord, without password. (Default)", - 'false' => "false. Require stricter authentication."), " + new boolean_define_optional('ALLOW_BOGO_LOGIN', + array('true' => "true. Users may Sign In with any WikiWord, without password. (Default)", + 'false' => "false. Require stricter authentication."), " If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password. If true, users are allowed to create themselves with any WikiWord username. See below."); $properties["Allow User Passwords"] = -new boolean_define_optional('ALLOW_USER_PASSWORDS', - array('true' => "True user authentication with password checking. (Default)", - 'false' => "false. Ignore authentication settings below."), " + new boolean_define_optional('ALLOW_USER_PASSWORDS', + array('true' => "True user authentication with password checking. (Default)", + 'false' => "false. Ignore authentication settings below."), " If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to check against given username/passwords. For completely security disable BOGO_LOGIN and ANON_EDIT above."); @@ -910,17 +958,17 @@ </pre>"); $properties["ENABLE_AUTH_OPENID"] = -new boolean_define('ENABLE_AUTH_OPENID'); + new boolean_define('ENABLE_AUTH_OPENID'); $properties["PASSWORD_LENGTH_MINIMUM"] = -new numeric_define('PASSWORD_LENGTH_MINIMUM', PASSWORD_LENGTH_MINIMUM); + new numeric_define('PASSWORD_LENGTH_MINIMUM', PASSWORD_LENGTH_MINIMUM); $properties["USER_AUTH_POLICY"] = -new _define_selection('USER_AUTH_POLICY', - array('first-only' => "first-only - use only the first method in USER_AUTH_ORDER", - 'old' => "old - ignore USER_AUTH_ORDER (legacy)", - 'strict' => "strict - check all methods for userid + password (recommended)", - 'stacked' => "stacked - check all methods for userid, and if found for password"), " + new _define_selection('USER_AUTH_POLICY', + array('first-only' => "first-only - use only the first method in USER_AUTH_ORDER", + 'old' => "old - ignore USER_AUTH_ORDER (legacy)", + 'strict' => "strict - check all methods for userid + password (recommended)", + 'stacked' => "stacked - check all methods for userid, and if found for password"), " The following policies are available for user authentication: <dl> <dt>first-only</dt> @@ -937,26 +985,26 @@ methods and return true on the first success.</dd></dl>"); $properties["ENABLE_USER_NEW"] = -new boolean_define_commented_optional('ENABLE_USER_NEW'); + new boolean_define_commented_optional('ENABLE_USER_NEW'); $properties["ENABLE_PAGEPERM"] = -new boolean_define_commented_optional('ENABLE_PAGEPERM'); + new boolean_define_commented_optional('ENABLE_PAGEPERM'); /////////////////// $properties["Part Three A"] = -new part('_part3a', $SEPARATOR."\n", " + new part('_part3a', $SEPARATOR . "\n", " Part Three A: (optional) Group Membership"); $properties["Group membership"] = -new _define_selection("GROUP_METHOD", - array('WIKIPAGE' => "WIKIPAGE - List at \"CategoryGroup\". (Slowest, but easiest to maintain)", - '"NONE"' => "NONE - Disable group membership (Fastest)", - 'DB' => "DB - SQL Database, Optionally external. See USERS/GROUPS queries", - 'FILE' => "Flatfile. See AUTH_GROUP_FILE below.", - 'LDAP' => "LDAP - See \"LDAP authentication options\" above. (Experimental)"), " + new _define_selection("GROUP_METHOD", + array('WIKIPAGE' => "WIKIPAGE - List at \"CategoryGroup\". (Slowest, but easiest to maintain)", + '"NONE"' => "NONE - Disable group membership (Fastest)", + 'DB' => "DB - SQL Database, Optionally external. See USERS/GROUPS queries", + 'FILE' => "Flatfile. See AUTH_GROUP_FILE below.", + 'LDAP' => "LDAP - See \"LDAP authentication options\" above. (Experimental)"), " Group membership. PhpWiki supports defining permissions for a group as well as for individual users. This defines how group membership information is obtained. Supported values are: @@ -974,19 +1022,19 @@ lib/WikiGroup.php. (experimental)</dd></dl>"); $properties["CATEGORY_GROUP_PAGE"] = - new _define_optional('CATEGORY_GROUP_PAGE', _("CategoryGroup"), " + new _define_optional('CATEGORY_GROUP_PAGE', _("CategoryGroup"), " If GROUP_METHOD = WIKIPAGE: Page where all groups are listed."); $properties["AUTH_GROUP_FILE"] = - new _define_optional('AUTH_GROUP_FILE', _("/etc/groups"), " + new _define_optional('AUTH_GROUP_FILE', _("/etc/groups"), " For GROUP_METHOD = FILE, the file given below is referenced to obtain group membership information. It should be in the same format as the standard unix /etc/groups(5) file."); $properties["Part Three B"] = -new part('_part3b', $SEPARATOR."\n", " + new part('_part3b', $SEPARATOR . "\n", " Part Three B: (optional) External database authentication and authorization. @@ -996,17 +1044,17 @@ database, and (optionally) store the information back to the DB."); $properties["DBAUTH_AUTH_DSN"] = - new _define_optional('DBAUTH_AUTH_DSN', $dsn_sqlstring, " + new _define_optional('DBAUTH_AUTH_DSN', $dsn_sqlstring, " A database DSN to connect to. Defaults to the DSN specified for the Wiki as a whole."); $properties["User Exists Query"] = - new _define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM user WHERE userid='\$userid'", " + new _define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM user WHERE userid='\$userid'", " USER/PASSWORD queries: For USER_AUTH_POLICY=strict and the Db method is required"); $properties["Check Query"] = - new _define_optional('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) AS ok FROM user WHERE userid='\$userid'", " + new _define_optional('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) AS ok FROM user WHERE userid='\$userid'", " Check to see if the supplied username/password pair is OK @@ -1017,10 +1065,10 @@ ; DBAUTH_AUTH_CHECK = \"SELECT IF(passwd=PASSWORD('\$password'),1,0) AS ok FROM user WHERE userid='\$userid'\""); $properties["Crypt Method"] = -new _define_selection_optional -('DBAUTH_AUTH_CRYPT_METHOD', - array('plain' => 'plain', - 'crypt' => 'crypt'), " + new _define_selection_optional + ('DBAUTH_AUTH_CRYPT_METHOD', + array('plain' => 'plain', + 'crypt' => 'crypt'), " If you want to use Unix crypt()ed passwords, you can use DBAUTH_AUTH_CHECK to get the password out of the database with a simple SELECT query, and specify DBAUTH_AUTH_USER_EXISTS and DBAUTH_AUTH_CRYPT_METHOD: @@ -1088,52 +1136,52 @@ if (function_exists('ldap_connect')) { -$properties["LDAP AUTH Host"] = - new _define_optional('LDAP_AUTH_HOST', "ldap://localhost:389";, " + $properties["LDAP AUTH Host"] = + new _define_optional('LDAP_AUTH_HOST', "ldap://localhost:389";, " If USER_AUTH_ORDER contains Ldap: The LDAP server to connect to. Can either be a hostname, or a complete URL to the server (useful if you want to use ldaps or specify a different port number)."); -$properties["LDAP BASE DN"] = - new _define_optional('LDAP_BASE_DN', "ou=mycompany.com,o=My Company", " + $properties["LDAP BASE DN"] = + new _define_optional('LDAP_BASE_DN', "ou=mycompany.com,o=My Company", " The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\". Note: ou=Users and ou=Groups are used for GroupLdap Membership Better use LDAP_OU_USERS and LDAP_OU_GROUP with GROUP_METHOD=LDAP."); -$properties["LDAP SET OPTION"] = - new _define_optional('LDAP_SET_OPTION', "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0", " + $properties["LDAP SET OPTION"] = + new _define_optional('LDAP_SET_OPTION', "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0", " Some LDAP servers need some more options, such as the Windows Active Directory Server. Specify the options (as allowed by the PHP LDAP module) and their values as NAME=value pairs separated by colons."); -$properties["LDAP AUTH USER"] = - new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", " + $properties["LDAP AUTH USER"] = + new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", " DN to initially bind to the LDAP server as. This is needed if the server doesn't allow anonymous queries. (Windows Active Directory Server)"); -$properties["LDAP AUTH PASSWORD"] = - new _define_optional('LDAP_AUTH_PASSWORD', "secret", " + $properties["LDAP AUTH PASSWORD"] = + new _define_optional('LDAP_AUTH_PASSWORD', "secret", " Password to use to initially bind to the LDAP server, as the DN specified in the LDAP_AUTH_USER option (above)."); -$properties["LDAP SEARCH FIELD"] = - new _define_optional('LDAP_SEARCH_FIELD', "uid", " + $properties["LDAP SEARCH FIELD"] = + new _define_optional('LDAP_SEARCH_FIELD', "uid", " If you want to match usernames against an attribute other than uid, specify it here. Default: uid e.g.: LDAP_SEARCH_FIELD = sAMAccountName"); -$properties["LDAP OU USERS"] = - new _define_optional('LDAP_OU_USERS', "ou=Users", " + $properties["LDAP OU USERS"] = + new _define_optional('LDAP_OU_USERS', "ou=Users", " If you have an organizational unit for all users, define it here. This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP) Default: ou=Users"); -$properties["LDAP OU GROUP"] = - new _define_optional('LDAP_OU_GROUP', "ou=Groups", " + $properties["LDAP OU GROUP"] = + new _define_optional('LDAP_OU_GROUP', "ou=Groups", " If you have an organizational unit for all groups, define it here. This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP) The entries in this ou must have a gidNumber and cn attribute. @@ -1141,8 +1189,8 @@ } else { // function_exists('ldap_connect') -$properties["LDAP Authentication"] = -new unchangeable_variable('LDAP Authentication', " + $properties["LDAP Authentication"] = + new unchangeable_variable('LDAP Authentication', " ; If USER_AUTH_ORDER contains Ldap: ; ; The LDAP server to connect to. Can either be a hostname, or a complete @@ -1188,8 +1236,8 @@ if (function_exists('imap_open')) { -$properties["IMAP Auth Host"] = - new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', " + $properties["IMAP Auth Host"] = + new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', " If USER_AUTH_ORDER contains IMAP: The IMAP server to check usernames from. Defaults to localhost. @@ -1200,8 +1248,8 @@ } else { // function_exists('imap_open') -$properties["IMAP Authentication"] = - new unchangeable_variable('IMAP_AUTH_HOST'," + $properties["IMAP Authentication"] = + new unchangeable_variable('IMAP_AUTH_HOST', " ; If USER_AUTH_ORDER contains IMAP: ; The IMAP server to check usernames from. Defaults to localhost. ; @@ -1214,55 +1262,55 @@ } $properties["POP3 Authentication"] = - new _define_optional('POP3_AUTH_HOST', 'localhost:110', " + new _define_optional('POP3_AUTH_HOST', 'localhost:110', " If USER_AUTH_ORDER contains POP3: The POP3 mail server to check usernames and passwords against."); $properties["File Authentication"] = - new _define_optional('AUTH_USER_FILE', '/etc/shadow', " + new _define_optional('AUTH_USER_FILE', '/etc/shadow', " If USER_AUTH_ORDER contains File: File to read for authentication information. Popular choices are /etc/shadow and /etc/httpd/.htpasswd"); $properties["File Storable?"] = -new boolean_define_commented_optional('AUTH_USER_FILE_STORABLE'); + new boolean_define_commented_optional('AUTH_USER_FILE_STORABLE'); $properties["Session Auth USER"] = - new _define_optional('AUTH_SESS_USER', 'userid', " + new _define_optional('AUTH_SESS_USER', 'userid', " If USER_AUTH_ORDER contains Session: Name of the session variable which holds the already authenticated username. Sample: 'userid', 'user[username]', 'user->username'"); $properties["Session Auth LEVEL"] = - new numeric_define('AUTH_SESS_LEVEL', '2', " + new numeric_define('AUTH_SESS_LEVEL', '2', " Which level will the user be? 1 = Bogo or 2 = Pass"); ///////////////////////////////////////////////////////////////////// $properties["Part Four"] = -new part('_part4', $SEPARATOR."\n", " + new part('_part4', $SEPARATOR . "\n", " Part Four: Page appearance and layout"); $properties["Theme"] = -new _define_selection_optional('THEME', - array('default' => "default", - 'MacOSX' => "MacOSX", - 'smaller' => 'smaller', - 'Wordpress'=> 'Wordpress', - 'Portland' => "Portland", - 'Sidebar' => "Sidebar", - 'Crao' => 'Crao', - 'wikilens' => 'wikilens (Ratings)', - 'shamino_com' => 'shamino_com', - 'SpaceWiki' => "SpaceWiki", - 'Hawaiian' => "Hawaiian", - 'MonoBook' => 'MonoBook [experimental]', - 'blog' => 'blog [experimental]', - ), " + new _define_selection_optional('THEME', + array('default' => "default", + 'MacOSX' => "MacOSX", + 'smaller' => 'smaller', + 'Wordpress' => 'Wordpress', + 'Portland' => "Portland", + 'Sidebar' => "Sidebar", + 'Crao' => 'Crao', + 'wikilens' => 'wikilens (Ratings)', + 'shamino_com' => 'shamino_com', + 'SpaceWiki' => "SpaceWiki", + 'Hawaiian' => "Hawaiian", + 'MonoBook' => 'MonoBook [experimental]', + 'blog' => 'blog [experimental]', + ), " THEME Most of the page appearance is controlled by files in the theme @@ -1293,17 +1341,17 @@ new _define_optional('IGNORE_CHARSET_NOT_SUPPORTED_WARNING'); $properties["Language"] = -new _define_selection_optional('DEFAULT_LANGUAGE', - array('en' => "English", - '' => "<empty> (user-specific)", - 'fr' => "Français", - 'de' => "Deutsch", - 'nl' => "Nederlands", - 'es' => "Español", - 'sv' => "Svenska", - 'it' => "Italiano", - 'ja' => "Japanese", - 'zh' => "Chinese"), " + new _define_selection_optional('DEFAULT_LANGUAGE', + array('en' => "English", + '' => "<empty> (user-specific)", + 'fr' => "Français", + 'de' => "Deutsch", + 'nl' => "Nederlands", + 'es' => "Español", + 'sv' => "Svenska", + 'it' => "Italiano", + 'ja' => "Japanese", + 'zh' => "Chinese"), " Select your language/locale - default language is \"en\" for English. Other languages available:<pre> English \"en\" (English - HomePage) @@ -1321,7 +1369,7 @@ used."); $properties["Wiki Page Source"] = -new _define_optional('WIKI_PGSRC', 'pgsrc', " + new _define_optional('WIKI_PGSRC', 'pgsrc', " WIKI_PGSRC -- specifies the source for the initial page contents of the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is accessed for the first time (or after clearing the database.) @@ -1337,7 +1385,7 @@ </pre>"); $properties["Default Wiki Page Source"] = -new _define('DEFAULT_WIKI_PGSRC', 'pgsrc', " + new _define('DEFAULT_WIKI_PGSRC', 'pgsrc', " DEFAULT_WIKI_PGSRC is only used when the language is *not* the default (English) and when reading from a directory: in that case some English pages are inserted into the wiki as well. @@ -1345,20 +1393,20 @@ "); $properties["Generic Pages"] = -new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'SteveWainstead', 'TestPage'), " + new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'SteveWainstead', 'TestPage'), " These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC. "); /////////////////// $properties["Part Five"] = -new part('_part5', $SEPARATOR."\n", " + new part('_part5', $SEPARATOR . "\n", " Part Five: Mark-up options"); $properties["Allowed Protocols"] = -new list_define('ALLOWED_PROTOCOLS', 'http|https|mailto|ftp|news|nntp|ssh|gopher', " + new list_define('ALLOWED_PROTOCOLS', 'http|https|mailto|ftp|news|nntp|ssh|gopher', " Allowed protocols for links - be careful not to allow \"javascript:\" URL of these types will be automatically linked. within a named link [name|uri] one more protocol is defined: phpwiki"); @@ -1367,18 +1415,18 @@ new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif'); $properties["WikiName Regexp"] = -new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", " + new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", " Perl regexp for WikiNames (\"bumpy words\") (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well"); $properties["Subpage Separator"] = -new _define_optional('SUBPAGE_SEPARATOR', '"/"', " + new _define_optional('SUBPAGE_SEPARATOR', '"/"', " One character which seperates pages from subpages. Defaults to '/', but '.' or ':' were also used.", -"onchange=\"validate_ereg('Sorry, \'%s\' must be a single character. Currently only :, / or .', '^[/:.]$', 'SUBPAGE_SEPARATOR', this);\"" -); + "onchange=\"validate_ereg('Sorry, \'%s\' must be a single character. Currently only :, / or .', '^[/:.]$', 'SUBPAGE_SEPARATOR', this);\"" + ); $properties["InterWiki Map File"] = -new _define('INTERWIKI_MAP_FILE', 'lib/interwiki.map', " + new _define('INTERWIKI_MAP_FILE', 'lib/interwiki.map', " InterWiki linking -- wiki-style links to other wikis on the web The map will be taken from a page name InterWikiMap. @@ -1387,10 +1435,10 @@ by INTERWIKI_MAP_FILE (if any) will be used."); $properties["WARN_NONPUBLIC_INTERWIKIMAP"] = -new boolean_define('WARN_NONPUBLIC_INTERWIKIMAP'); + new boolean_define('WARN_NONPUBLIC_INTERWIKIMAP'); $properties["Keyword Link Regexp"] = -new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', " + new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', " Search term used for automatic page classification by keyword extraction. Any links on a page to pages whose names match this search @@ -1401,7 +1449,7 @@ The default behavior is to match Category* or Topic* links."); $properties["Author and Copyright Site Navigation Links"] = -new _define_commented_optional('COPYRIGHTPAGE_TITLE', "GNU General Public License", " + new _define_commented_optional('COPYRIGHTPAGE_TITLE', "GNU General Public License", " These will be inserted as <link rel> tags in the html header of every page, for search engines and for browsers like Mozilla which @@ -1411,7 +1459,7 @@ these as appropriate."); $properties["COPYRIGHTPAGE URL"] = -new _define_commented_optional('COPYRIGHTPAGE_URL', "http://www.gnu.org/copyleft/gpl.html#SEC1";, " + new _define_commented_optional('COPYRIGHTPAGE_URL', "http://www.gnu.org/copyleft/gpl.html#SEC1";, " Other useful alternatives to consider: <pre> @@ -1429,21 +1477,21 @@ Default Author URL"); $properties["TOC_FULL_SYNTAX"] = -new boolean_define_optional('TOC_FULL_SYNTAX'); + new boolean_define_optional('TOC_FULL_SYNTAX'); $properties["ENABLE_MARKUP_COLOR"] = -new boolean_define_optional('ENABLE_MARKUP_COLOR'); + new boolean_define_optional('ENABLE_MARKUP_COLOR'); $properties["DISABLE_MARKUP_WIKIWORD"] = -new boolean_define_optional('DISABLE_MARKUP_WIKIWORD'); + new boolean_define_optional('DISABLE_MARKUP_WIKIWORD'); -$properties["ENABLE_MARKUP_DIVSPAN" ] = -new boolean_define_optional('ENABLE_MARKUP_DIVSPAN'); +$properties["ENABLE_MARKUP_DIVSPAN"] = + new boolean_define_optional('ENABLE_MARKUP_DIVSPAN'); /////////////////// $properties["Part Six"] = -new part('_part6', $SEPARATOR."\n", " + new part('_part6', $SEPARATOR . "\n", " Part Six (optional): URL options -- you can probably skip this section. @@ -1457,12 +1505,12 @@ $properties["Server Port"] = new numeric_define_commented('SERVER_PORT', $_SERVER['SERVER_PORT'], " Canonical httpd port of the server on which this PhpWiki resides.", -"onchange=\"validate_ereg('Sorry, \'%s\' is no valid port number.', '^[0-9]+$', 'SERVER_PORT', this);\""); + "onchange=\"validate_ereg('Sorry, \'%s\' is no valid port number.', '^[0-9]+$', 'SERVER_PORT', this);\""); $properties["Server Protocol"] = new _define_selection_optional_commented('SERVER_PROTOCOL', - array('http' => 'http', - 'https' => 'https')); + array('http' => 'http', + 'https' => 'https')); $properties["Script Name"] = new _define_commented_optional('SCRIPT_NAME', $scriptname); @@ -1471,13 +1519,13 @@ new _define_commented_optional('DATA_PATH', dirname($scriptname)); $properties["PhpWiki Install Directory"] = -new _define_commented_optional('PHPWIKI_DIR', dirname(__FILE__)); + new _define_commented_optional('PHPWIKI_DIR', dirname(__FILE__)); $properties["Use PATH_INFO"] = -new _define_selection_optional_commented('USE_PATH_INFO', - array('' => 'automatic', - 'true' => 'use PATH_INFO', - 'false' => 'do not use PATH_INFO'), " + new _define_selection_optional_commented('USE_PATH_INFO', + array('' => 'automatic', + 'true' => 'use PATH_INFO', + 'false' => 'do not use PATH_INFO'), " PhpWiki will try to use short urls to pages, eg http://www.example.com/index.php/HomePage If you want to use urls like @@ -1496,7 +1544,7 @@ use PATH_INFO if it thinks that is possible."); $properties["Virtual Path"] = -new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', " + new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', " VIRTUAL_PATH is the canonical URL path under which your your wiki appears. Normally this is the same as dirname(SCRIPT_NAME), however using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite), @@ -1528,12 +1576,12 @@ $temp = !empty($_ENV['TEMP']) ? $_ENV['TEMP'] : "/tmp"; $properties["TEMP_DIR"] = -new _define_optional('TEMP_DIR', $temp); + new _define_optional('TEMP_DIR', $temp); /////////////////// $properties["Part Seven"] = -new part('_part7', $SEPARATOR."\n", " + new part('_part7', $SEPARATOR . "\n", " Part Seven: @@ -1542,8 +1590,8 @@ $properties["Strict Mailable Pagedumps"] = new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS', - array('false' => "binary", - 'true' => "quoted-printable")); + array('false' => "binary", + 'true' => "quoted-printable")); $properties["Default local Dump Directory"] = new _define_optional('DEFAULT_DUMP_DIR'); @@ -1556,7 +1604,7 @@ $properties["Pagename of Recent Changes"] = new _define_optional('RECENT_CHANGES', - "RecentChanges"); + "RecentChanges"); $properties["Disable HTTP Redirects"] = new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT'); @@ -1577,7 +1625,7 @@ new _define_commented_optional('FULLTEXTSEARCH_STOPLIST'); $properties["Part Seven A"] = - new part('_part7a', $SEPARATOR."\n", " + new part('_part7a', $SEPARATOR . "\n", " Part Seven A: @@ -1585,7 +1633,7 @@ "); $properties["FORTUNE_DIR"] = - new _define_commented_optional('FORTUNE_DIR', "/usr/share/fortune"); + new _define_commented_optional('FORTUNE_DIR', "/usr/share/fortune"); $properties["USE_EXTERNAL_HTML2PDF"] = new _define_commented_optional('USE_EXTERNAL_HTML2PDF', "htmldoc --quiet --format pdf14 --no-toc --no-title %s"); $properties["EXTERNAL_HTML2PDF_PAGELIST"] = @@ -1593,22 +1641,22 @@ $properties["BABYCART_PATH"] = new _define_commented_optional('BABYCART_PATH', "/usr/local/bin/babycart"); $properties["GOOGLE_LICENSE_KEY"] = - new _define_commented_optional('GOOGLE_LICENSE_KEY'); + new _define_commented_optional('GOOGLE_LICENSE_KEY'); $properties["RATEIT_IMGPREFIX"] = new _define_commented_optional('RATEIT_IMGPREFIX'); //BStar $properties["GRAPHVIZ_EXE"] = new _define_commented_optional('GRAPHVIZ_EXE'); // /usr/local/bin/dot if (PHP_OS == "Darwin") // Mac OS X - $ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf"; + $ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf"; elseif (isWindows()) { - $ttfont = $_ENV['windir'].'\Fonts\Arial.ttf'; + $ttfont = $_ENV['windir'] . '\Fonts\Arial.ttf'; } else { $ttfont = 'luximr'; // This is the only what sourceforge offered. //$ttfont = 'Helvetica'; } $properties["TTFONT"] = - new _define_commented_optional('TTFONT',$ttfont); + new _define_commented_optional('TTFONT', $ttfont); $properties["VISUALWIKIFONT"] = new _define_commented_optional('VISUALWIKIFONT'); // Arial $properties["VISUALWIKI_ALLOWOPTIONS"] = @@ -1627,7 +1675,7 @@ new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight $properties["Part Eight"] = -new part('_part8', $SEPARATOR."\n", " + new part('_part8', $SEPARATOR . "\n", " Part Eight: @@ -1635,42 +1683,42 @@ "); $properties["pear Cache USECACHE"] = -new boolean_define_optional('PLUGIN_CACHED_USECACHE', - array('true' => 'Enabled', - 'false' => 'Disabled'), " + new boolean_define_optional('PLUGIN_CACHED_USECACHE', + array('true' => 'Enabled', + 'false' => 'Disabled'), " Enable or disable pear caching of plugins."); $properties["pear Cache Database Container"] = -new _define_selection_optional('PLUGIN_CACHED_DATABASE', - array('file' => 'file'), " + new _define_selection_optional('PLUGIN_CACHED_DATABASE', + array('file' => 'file'), " Curently only file is supported. db, trifile and imgfile might be supported, but you must hack that by yourself."); $properties["pear Cache cache directory"] = -new _define_commented_optional('PLUGIN_CACHED_CACHE_DIR', "/tmp/cache", " + new _define_commented_optional('PLUGIN_CACHED_CACHE_DIR', "/tmp/cache", " Should be writable to the webserver."); $properties["pear Cache Filename Prefix"] = -new _define_optional('PLUGIN_CACHED_FILENAME_PREFIX', "phpwiki", ""); + new _define_optional('PLUGIN_CACHED_FILENAME_PREFIX', "phpwiki", ""); $properties["pear Cache HIGHWATER"] = -new numeric_define_optional('PLUGIN_CACHED_HIGHWATER', "4194304", " + new numeric_define_optional('PLUGIN_CACHED_HIGHWATER', "4194304", " Garbage collection parameter."); $properties["pear Cache LOWWATER"] = -new numeric_define_optional('PLUGIN_CACHED_LOWWATER', "3145728", " + new numeric_define_optional('PLUGIN_CACHED_LOWWATER', "3145728", " Garbage collection parameter."); $properties["pear Cache MAXLIFETIME"] = -new numeric_define_optional('PLUGIN_CACHED_MAXLIFETIME', "2592000", " + new numeric_define_optional('PLUGIN_CACHED_MAXLIFETIME', "2592000", " Garbage collection parameter."); $properties["pear Cache MAXARGLEN"] = -new numeric_define_optional('PLUGIN_CACHED_MAXARGLEN', "1000", " + new numeric_define_optional('PLUGIN_CACHED_MAXARGLEN', "1000", " max. generated url length."); $properties["pear Cache FORCE_SYNCMAP"] = -new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP', - array('true' => 'Enabled', - 'false' => 'Disabled'), ""); + new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP', + array('true' => 'Enabled', + 'false' => 'Disabled'), ""); $properties["pear Cache IMGTYPES"] = -new list_define('PLUGIN_CACHED_IMGTYPES', "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm", " + new list_define('PLUGIN_CACHED_IMGTYPES', "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm", " Handle those image types via GD handles. Check your GD supported image types."); -$end = "\n".$SEPARATOR."\n"; +$end = "\n" . $SEPARATOR . "\n"; // performance hack text_from_dist("_MAGIC_CLOSE_FILE"); @@ -1687,7 +1735,8 @@ * e.g.: * $WikiNameRegexp = "value"; */ -class _variable { +class _variable +{ var $config_item_name; var $default_value; @@ -1695,41 +1744,44 @@ var $prefix; var $jscheck; - function _variable($config_item_name, $default_value='', $description = '', $jscheck = '') { + function _variable($config_item_name, $default_value = '', $description = '', $jscheck = '') + { $this->config_item_name = $config_item_name; if (!$description) $description = text_from_dist($config_item_name); $this->description = $description; if (defined($config_item_name) and !preg_match("/(selection|boolean)/", get_class($this)) - and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name)) + and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name) + ) $this->default_value = constant($config_item_name); // ignore given default value elseif ($config_item_name == $default_value) - $this->default_value = ''; - else + $this->default_value = ''; else $this->default_value = $default_value; $this->jscheck = $jscheck; if (preg_match("/variable/i", get_class($this))) $this->prefix = "\$"; elseif (preg_match("/ini_set/i", get_class($this))) - $this->prefix = "ini_get: "; - else + $this->prefix = "ini_get: "; else $this->prefix = ""; } - function _define($config_item_name, $default_value='', $description = '', $jscheck = '') { - $this->_variable($config_item_name, $default_value, $description, $jscheck); + function _define($config_item_name, $default_value = '', $description = '', $jscheck = '') + { + $this->_variable($config_item_name, $default_value, $description, $jscheck); } - function value() { - global $HTTP_POST_VARS; - if (isset($HTTP_POST_VARS[$this->config_item_name])) - return $HTTP_POST_VARS[$this->config_item_name]; - else - return $this->default_value; + function value() + { + global $HTTP_POST_VARS; + if (isset($HTTP_POST_VARS[$this->config_item_name])) + return $HTTP_POST_VARS[$this->config_item_name]; + else + return $this->default_value; } - function _config_format($value) { + function _config_format($value) + { return ''; $v = $this->get_config_item_name(); // handle arrays: a|b --> a['b'] @@ -1742,47 +1794,53 @@ return sprintf("%s = \"%s\"", $v, $value); } - function get_config_item_name() { + function get_config_item_name() + { return $this->config_item_name; } - function get_config_item_id() { + function get_config_item_id() + { return str_replace('|', '-', $this->config_item_name); } - function get_config_item_header() { - if (strchr($this->config_item_name,'|')) { - list($var,$param) = explode('|',$this->config_item_name); - return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />"; - } - elseif ($this->config_item_name[0] != '_') - return "<b>" . $this->prefix . $this->config_item_name . "</b><br />"; - else - return ''; + function get_config_item_header() + { + if (strchr($this->config_item_name, '|')) { + list($var, $param) = explode('|', $this->config_item_name); + return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />"; + } elseif ($this->config_item_name[0] != '_') + return "<b>" . $this->prefix . $this->config_item_name . "</b><br />"; else + return ''; } - function _get_description() { + function _get_description() + { return $this->description; } - function _get_config_line($posted_value) { + function _get_config_line($posted_value) + { return "\n" . $this->_config_format($posted_value); } - function get_config($posted_value) { + function get_config($posted_value) + { $d = stripHtml($this->_get_description()); - $d = str_replace("\n", "\n; ", $d) . $this->_get_config_line($posted_value) ."\n"; + $d = str_replace("\n", "\n; ", $d) . $this->_get_config_line($posted_value) . "\n"; return $d; } - function get_instructions($title) { + function get_instructions($title) + { global $tdwidth; $i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n"; return "<tr>\n<td width=\"$tdwidth\" class=\"instructions\">\n" . $i . "</td>\n"; } - function get_html() { - $size = strlen($this->default_value) > 45 ? 90 : 50; + function get_html() + { + $size = strlen($this->default_value) > 45 ? 90 : 50; return $this->get_config_item_header() . "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; @@ -1790,53 +1848,69 @@ } class unchangeable_variable -extends _variable { - function _config_format($value) { + extends _variable +{ + function _config_format($value) + { return ""; } + // function get_html() { return false; } - function get_html() { + function get_html() + { return $this->get_config_item_header() . - "<em>Not editable.</em>" . - "<pre>" . $this->default_value."</pre>"; + "<em>Not editable.</em>" . + "<pre>" . $this->default_value . "</pre>"; } - function _get_config_line($posted_value) { + + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; - return "${n}".$this->default_value; + return "${n}" . $this->default_value; } - function get_instructions($title) { + + function get_instructions($title) + { global $tdwidth; $i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n"; // $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>"; - return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n" - . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>'; + return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">' . "\n" . $i . "</td></tr>\n" + . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="' . $tdwidth . '"> </td>'; } } class unchangeable_define -extends unchangeable_variable { - function _get_config_line($posted_value) { + extends unchangeable_variable +{ + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if (!$posted_value) $posted_value = $this->default_value; - return "${n}".$this->_config_format($posted_value); + return "${n}" . $this->_config_format($posted_value); } - function _config_format($value) { + + function _config_format($value) + { return sprintf("%s = \"%s\"", $this->get_config_item_name(), $value); } } class unchangeable_ini_set -extends unchangeable_variable { - function _config_format($value) { + extends unchangeable_variable +{ + function _config_format($value) + { return ""; } } class _variable_selection -extends _variable { - function value() { + extends _variable +{ + function value() + { global $HTTP_POST_VARS; if (!empty($HTTP_POST_VARS[$this->config_item_name])) return $HTTP_POST_VARS[$this->config_item_name]; @@ -1845,7 +1919,9 @@ return $option; } } - function get_html() { + + function get_html() + { $output = $this->get_config_item_header(); $output .= '<select name="' . $this->get_config_item_name() . "\">\n"; /* The first option is the default */ @@ -1867,11 +1943,15 @@ } class _define -extends _variable { - function _config_format($value) { + extends _variable +{ + function _config_format($value) + { return sprintf("%s = \"%s\"", $this->get_config_item_name(), $value); } - function _get_config_line($posted_value) { + + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == '') @@ -1879,8 +1959,10 @@ else return "${n}" . $this->_config_format($posted_value); } - function get_html() { - $size = strlen($this->default_value) > 45 ? 90 : 50; + + function get_html() + { + $size = strlen($this->default_value) > 45 ? 90 : 50; return $this->get_config_item_header() . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name()) . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />" @@ -1889,15 +1971,16 @@ } class _define_commented -extends _define { - function _get_config_line($posted_value) { + extends _define +{ + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == $this->default_value) return "${n};" . $this->_config_format($posted_value); elseif ($posted_value == '') - return "${n};" . $this->_config_format(""); - else + return "${n};" . $this->_config_format(""); else return "${n}" . $this->_config_format($posted_value); } } @@ -1908,14 +1991,20 @@ * But we use _optional for config-default.ini options */ class _define_commented_optional -extends _define_commented { } + extends _define_commented +{ +} class _define_optional -extends _define { } + extends _define +{ +} class _define_notempty -extends _define { - function get_html() { + extends _define +{ + function get_html() + { $s = $this->get_config_item_header() . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . $this->default_value . "\" {$this->jscheck} />"; @@ -1927,32 +2016,39 @@ } class _variable_commented -extends _variable { - function _get_config_line($posted_value) { + extends _variable +{ + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == $this->default_value) return "${n};" . $this->_config_format($posted_value); elseif ($posted_value == '') - return "${n};" . $this->_config_format(""); - else + return "${n};" . $this->_config_format(""); else return "${n}" . $this->_config_format($posted_value); } } class numeric_define -extends _define { + extends _define +{ - function numeric_define($config_item_name, $default_value='', $description = '', $jscheck = '') { + function numeric_define($config_item_name, $default_value = '', $description = '', $jscheck = '') + { $this->_define($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' is not an integer.', '^[-+]?[0-9]+$', '" . $this->get_config_item_name() . "', this);\""; } - function _config_format($value) { + + function _config_format($value) + { //return sprintf("define('%s', %s);", $this->get_config_item_name(), $value); return sprintf("%s = %s", $this->get_config_item_name(), $value); } - function _get_config_line($posted_value) { + + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == '') @@ -1963,66 +2059,84 @@ } class numeric_define_optional -extends numeric_define {} + extends numeric_define +{ +} class numeric_define_commented -extends numeric_define { - function _get_config_line($posted_value) { + extends numeric_define +{ + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == $this->default_value) return "${n};" . $this->_config_format($posted_value); elseif ($posted_value == '') - return "${n};" . $this->_config_format('0'); - else + return "${n};" . $this->_config_format('0'); else return "${n}" . $this->_config_format($posted_value); } } class _define_selection -extends _variable_selection { - function _config_format($value) { + extends _variable_selection +{ + function _config_format($value) + { return sprintf("%s = %s", $this->get_config_item_name(), $value); } - function _get_config_line($posted_value) { + + function _get_config_line($posted_value) + { return _define::_get_config_line($posted_value); } - function get_html() { + + function get_html() + { return _variable_selection::get_html(); } } class _define_selection_optional -extends _define_selection { } + extends _define_selection +{ +} class _variable_selection_optional -extends _variable_selection { } + extends _variable_selection +{ +} class _define_selection_optional_commented -extends _define_selection_optional { - function _get_config_line($posted_value) { + extends _define_selection_optional +{ + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == $this->default_value) return "${n};" . $this->_config_format($posted_value); elseif ($posted_value == '') - return "${n};" . $this->_config_format(""); - else + return "${n};" . $this->_config_format(""); else return "${n}" . $this->_config_format($posted_value); } } class _define_password -extends _define { + extends _define +{ - function _define_password($config_item_name, $default_value='', $description = '', $jscheck = '') { - if ($config_item_name == $default_value) $default_value = ''; + function _define_password($config_item_name, $default_value = '', $description = '', $jscheck = '') + { + if ($config_item_name == $default_value) $default_value = ''; $this->_define($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\""; } - function _get_config_line($posted_value) { + + function _get_config_line($posted_value) + { if ($this->description) $n = "\n"; if ($posted_value == '') { @@ -2034,10 +2148,10 @@ } else { if (function_exists('crypt')) { $salt_length = max(CRYPT_SALT_LENGTH, - 2 * CRYPT_STD_DES, - 9 * CRYPT_EXT_DES, - 12 * CRYPT_MD5, - 16 * CRYPT_BLOWFISH); + 2 * CRYPT_STD_DES, + 9 * CRYPT_EXT_DES, + 12 * CRYPT_MD5, + 16 * CRYPT_BLOWFISH); // generate an encrypted password $crypt_pass = crypt($posted_value, rand_ascii($salt_length)); $p = "${n}" . $this->_config_format($crypt_pass); @@ -2051,21 +2165,26 @@ } } } - function get_html() { + + function get_html() + { return _variable_password::get_html(); } } class _define_password_optional -extends _define_password { + extends _define_password +{ - function _define_password_optional($config_item_name, $default_value='', $description = '', $jscheck = '') { - if ($config_item_name == $default_value) $default_value = ''; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |