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
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
S | M | T | W | T | F | S |
---|---|---|---|---|---|---|
1
|
2
(9) |
3
(5) |
4
(13) |
5
(5) |
6
(10) |
7
|
8
|
9
(6) |
10
|
11
(1) |
12
|
13
|
14
|
15
|
16
|
17
|
18
(2) |
19
|
20
|
21
|
22
|
23
|
24
|
25
(3) |
26
|
27
|
28
|
29
|
30
(1) |
31
(1) |
|
|
|
|
Revision: 9608 http://sourceforge.net/p/phpwiki/code/9608 Author: vargenau Date: 2015年03月05日 18:06:57 +0000 (2015年3月05日) Log Message: ----------- Update comments Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php trunk/lib/WikiDB/backend/PearDB_pgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015年03月05日 17:23:44 UTC (rev 9607) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015年03月05日 18:06:57 UTC (rev 9608) @@ -551,6 +551,9 @@ return new WikiDB_backend_PearDB_generic_iter($this, $result); } + /* + * Rename page in the database. + */ function rename_page($pagename, $to) { $dbh = &$this->_dbh; @@ -590,6 +593,9 @@ parent::increaseHitCount($page_prefix . $pagename); } + /* + * Serialize data + */ function _serialize($data) { return WikiDB_backend_PearDB::_serialize($data); @@ -714,16 +720,15 @@ * TODO: don't parse the words into nodes. rather replace "[ +]" with & and "-" with "!" and " or " with "|" * tsearch2 query language: @@ "word | word", "word & word", ! word * ~* '.*something that does not exist.*' + * + * phrase search for "history lesson": + * + * SELECT id FROM tab WHERE ts_idx_col @@ to_tsquery('history&lesson') + * AND text_col ~* '.*history\\s+lesson.*'; + * + * The full-text index will still be used, and the regex will be used to + * prune the results afterwards. */ - /* - phrase search for "history lesson": - - SELECT id FROM tab WHERE ts_idx_col @@ to_tsquery('history&lesson') - AND text_col ~* '.*history\\s+lesson.*'; - - The full-text index will still be used, and the regex will be used to - prune the results afterwards. - */ function _fulltext_match_clause($node) { $word = strtolower($node->word); Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2015年03月05日 17:23:44 UTC (rev 9607) +++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2015年03月05日 18:06:57 UTC (rev 9608) @@ -264,23 +264,6 @@ } /* - most used words: -select * from stat('select idxfti from version') order by ndoc desc, nentry desc, word limit 10; - word | ndoc | nentry ------------------+------+-------- - plugin | 112 | 418 - page | 85 | 446 - phpwikidocument | 62 | 62 - use | 48 | 169 - help | 46 | 96 - wiki | 44 | 102 - name | 43 | 131 - phpwiki | 42 | 173 - see | 42 | 69 - default | 39 | 124 - */ - - /* * use tsearch2. See schemas/psql-tsearch2.sql and /usr/share/postgresql/contrib/tsearch2.sql * TODO: don't parse the words into nodes. rather replace "[ +]" with & and "-" with "!" and " or " with "|" * tsearch2 query language: @@ "word | word", "word & word", ! word This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9607 http://sourceforge.net/p/phpwiki/code/9607 Author: vargenau Date: 2015年03月05日 17:23:44 +0000 (2015年3月05日) Log Message: ----------- Less WantedPages Modified Paths: -------------- trunk/pgsrc/DebugAuthInfo trunk/pgsrc/Help%2FListPagesPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/ReleaseNotes Modified: trunk/pgsrc/DebugAuthInfo =================================================================== --- trunk/pgsrc/DebugAuthInfo 2015年03月05日 16:17:17 UTC (rev 9606) +++ trunk/pgsrc/DebugAuthInfo 2015年03月05日 17:23:44 UTC (rev 9607) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Thu, 5 Mar 2015 18:21:45 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=DebugAuthInfo; @@ -10,4 +10,4 @@ <<DebugAuthInfo>> ---- -[[CategorActionPage]] +[[CategoryActionPage]] Modified: trunk/pgsrc/Help%2FListPagesPlugin =================================================================== --- trunk/pgsrc/Help%2FListPagesPlugin 2015年03月05日 16:17:17 UTC (rev 9606) +++ trunk/pgsrc/Help%2FListPagesPlugin 2015年03月05日 17:23:44 UTC (rev 9607) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Thu, 5 Mar 2015 18:21:45 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FListPagesPlugin; @@ -10,7 +10,7 @@ [[Help:PageList|PageList]] options, mainly used for a wikilens theme to display ratings info and recommendations. -It can also be used with the [[PluginList]] method to list a set of pages generated by +It can also be used with the ~PluginList method to list a set of pages generated by another plugin, and/or to exclude a set of pages generated by another plugin. See the [[Help:PageList|PageList]] options. Modified: trunk/pgsrc/Help%2FWikiPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiPlugin 2015年03月05日 16:17:17 UTC (rev 9606) +++ trunk/pgsrc/Help%2FWikiPlugin 2015年03月05日 17:23:44 UTC (rev 9607) @@ -1,4 +1,4 @@ -Date: Thu, 5 Mar 2015 17:15:41 +0000 +Date: Thu, 5 Mar 2015 18:21:45 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPlugin; @@ -92,7 +92,6 @@ *exclude* and *pages* accept a list of pages. Either as comma-separated list, supporting glob-style wildcards, or via the ##<!plugin-list pluginname ~[args~] !>## invocation syntax, where pluginname might be any plugin returning a [[Help:PageList|PageList]]. -See PluginList. Since most plugins return a ~PageList, this ~PageList is also a common input parameter for other plugins, actions or formats. Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2015年03月05日 16:17:17 UTC (rev 9606) +++ trunk/pgsrc/ReleaseNotes 2015年03月05日 17:23:44 UTC (rev 9607) @@ -1,4 +1,4 @@ -Date: Thu, 5 Mar 2015 17:15:41 +0000 +Date: Thu, 5 Mar 2015 18:21:45 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -354,7 +354,7 @@ * added lib/~XmlRpcClient, xmlrpc methods to lib/~HttpClient and acdropdown.js. JSON not yet. * created Help/~*Plugin stubs for *ALL* plugins in pgsrc * added a new _DEBUG_REMOTE flag to debug into remote sessions (xmlrpc, ajax, ...) -* added WikiDB::linkSearch and backend/dumb/~LinkSearchIter.php. Mainly for ~SemanticSearch, +* added ~WikiDB::~linkSearch and backend/dumb/~LinkSearchIter.php. Mainly for ~SemanticSearch, and LinkSearch, but can be used for ~SemanticSearchAdvanced (combined queries as <ask>) and BackLinks et al also. * added Calendar display_weeknum argument @@ -389,7 +389,7 @@ * simplify messages for translators * added ~ImageTile.php * added tsearch2 to doc/INSTALL.pgsql -* added basepage to ~Cached_WikiLink::~asXML for subpages within ~CreateTOC +* added basepage to ~Cached_~WikiLink::~asXML for subpages within ~CreateTOC * print filename on dba access error * use bind_textdomain_codeset. bug #1480077 (Kai Krakow) * make ~TextSearchQuery->_stoplist localizable and overridable within config.ini This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9606 http://sourceforge.net/p/phpwiki/code/9606 Author: vargenau Date: 2015年03月05日 16:17:17 +0000 (2015年3月05日) Log Message: ----------- Add ~ to have less WantedPages Modified Paths: -------------- trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/ReleaseNotes Modified: trunk/pgsrc/Help%2FWikiPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiPlugin 2015年03月05日 10:58:57 UTC (rev 9605) +++ trunk/pgsrc/Help%2FWikiPlugin 2015年03月05日 16:17:17 UTC (rev 9606) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Thu, 5 Mar 2015 17:15:41 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPlugin; @@ -150,7 +150,7 @@ getAlt(), getImageType(), embedMap(), embedImg(), embedObject() -See the config.ini PLUGIN_CACHED_* settings and WikiPluginCached +See the config.ini PLUGIN_CACHED_* settings and ~WikiPluginCached === Action Pages === Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2015年03月05日 10:58:57 UTC (rev 9605) +++ trunk/pgsrc/ReleaseNotes 2015年03月05日 16:17:17 UTC (rev 9606) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Thu, 5 Mar 2015 17:15:41 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -39,7 +39,7 @@ * remove ~FrameInclude plugin (frames are not supported in HTML 5) * sort tables with [[http://tablesorter.com|tablesorter jQuery plugin]] instead of sortable.js * fix Bug#636 Recursive include is not trapped -* fix Bug#647 undefined method WikiDB_backend_dba::WikiDB_backend_dbaBase +* fix Bug#647 undefined method ~WikiDB_backend_dba::~WikiDB_backend_dbaBase * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe * fix Bug#607 BackLinks do not work inside a [[Help:RichTablePlugin|RichTable]] * fix Bug#646 Wrong number of links in BackLinks @@ -102,7 +102,7 @@ * ensure ending uploads slash even on user provided UPLOAD constants. Fixes plugin/~UpLoad * stabilize Comment. substring search for basepages, do not tokenize. * fix Bug#1792170 Handle " ( " or "(test" without closing ")" as plain word. Allow single string token "0" -* fix Bug#1752172 undefined method ~TextSearchQuery_node_or::_sql_quote() +* fix Bug#1752172 undefined method ~TextSearchQuery~_node_or::~_sql_quote() * dba: fix sorting for empty mtime field * ~LdapSearch: fix layout and logic * ~FileInfo: fix Upload: links @@ -303,7 +303,7 @@ * updated most template files for harmonisation * changed default ~LiveSearch method in search.tmpl from url to xmlrpc. faster and less hackish. * fixed all templates with missing revision check. can be false. -* rewrote and redefined WikiDB::listRelations. list only all relations as array. +* rewrote and redefined ~WikiDB::~listRelations. list only all relations as array. * changed Semantic attribute syntax from ":-" to ":=" (relevant to cvs users only) * change ~TextSearchQuery handling of regex=pcre: plain string, no parsing at all, detect and apply modifiers. @@ -325,8 +325,8 @@ * new wysiwyg_editor feature by Jean-Nicolas GEREONE and Sabri LABBENE (experimental) * added postgresql tsearch2 support * new experimental flatfile backend: readable page source files (experimental) -* added new xmlrpc and SOAP methods: listPlugins, getPluginSynopsis, mailPasswordToUser, - getUploadedFileInfo, listRelations, callPlugin, linkSearch +* added new xmlrpc and SOAP methods: ~listPlugins, ~getPluginSynopsis, ~mailPasswordToUser, + ~getUploadedFileInfo, ~listRelations, ~callPlugin, ~linkSearch * new plugins: ~SemanticSearch, ~SemanticRelations, ~LinkSearch, ~ListRelations, ~FileInfo, ~BoxRight, ~PasswordReset, ~WatchPage, ~SpellCheck, ~SearchHighlight, AsciiSVG @@ -389,7 +389,7 @@ * simplify messages for translators * added ~ImageTile.php * added tsearch2 to doc/INSTALL.pgsql -* added basepage to Cached_WikiLink::asXML for subpages within ~CreateTOC +* added basepage to ~Cached_WikiLink::~asXML for subpages within ~CreateTOC * print filename on dba access error * use bind_textdomain_codeset. bug #1480077 (Kai Krakow) * make ~TextSearchQuery->_stoplist localizable and overridable within config.ini This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9605 http://sourceforge.net/p/phpwiki/code/9605 Author: vargenau Date: 2015年03月05日 10:58:57 +0000 (2015年3月05日) Log Message: ----------- Better layout Modified Paths: -------------- trunk/pgsrc/Help%2FPredefinedIcons Modified: trunk/pgsrc/Help%2FPredefinedIcons =================================================================== --- trunk/pgsrc/Help%2FPredefinedIcons 2015年03月04日 16:44:15 UTC (rev 9604) +++ trunk/pgsrc/Help%2FPredefinedIcons 2015年03月05日 10:58:57 UTC (rev 9605) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Thu, 5 Mar 2015 11:56:55 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FPredefinedIcons; @@ -10,14 +10,13 @@ The following icons are available: -|= Notation | ##~{{:)}}## | ##~{{:(}}## | ##~{{:P}}## | ##~{{:D}}## | ##~{{;)}}## | ##~{{(y)}}## | ##~{{(n)}}## | ##~{{(i)}}## | ##~{{(/)}}## | ##~{{(x)}}## | ##~{{(!)}}## -|= Image | {{:)}} | {{:(}} | {{:P}} | {{:D}} | {{;)}} | {{(y)}} | {{(n)}} | {{(i)}} | {{(/)}} | {{(x)}} | {{(!)}} +|= Notation | ##~{{:)}}## | ##~{{:(}}## | ##~{{:P}}## | ##~{{:D}}## | ##~{{;)}}## | ##~{{(y)}}## | ##~{{(n)}}## | +|= Image | {{:)}} | {{:(}} | {{:P}} | {{:D}} | {{;)}} | {{(y)}} | {{(n)}} | +|= Notation | ##~{{(i)}}## | ##~{{(/)}}## | ##~{{(x)}}## | ##~{{(!)}}## | ##~{{(+)}}## | ##~{{(-)}}## | ##~{{(?)}}## | +|= Image | {{(i)}} | {{(/)}} | {{(x)}} | {{(!)}} | {{(+)}} | {{(-)}} | {{(?)}} | +|= Notation | ##~{{(on)}}## | ##~{{(off)}}## | ##~{{(*)}}## | ##~{{(*r)}}## | ##~{{(*g)}}## | ##~{{(*b)}}## | ##~{{(*y)}}## | +|= Image | {{(on)}} | {{(off)}} | {{(*)}} | {{(*r)}} | {{(*g)}} | {{(*b)}} | {{(*y)}} | ------ - -|= Notation | ##~{{(+)}}## | ##~{{(-)}}## | ##~{{(?)}}## | ##~{{(on)}}## | ##~{{(off)}}## | ##~{{(*)}}## | ##~{{(*r)}}## | ##~{{(*g)}}## | ##~{{(*b)}}## | ##~{{(*y)}}## -|= Image | {{(+)}} | {{(-)}} | {{(?)}} | {{(on)}} | {{(off)}} | {{(*)}} | {{(*r)}} | {{(*g)}} | {{(*b)}} | {{(*y)}} - <noinclude> ---- [[PhpWikiDocumentation]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9604 http://sourceforge.net/p/phpwiki/code/9604 Author: vargenau Date: 2015年03月04日 16:44:15 +0000 (2015年3月04日) Log Message: ----------- Create branch release-1.5.3 Added Paths: ----------- branches/release-1.5.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9603 http://sourceforge.net/p/phpwiki/code/9603 Author: vargenau Date: 2015年03月04日 16:43:54 +0000 (2015年3月04日) Log Message: ----------- Create tag release-1.5.3 Added Paths: ----------- tags/release-1.5.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9602 http://sourceforge.net/p/phpwiki/code/9602 Author: vargenau Date: 2015年03月04日 16:17:29 +0000 (2015年3月04日) Log Message: ----------- RateIt text is too small Modified Paths: -------------- trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2015年03月04日 16:12:24 UTC (rev 9601) +++ trunk/themes/fusionforge/fusionforge.css 2015年03月04日 16:17:29 UTC (rev 9602) @@ -1325,7 +1325,6 @@ /* RateIt plugin ====================================================== */ .rateit { - font-size: 60%; font-weight: bold; vertical-align: middle; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9601 http://sourceforge.net/p/phpwiki/code/9601 Author: vargenau Date: 2015年03月04日 16:12:24 +0000 (2015年3月04日) Log Message: ----------- Use smart quotes Modified Paths: -------------- trunk/pgsrc/Help%2FIncludePagePlugin Modified: trunk/pgsrc/Help%2FIncludePagePlugin =================================================================== --- trunk/pgsrc/Help%2FIncludePagePlugin 2015年03月04日 16:07:32 UTC (rev 9600) +++ trunk/pgsrc/Help%2FIncludePagePlugin 2015年03月04日 16:12:24 UTC (rev 9601) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Wed, 4 Mar 2015 17:11:58 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FIncludePagePlugin; @@ -6,7 +6,7 @@ charset=UTF-8 Content-Transfer-Encoding: binary -The **~IncludePage** [[Help:WikiPlugin|plugin]] will "include" other pages in this wiki. In the language of hypertext this is called //transclusion//. +The **~IncludePage** [[Help:WikiPlugin|plugin]] will "include" other pages in this wiki. In the language of hypertext this is called //transclusion//. The pages will render in distinct tables. == Usage == This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9600 http://sourceforge.net/p/phpwiki/code/9600 Author: vargenau Date: 2015年03月04日 16:07:32 +0000 (2015年3月04日) Log Message: ----------- Extend scope of global $request Modified Paths: -------------- trunk/lib/WikiUser.php Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2015年03月04日 16:01:30 UTC (rev 9599) +++ trunk/lib/WikiUser.php 2015年03月04日 16:07:32 UTC (rev 9600) @@ -587,13 +587,13 @@ extract($args); $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level)); + /** + * @var WikiRequest $request + */ + global $request; + if ($logout) { // Log out if (LOGIN_LOG and is_writeable(LOGIN_LOG)) { - /** - * @var WikiRequest $request - */ - global $request; - $zone_offset = Request_AccessLogEntry::_zone_offset(); $ncsa_time = date("d/M/Y:H:i:s", time()); $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"', @@ -631,11 +631,6 @@ $authlevel = $this->checkPass($passwd === false ? '' : $passwd); if (LOGIN_LOG and is_writeable(LOGIN_LOG)) { - /** - * @var WikiRequest $request - */ - global $request; - $zone_offset = Request_AccessLogEntry::_zone_offset(); $ncsa_time = date("d/M/Y:H:i:s", time()); $manglepasswd = $passwd; @@ -697,7 +692,6 @@ $this->_level = $authlevel; return $this; } - } /** @@ -826,8 +820,6 @@ // prefs should be stored besides the session in the homepagehandle or in a db. $request->setCookieVar(getCookieName(), $this->_userid, COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN); - //$request->setCookieVar(WIKI_NAME, array('userid' => $prefs->get('userid')), - // COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN); } } if (is_object($prefs)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9599 http://sourceforge.net/p/phpwiki/code/9599 Author: vargenau Date: 2015年03月04日 16:01:30 +0000 (2015年3月04日) Log Message: ----------- Remove commented code Modified Paths: -------------- trunk/lib/prepend.php Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2015年03月04日 15:59:35 UTC (rev 9598) +++ trunk/lib/prepend.php 2015年03月04日 16:01:30 UTC (rev 9599) @@ -7,18 +7,6 @@ // see lib/stdlib.php: phpwiki_version() define('PHPWIKI_VERSION', '1.5.3'); -/** PHP5 deprecated old-style globals if !(bool)ini_get('register_long_arrays'). - * See Bug #1180115 - * We want to work with those old ones instead of the new superglobals, - * for easier coding. - */ -/* -foreach (array('SERVER','REQUEST','GET','POST','SESSION','ENV','COOKIE') as $k) { - if (!isset($GLOBALS['HTTP_'.$k.'_VARS']) and isset($GLOBALS['_'.$k])) { - $GLOBALS['HTTP_'.$k.'_VARS'] =& $GLOBALS['_'.$k]; - } -} -*/ // A new php-5.1.x feature: Turn off php-5.1.x auto_globals_jit = On, or use this mess below. if (empty($GLOBALS['HTTP_SERVER_VARS'])) { $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER; @@ -53,14 +41,6 @@ } if (defined('DEBUG') and (DEBUG & 32) and extension_loaded("apd")) { apd_set_pprof_trace(); - /* FUNCTION_TRACE 1 - ARGS_TRACE 2 - ASSIGNMENT_TRACE 4 - STATEMENT_TRACE 8 - MEMORY_TRACE 16 - TIMING_TRACE 32 - SUMMARY_TRACE 64 */ - //apd_set_session_trace(99); } // Used for debugging purposes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9598 http://sourceforge.net/p/phpwiki/code/9598 Author: vargenau Date: 2015年03月04日 15:59:35 +0000 (2015年3月04日) Log Message: ----------- Remove commented code Modified Paths: -------------- trunk/lib/ErrorManager.php Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2015年03月04日 15:49:28 UTC (rev 9597) +++ trunk/lib/ErrorManager.php 2015年03月04日 15:59:35 UTC (rev 9598) @@ -2,19 +2,8 @@ if (isset($GLOBALS['ErrorManager'])) return; -// php5: ignore E_STRICT (var warnings) -/* -if (defined('E_STRICT') - and (E_ALL & E_STRICT) - and (error_reporting() & E_STRICT)) { - echo " errormgr: error_reporting=", error_reporting(); - echo "\nplease fix that in your php.ini!"; - error_reporting(E_ALL & ~E_STRICT); -} -*/ define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & (~E_DEPRECATED)); -define ('EM_WARNING_ERRORS', - E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | E_DEPRECATED); +define ('EM_WARNING_ERRORS', E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | E_DEPRECATED); define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE); /* It is recommended to leave assertions on. @@ -82,7 +71,6 @@ PrintXML($this->_flush_errors($newmask)); else echo($this->_flush_errors($newmask)); - } /** @@ -304,7 +292,6 @@ private function _die($error) { global $WikiTheme; - //echo "\n\n<html><body>"; $error->printXML(); PrintXML($this->_flush_errors()); if ($this->_fatal_handler) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9597 http://sourceforge.net/p/phpwiki/code/9597 Author: vargenau Date: 2015年03月04日 15:49:28 +0000 (2015年3月04日) Log Message: ----------- Remove obsolete comment Modified Paths: -------------- trunk/pgsrc/Help%2FRateItPlugin Modified: trunk/pgsrc/Help%2FRateItPlugin =================================================================== --- trunk/pgsrc/Help%2FRateItPlugin 2015年03月04日 15:40:05 UTC (rev 9596) +++ trunk/pgsrc/Help%2FRateItPlugin 2015年03月04日 15:49:28 UTC (rev 9597) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Wed, 4 Mar 2015 16:49:04 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FRateItPlugin; @@ -120,9 +120,6 @@ == See Also == * [[Help:UserRatingsPlugin]] -== To do == -* finish mysuggest.c (external engine with data from mysql) - <noinclude> ---- [[PhpWikiDocumentation]] [[CategoryWikiPlugin]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9596 http://sourceforge.net/p/phpwiki/code/9596 Author: vargenau Date: 2015年03月04日 15:40:05 +0000 (2015年3月04日) Log Message: ----------- Remove obsolete comment Modified Paths: -------------- trunk/pgsrc/Help%2FLinkIcons Modified: trunk/pgsrc/Help%2FLinkIcons =================================================================== --- trunk/pgsrc/Help%2FLinkIcons 2015年03月04日 13:51:29 UTC (rev 9595) +++ trunk/pgsrc/Help%2FLinkIcons 2015年03月04日 15:40:05 UTC (rev 9596) @@ -1,4 +1,4 @@ -Date: Wed, 4 Mar 2015 14:20:06 +0000 +Date: Wed, 4 Mar 2015 16:39:26 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Help%2FLinkIcons; @@ -16,11 +16,6 @@ | {{/themes/default/images/mailto.png}} | mailto link | {{/themes/default/images/ftp.png}} | ftp link -**Note**: Some of the default icons use the alpha channel feature of -the [[http://www.libpng.org/pub/png/png-sitemap.html|PNG]] image format -for smooth rendering on any page color or textured background. Older -browsers may not display all the images properly. - == Examples == The following examples will display with the above link icons only if This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9595 http://sourceforge.net/p/phpwiki/code/9595 Author: vargenau Date: 2015年03月04日 13:51:29 +0000 (2015年3月04日) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/lib/WikiDB/backend/dbaBase.php Modified: trunk/lib/WikiDB/backend/dbaBase.php =================================================================== --- trunk/lib/WikiDB/backend/dbaBase.php 2015年03月04日 13:28:25 UTC (rev 9594) +++ trunk/lib/WikiDB/backend/dbaBase.php 2015年03月04日 13:51:29 UTC (rev 9595) @@ -179,7 +179,16 @@ return false; } - //check $want_content + /** + * Get version data. + * + * @param string $pagename Name of the page + * @param int $version Which version to get + * @param bool $want_content Do we need content? + * + * @return array hash The version data, or false if specified version does not + * exist. + */ function get_versiondata($pagename, $version, $want_content = false) { $data = $this->_versiondb->get((int)$version . ":$pagename"); @@ -196,7 +205,7 @@ } } - /** + /* * Can be undone and is seen in RecentChanges. * See backend.php */ @@ -225,7 +234,7 @@ $this->set_links($pagename, array()); } - /** + /* * Completely delete all page revisions from the database. */ function purge_page($pagename) @@ -277,7 +286,7 @@ return true; } - /** + /* * Delete an old revision of a page. */ function delete_versiondata($pagename, $version) @@ -302,7 +311,7 @@ } } - /** + /* * Create a new revision of a page. */ function set_versiondata($pagename, $version, $data) @@ -416,7 +425,7 @@ )); } - /** + /* * @return array of all linkrelations * Faster than the dumb WikiDB method. */ @@ -460,14 +469,14 @@ * the link key, we iterate here directly over the * linkdb and check the pagematch there. * - * @param $pages object A TextSearchQuery object for the pagename filter. - * @param $query object A SearchQuery object (Text or Numeric) for the linkvalues, + * @param object$pages A TextSearchQuery object for the pagename filter. + * @param object $query A SearchQuery object (Text or Numeric) for the linkvalues, * linkto, linkfrom (=backlink), relation or attribute values. - * @param $linktype string One of the 4 linktypes "linkto", + * @param string $linktype One of the 4 linktypes "linkto", * "linkfrom" (=backlink), "relation" or "attribute". * Maybe also "relation+attribute" for the advanced search. - * @param $relation object A TextSearchQuery for the linkname or false. - * @param $options array Currently ignored. hash of sortby, limit, exclude. + * @param bool|object $relation A TextSearchQuery for the linkname or false. + * @param array $options Currently ignored. hash of sortby, limit, exclude. * @return object A WikiDB_backend_iterator. * @see WikiDB::linkSearch */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9594 http://sourceforge.net/p/phpwiki/code/9594 Author: vargenau Date: 2015年03月04日 13:28:25 +0000 (2015年3月04日) Log Message: ----------- Set PhpWiki version to 1.5.3 Modified Paths: -------------- trunk/INSTALL trunk/Makefile trunk/config/phpwiki.spec trunk/lib/prepend.php trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/de/pgsrc/%C3%84hnlicheSeiten trunk/locale/de/pgsrc/AlleBenutzer trunk/locale/de/pgsrc/AlleSeiten trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir trunk/locale/de/pgsrc/BackLinks trunk/locale/de/pgsrc/BenutzerEinstellungen trunk/locale/de/pgsrc/DebugAuthInfo trunk/locale/de/pgsrc/DebugGruppenInfo trunk/locale/de/pgsrc/DebugInfo trunk/locale/de/pgsrc/EditiereText trunk/locale/de/pgsrc/Einstellungen trunk/locale/de/pgsrc/FuzzySuche trunk/locale/de/pgsrc/G%C3%A4steBuch trunk/locale/de/pgsrc/GaesteBuch trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen trunk/locale/de/pgsrc/GleicheSeiten trunk/locale/de/pgsrc/Hilfe trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin trunk/locale/de/pgsrc/Hilfe%2FGuterStil trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow trunk/locale/de/pgsrc/Hilfe%2FPhpWiki trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin trunk/locale/de/pgsrc/Hilfe%2FWabiSabi trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb trunk/locale/de/pgsrc/HochLaden trunk/locale/de/pgsrc/InterWikiListe trunk/locale/de/pgsrc/KategorieAktionSeite trunk/locale/de/pgsrc/KategorieKategorie trunk/locale/de/pgsrc/KategorieWikiPlugin trunk/locale/de/pgsrc/LinkSuche trunk/locale/de/pgsrc/ListeRelationen trunk/locale/de/pgsrc/ListeSeiten trunk/locale/de/pgsrc/MeistBesucht trunk/locale/de/pgsrc/ModerierteSeite trunk/locale/de/pgsrc/NeueSeite trunk/locale/de/pgsrc/Neueste%C3%84nderungen trunk/locale/de/pgsrc/NeuesteSeiten trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen trunk/locale/de/pgsrc/PhpWikiDokumentation trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen trunk/locale/de/pgsrc/PhpWikiUmfrage trunk/locale/de/pgsrc/SandKasten trunk/locale/de/pgsrc/SandKiste trunk/locale/de/pgsrc/SeiteBeobarten trunk/locale/de/pgsrc/SeiteFinden trunk/locale/de/pgsrc/SeiteSpeichern trunk/locale/de/pgsrc/SeitenErzeugen trunk/locale/de/pgsrc/SeitenInfo trunk/locale/de/pgsrc/SeitenProtokoll trunk/locale/de/pgsrc/SemantischeRelationen trunk/locale/de/pgsrc/SemantischeSuche trunk/locale/de/pgsrc/StartSeite trunk/locale/de/pgsrc/StartSeiteAlias trunk/locale/de/pgsrc/TitelSuche trunk/locale/de/pgsrc/UpLoad trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen trunk/locale/de/pgsrc/VerwaisteSeiten trunk/locale/de/pgsrc/VolltextSuche trunk/locale/de/pgsrc/Vorlage%2FBeispiel trunk/locale/de/pgsrc/WerIstOnline trunk/locale/de/pgsrc/WikiAdminAuswahl trunk/locale/de/pgsrc/WunschZettelSeiten trunk/locale/de/pgsrc/ZufallsSeite trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/es/pgsrc/Ayuda trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto trunk/locale/es/pgsrc/Ayuda%2FKBrown trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica trunk/locale/es/pgsrc/Ayuda%2FPhpWiki trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto trunk/locale/es/pgsrc/Ayuda%2FWabiSabi trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb trunk/locale/es/pgsrc/BuscarP%C3%A1gina trunk/locale/es/pgsrc/CajaDeArena trunk/locale/es/pgsrc/CambiosRecientes trunk/locale/es/pgsrc/MasPopulares trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal trunk/locale/es/pgsrc/TodasLasPaginas trunk/locale/es/pgsrc/VisitantesRecientes trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl trunk/locale/fr/pgsrc/Aide trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien trunk/locale/fr/pgsrc/Aide%2FInterWiki trunk/locale/fr/pgsrc/Aide%2FLienGoogle trunk/locale/fr/pgsrc/Aide%2FPhpWiki trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp trunk/locale/fr/pgsrc/Aide%2FPluginCommenter trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne trunk/locale/fr/pgsrc/Aide%2FPluginRedirection trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache trunk/locale/fr/pgsrc/Aide%2FPluginWiki trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead trunk/locale/fr/pgsrc/Aide%2FStyleCorrect trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki trunk/locale/fr/pgsrc/Aide%2FWabiSabi trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb trunk/locale/fr/pgsrc/AliasAccueil trunk/locale/fr/pgsrc/Bac%C3%80Sable trunk/locale/fr/pgsrc/CarteInterWiki trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s trunk/locale/fr/pgsrc/ChercherUnePage trunk/locale/fr/pgsrc/ClassezLa trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier trunk/locale/fr/pgsrc/Derni%C3%A8resModifs trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes trunk/locale/fr/pgsrc/DocumentationDePhpWiki trunk/locale/fr/pgsrc/GestionDesPlugins trunk/locale/fr/pgsrc/HistoriqueDeLaPage trunk/locale/fr/pgsrc/InfosAuthentification trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage trunk/locale/fr/pgsrc/InfosSurLaPage trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es trunk/locale/fr/pgsrc/ManuelPhpWiki trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki trunk/locale/fr/pgsrc/NotesDeVersion trunk/locale/fr/pgsrc/PageAccueil trunk/locale/fr/pgsrc/PageAl%C3%A9atoire trunk/locale/fr/pgsrc/PagesFloues trunk/locale/fr/pgsrc/PagesOrphelines trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es trunk/locale/fr/pgsrc/PagesSemblables trunk/locale/fr/pgsrc/PierrickMeignen trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs trunk/locale/fr/pgsrc/QuiEstEnLigne trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage trunk/locale/fr/pgsrc/R%C3%A9troLiens trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral trunk/locale/fr/pgsrc/RechercheInterWiki trunk/locale/fr/pgsrc/RechercheParTitre trunk/locale/fr/pgsrc/SommaireDuProjet trunk/locale/fr/pgsrc/SondagePhpWiki trunk/locale/fr/pgsrc/Suivre trunk/locale/fr/pgsrc/TousLesUtilisateurs trunk/locale/fr/pgsrc/ToutesLesPages trunk/locale/fr/pgsrc/TraduireUnTexte trunk/locale/fr/pgsrc/VersionsR%C3%A9centes trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/it/pgsrc/Aiuto trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine trunk/locale/it/pgsrc/Aiuto%2FBuonStile trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto trunk/locale/it/pgsrc/Aiuto%2FPhpWiki trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento trunk/locale/it/pgsrc/Aiuto%2FWabiSabi trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi trunk/locale/it/pgsrc/CambiamentiRecenti trunk/locale/it/pgsrc/FuzzyPages trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/it/pgsrc/PaginaDiProva trunk/locale/it/pgsrc/PaginaPrincipale trunk/locale/it/pgsrc/PiuPopolari trunk/locale/it/pgsrc/RicercaDelTesto trunk/locale/it/pgsrc/RicercaSuTutto trunk/locale/it/pgsrc/ScatolaDiSabbia trunk/locale/it/pgsrc/SteveWainstead trunk/locale/it/pgsrc/TrovaPagina trunk/locale/it/pgsrc/TutteLePagine trunk/locale/it/pgsrc/VisitatoriRecenti trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2 trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8 trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/nl/pgsrc/Help trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren trunk/locale/nl/pgsrc/Help%2FGoedeStijl trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen trunk/locale/nl/pgsrc/Help%2FPhpWiki trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs trunk/locale/nl/pgsrc/Help%2FVeranderTekst trunk/locale/nl/pgsrc/Help%2FWabiSabi trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb trunk/locale/nl/pgsrc/MeestBezocht trunk/locale/nl/pgsrc/PhpWikiBeheer trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder trunk/locale/nl/pgsrc/RecenteVeranderingen trunk/locale/nl/pgsrc/ThuisPagina trunk/locale/nl/pgsrc/UitgaveNoten trunk/locale/nl/pgsrc/ZandBak trunk/locale/nl/pgsrc/ZoekPagina 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/sv/pgsrc/Framsida trunk/locale/sv/pgsrc/Hj%C3%A4lp trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb trunk/locale/sv/pgsrc/MestPopul%C3%A4r trunk/locale/sv/pgsrc/PhpWikiAdministration trunk/locale/sv/pgsrc/S%C3%B6kEfterSida trunk/locale/sv/pgsrc/Sandl%C3%A5dan trunk/locale/sv/pgsrc/Senaste%C3%84ndringar trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81 trunk/locale/zh/pgsrc/AllPages trunk/locale/zh/pgsrc/AllUsers trunk/locale/zh/pgsrc/BackLinks trunk/locale/zh/pgsrc/DebugInfo trunk/locale/zh/pgsrc/FindPage trunk/locale/zh/pgsrc/FullRecentChanges trunk/locale/zh/pgsrc/FullTextSearch trunk/locale/zh/pgsrc/FuzzyPages trunk/locale/zh/pgsrc/Help trunk/locale/zh/pgsrc/Help%2FAddingPages trunk/locale/zh/pgsrc/Help%2FCalendarPlugin trunk/locale/zh/pgsrc/Help%2FCommentPlugin trunk/locale/zh/pgsrc/Help%2FEditText trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin trunk/locale/zh/pgsrc/Help%2FHowToUseWiki trunk/locale/zh/pgsrc/Help%2FInterWiki trunk/locale/zh/pgsrc/Help%2FLinkIcons trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin trunk/locale/zh/pgsrc/Help%2FPhpWiki trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin trunk/locale/zh/pgsrc/Help%2FTranscludePlugin trunk/locale/zh/pgsrc/Help%2FWikiPlugin trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb trunk/locale/zh/pgsrc/HomePage trunk/locale/zh/pgsrc/HomePageAlias trunk/locale/zh/pgsrc/InterWikiMap trunk/locale/zh/pgsrc/InterWikiSearch trunk/locale/zh/pgsrc/LikePages trunk/locale/zh/pgsrc/OrphanedPages trunk/locale/zh/pgsrc/PageDump trunk/locale/zh/pgsrc/PhpWikiAdministration trunk/locale/zh/pgsrc/RandomPage trunk/locale/zh/pgsrc/RecentChanges trunk/locale/zh/pgsrc/RecentEdits trunk/locale/zh/pgsrc/RecentVisitors trunk/locale/zh/pgsrc/SandBox trunk/locale/zh/pgsrc/TitleSearch trunk/locale/zh/pgsrc/UpLoad trunk/locale/zh/pgsrc/UserPreferences trunk/locale/zh/pgsrc/WantedPages trunk/pgsrc/AllPages trunk/pgsrc/AllPagesByAcl trunk/pgsrc/AllPagesCreatedByMe trunk/pgsrc/AllPagesLastEditedByMe trunk/pgsrc/AllPagesOwnedByMe trunk/pgsrc/AllUserPages trunk/pgsrc/AllUsers trunk/pgsrc/AppendText trunk/pgsrc/AuthorHistory trunk/pgsrc/BackLinks trunk/pgsrc/BlogArchives trunk/pgsrc/BlogJournal trunk/pgsrc/CategoryActionPage trunk/pgsrc/CategoryCategory trunk/pgsrc/CategoryGroup trunk/pgsrc/CategoryHomePages trunk/pgsrc/CategoryWikiPlugin trunk/pgsrc/Copyrights trunk/pgsrc/CreatePage trunk/pgsrc/DebugAuthInfo trunk/pgsrc/DebugBackendInfo trunk/pgsrc/DebugGroupInfo trunk/pgsrc/DebugInfo trunk/pgsrc/EditMetaData trunk/pgsrc/FindPage trunk/pgsrc/FullRecentChanges trunk/pgsrc/FullTextSearch trunk/pgsrc/FuzzyPages trunk/pgsrc/GeneralDisclaimer trunk/pgsrc/Help trunk/pgsrc/Help%2FActionPage trunk/pgsrc/Help%2FAddCommentPlugin trunk/pgsrc/Help%2FAddingPages trunk/pgsrc/Help%2FAdobe%20Flash trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users trunk/pgsrc/Help%2FAllPagesPlugin trunk/pgsrc/Help%2FAllUsersPlugin trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin trunk/pgsrc/Help%2FAppendTextPlugin trunk/pgsrc/Help%2FAsciiMathPlugin trunk/pgsrc/Help%2FAsciiSVGPlugin trunk/pgsrc/Help%2FAtomFeedPlugin trunk/pgsrc/Help%2FAuthorHistoryPlugin trunk/pgsrc/Help%2FBackLinksPlugin trunk/pgsrc/Help%2FBlogArchivesPlugin trunk/pgsrc/Help%2FBlogJournalPlugin trunk/pgsrc/Help%2FBoxRightPlugin trunk/pgsrc/Help%2FCacheTestPlugin trunk/pgsrc/Help%2FCalendarListPlugin trunk/pgsrc/Help%2FCalendarPlugin trunk/pgsrc/Help%2FCategories trunk/pgsrc/Help%2FCategoryPagePlugin trunk/pgsrc/Help%2FChartPlugin trunk/pgsrc/Help%2FCommentPlugin trunk/pgsrc/Help%2FCreateBibPlugin trunk/pgsrc/Help%2FCreatePagePlugin trunk/pgsrc/Help%2FCreateTocPlugin trunk/pgsrc/Help%2FCurrentTimePlugin trunk/pgsrc/Help%2FDeadEndPagesPlugin trunk/pgsrc/Help%2FDebugAuthInfoPlugin trunk/pgsrc/Help%2FDebugBackendInfoPlugin trunk/pgsrc/Help%2FDebugGroupInfoPlugin trunk/pgsrc/Help%2FDiffPlugin trunk/pgsrc/Help%2FDynamicIncludePagePlugin trunk/pgsrc/Help%2FEditMetaDataPlugin trunk/pgsrc/Help%2FEditText trunk/pgsrc/Help%2FExternalSearchPlugin trunk/pgsrc/Help%2FFacebookLikePlugin trunk/pgsrc/Help%2FFileInfoPlugin trunk/pgsrc/Help%2FFoafViewerPlugin trunk/pgsrc/Help%2FFullTextSearchPlugin trunk/pgsrc/Help%2FFuzzyPagesPlugin trunk/pgsrc/Help%2FGoToPlugin trunk/pgsrc/Help%2FGoodStyle trunk/pgsrc/Help%2FGoogleLink trunk/pgsrc/Help%2FGoogleMapsPlugin trunk/pgsrc/Help%2FGooglePluginPlugin trunk/pgsrc/Help%2FGraphVizPlugin trunk/pgsrc/Help%2FHelloWorldPlugin trunk/pgsrc/Help%2FHowToUseWiki trunk/pgsrc/Help%2FHtmlConverterPlugin trunk/pgsrc/Help%2FImages trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/Help%2FIncludePagesPlugin trunk/pgsrc/Help%2FIncludeSiteMapPlugin trunk/pgsrc/Help%2FIncludeTreePlugin trunk/pgsrc/Help%2FInterWiki trunk/pgsrc/Help%2FInterWikiSearchPlugin trunk/pgsrc/Help%2FJabberPresencePlugin trunk/pgsrc/Help%2FJeff%20Dairiki trunk/pgsrc/Help%2FLdapSearchPlugin trunk/pgsrc/Help%2FLikePagesPlugin trunk/pgsrc/Help%2FLinkDatabasePlugin trunk/pgsrc/Help%2FLinkIcons trunk/pgsrc/Help%2FListPagesPlugin trunk/pgsrc/Help%2FListSubpagesPlugin trunk/pgsrc/Help%2FMagicPhpWikiURLs trunk/pgsrc/Help%2FMediawikiTablePlugin trunk/pgsrc/Help%2FModeratedPagePlugin trunk/pgsrc/Help%2FMoreAboutMechanics trunk/pgsrc/Help%2FMostPopularPlugin trunk/pgsrc/Help%2FNewPagesPerUserPlugin trunk/pgsrc/Help%2FNoCachePlugin trunk/pgsrc/Help%2FOldStyleTablePlugin trunk/pgsrc/Help%2FOrphanedPagesPlugin trunk/pgsrc/Help%2FPageDumpPlugin trunk/pgsrc/Help%2FPageGroupPlugin trunk/pgsrc/Help%2FPageHistoryPlugin trunk/pgsrc/Help%2FPageInfoPlugin trunk/pgsrc/Help%2FPageList trunk/pgsrc/Help%2FPagePermissions trunk/pgsrc/Help%2FPageTrailPlugin trunk/pgsrc/Help%2FPasswordResetPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides trunk/pgsrc/Help%2FPhpHighlightPlugin trunk/pgsrc/Help%2FPhpWeatherPlugin trunk/pgsrc/Help%2FPhpWiki trunk/pgsrc/Help%2FPloticusPlugin trunk/pgsrc/Help%2FPluginManagerPlugin trunk/pgsrc/Help%2FPopUpPlugin trunk/pgsrc/Help%2FPopularNearbyPlugin trunk/pgsrc/Help%2FPredefinedIcons trunk/pgsrc/Help%2FPreferenceAppPlugin trunk/pgsrc/Help%2FPreferencesInfoPlugin trunk/pgsrc/Help%2FPrevNextPlugin trunk/pgsrc/Help%2FRandomPagePlugin trunk/pgsrc/Help%2FRateItPlugin trunk/pgsrc/Help%2FRawHtmlPlugin trunk/pgsrc/Help%2FRecentChangesCachedPlugin trunk/pgsrc/Help%2FRecentChangesPlugin trunk/pgsrc/Help%2FRecentCommentsPlugin trunk/pgsrc/Help%2FRecentEditsPlugin trunk/pgsrc/Help%2FRecentReferrersPlugin trunk/pgsrc/Help%2FRedirectToPlugin trunk/pgsrc/Help%2FReini%20Urban trunk/pgsrc/Help%2FRelatedChangesPlugin trunk/pgsrc/Help%2FRichTablePlugin trunk/pgsrc/Help%2FRssFeedPlugin trunk/pgsrc/Help%2FSearchHighlightPlugin trunk/pgsrc/Help%2FSemanticRelations trunk/pgsrc/Help%2FSemanticRelationsPlugin trunk/pgsrc/Help%2FSemanticSearchPlugin trunk/pgsrc/Help%2FSiteMapPlugin trunk/pgsrc/Help%2FSpreadsheet trunk/pgsrc/Help%2FSqlResultPlugin trunk/pgsrc/Help%2FSteve%20Wainstead trunk/pgsrc/Help%2FSyncWikiPlugin trunk/pgsrc/Help%2FSyntaxHighlighterPlugin trunk/pgsrc/Help%2FSystemInfoPlugin trunk/pgsrc/Help%2FTeX2pngPlugin trunk/pgsrc/Help%2FTemplatePlugin trunk/pgsrc/Help%2FTexToPngPlugin trunk/pgsrc/Help%2FTextFormattingRules trunk/pgsrc/Help%2FTitleSearchPlugin trunk/pgsrc/Help%2FTranscludePlugin trunk/pgsrc/Help%2FTranslateTextPlugin trunk/pgsrc/Help%2FUnfoldSubpagesPlugin trunk/pgsrc/Help%2FUpLoadPlugin trunk/pgsrc/Help%2FUserPreferencesPlugin trunk/pgsrc/Help%2FUserRatingsPlugin trunk/pgsrc/Help%2FVideoPlugin trunk/pgsrc/Help%2FVisualWikiPlugin trunk/pgsrc/Help%2FWabiSabi trunk/pgsrc/Help%2FWantedPagesOldPlugin trunk/pgsrc/Help%2FWantedPagesPlugin trunk/pgsrc/Help%2FWatchPagePlugin trunk/pgsrc/Help%2FWhoIsOnlinePlugin trunk/pgsrc/Help%2FWikiAdminChownPlugin trunk/pgsrc/Help%2FWikiAdminPurgePlugin trunk/pgsrc/Help%2FWikiAdminRemovePlugin trunk/pgsrc/Help%2FWikiAdminRenamePlugin trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin trunk/pgsrc/Help%2FWikiAdminSelectPlugin trunk/pgsrc/Help%2FWikiAdminSetAclPlugin trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin trunk/pgsrc/Help%2FWikiAdminUtilsPlugin trunk/pgsrc/Help%2FWikiBlogPlugin trunk/pgsrc/Help%2FWikiFormPlugin trunk/pgsrc/Help%2FWikiFormRichPlugin trunk/pgsrc/Help%2FWikiForumPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/Help%2FWikiPollPlugin trunk/pgsrc/Help%2FWikiTranslationPlugin trunk/pgsrc/Help%2FWikiWikiWeb trunk/pgsrc/Help%2FWikicreole trunk/pgsrc/Help%2FWikisUsingPhpWiki trunk/pgsrc/Help%2FYouTubePlugin trunk/pgsrc/Help%2Ftext2pngPlugin trunk/pgsrc/HomePage trunk/pgsrc/HomePageAlias trunk/pgsrc/InterWikiMap trunk/pgsrc/InterWikiSearch trunk/pgsrc/LdapSearch trunk/pgsrc/LeastPopular trunk/pgsrc/LikePages trunk/pgsrc/LinkDatabase trunk/pgsrc/LinkSearch trunk/pgsrc/ListRelations trunk/pgsrc/LockedPages trunk/pgsrc/ModeratedPage trunk/pgsrc/MostPopular trunk/pgsrc/MyRatings trunk/pgsrc/MyRecentChanges trunk/pgsrc/MyRecentEdits trunk/pgsrc/NewPagesPerUser trunk/pgsrc/OrphanedPages trunk/pgsrc/PageDump trunk/pgsrc/PageHistory trunk/pgsrc/PageInfo trunk/pgsrc/PasswordReset trunk/pgsrc/PhpWikiAdministration trunk/pgsrc/PhpWikiAdministration%2FChown trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl trunk/pgsrc/PhpWikiAdministration%2FPurge trunk/pgsrc/PhpWikiAdministration%2FRemove trunk/pgsrc/PhpWikiAdministration%2FRename trunk/pgsrc/PhpWikiAdministration%2FSearchReplace trunk/pgsrc/PhpWikiAdministration%2FSetAcl trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/pgsrc/PhpWikiDebug trunk/pgsrc/PhpWikiDocumentation trunk/pgsrc/PhpWikiManual trunk/pgsrc/PhpWikiPoll trunk/pgsrc/PhpWikiRecentChanges trunk/pgsrc/PluginManager trunk/pgsrc/ProjectSummary trunk/pgsrc/RandomPage trunk/pgsrc/RateIt trunk/pgsrc/RecentChanges trunk/pgsrc/RecentChangesMyPages trunk/pgsrc/RecentComments trunk/pgsrc/RecentEdits trunk/pgsrc/RecentNewPages trunk/pgsrc/RecentReleases trunk/pgsrc/RecentVisitors trunk/pgsrc/RelatedChanges trunk/pgsrc/ReleaseNotes trunk/pgsrc/San%20Diego trunk/pgsrc/SandBox trunk/pgsrc/SearchHighlight trunk/pgsrc/SemanticRelations trunk/pgsrc/SemanticSearch trunk/pgsrc/SetGlobalAccessRights trunk/pgsrc/SetGlobalAccessRightsSimple trunk/pgsrc/SpecialPages trunk/pgsrc/SpellCheck trunk/pgsrc/SystemInfo trunk/pgsrc/Template%2FAttribute trunk/pgsrc/Template%2FCategory trunk/pgsrc/Template%2FExample trunk/pgsrc/Template%2FLinkto trunk/pgsrc/Template%2FNewPlugin trunk/pgsrc/Template%2FRelation trunk/pgsrc/Template%2FTalk trunk/pgsrc/Template%2FUserPage trunk/pgsrc/The%20PhpWiki%20programming%20team trunk/pgsrc/TitleSearch trunk/pgsrc/TranslateText trunk/pgsrc/UpLoad trunk/pgsrc/UriResolver trunk/pgsrc/UserContribs trunk/pgsrc/UserPreferences trunk/pgsrc/UserRatings trunk/pgsrc/WantedPages trunk/pgsrc/WatchPage trunk/pgsrc/WhoIsOnline trunk/pgsrc/WikiAdminSelect trunk/pgsrc/WikiBlog trunk/pgsrc/area trunk/pgsrc/is_a trunk/pgsrc/located_in trunk/pgsrc/population trunk/themes/blog/pgsrc/About trunk/themes/blog/pgsrc/Blog trunk/themes/blog/pgsrc/BlogArchives trunk/themes/blog/pgsrc/CategoryHowTo trunk/themes/blog/pgsrc/HomePage trunk/themes/blog/pgsrc/HowTo trunk/themes/blog/pgsrc/PhotoAlbum trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates trunk/themes/fusionforge/pgsrc/CategoryWiki%20user trunk/themes/fusionforge/pgsrc/ExternalPages trunk/themes/fusionforge/pgsrc/FindPage trunk/themes/fusionforge/pgsrc/FullTextSearch trunk/themes/fusionforge/pgsrc/HomePage trunk/themes/fusionforge/pgsrc/InterWikiMap trunk/themes/fusionforge/pgsrc/PhpWikiAdministration trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple trunk/themes/fusionforge/pgsrc/SpecialPages trunk/themes/fusionforge/pgsrc/TextFormattingRules trunk/themes/fusionforge/pgsrc/TitleSearch trunk/themes/fusionforge/pgsrc/UpLoad trunk/themes/fusionforge/pgsrc/colorbox trunk/themes/fusionforge/pgsrc/titlebar trunk/themes/wikilens/pgsrc/LeftbarContent Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/INSTALL 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,6 +1,6 @@ REQUIREMENTS -PhpWiki 1.5.2 requires a web server with at least PHP version 5.3. +PhpWiki 1.5.3 requires a web server with at least PHP version 5.3. All users of PHP are strongly encouraged to upgrade to PHP 5.3.29 or to PHP 5.4 or 5.5. @@ -61,7 +61,7 @@ Unzip this file into the directory where you want it to live. That's it. -bash$ unzip phpwiki-1.5.2.zip +bash$ unzip phpwiki-1.5.3.zip In the config subdirectory copy 'config-dist.ini' to 'config.ini' and edit the settings in 'config.ini' to your liking. Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/Makefile 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,4 +1,4 @@ -VERSION=1.5.2 +VERSION=1.5.3 RPMBUILD=rpmbuild clean: Modified: trunk/config/phpwiki.spec =================================================================== --- trunk/config/phpwiki.spec 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/config/phpwiki.spec 2015年03月04日 13:28:25 UTC (rev 9594) @@ -40,7 +40,7 @@ # RPM spec preamble Summary: PHP-based Wiki webapplication Name: phpwiki -Version: 1.5.2 +Version: 1.5.3 Release: 1 BuildArch: noarch License: GPL Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/lib/prepend.php 2015年03月04日 13:28:25 UTC (rev 9594) @@ -5,7 +5,7 @@ */ // see lib/stdlib.php: phpwiki_version() -define('PHPWIKI_VERSION', '1.5.2'); +define('PHPWIKI_VERSION', '1.5.3'); /** PHP5 deprecated old-style globals if !(bool)ini_get('register_long_arrays'). * See Bug #1180115 Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/Makefile 2015年03月04日 13:28:25 UTC (rev 9594) @@ -140,14 +140,12 @@ ${POT_FILE}: .././lib/pear/DB/fbsql.php ${POT_FILE}: .././lib/pear/DB/ibase.php ${POT_FILE}: .././lib/pear/DB/ifx.php -${POT_FILE}: .././lib/pear/DB/ldap.php ${POT_FILE}: .././lib/pear/DB/msql.php ${POT_FILE}: .././lib/pear/DB/mssql.php ${POT_FILE}: .././lib/pear/DB/mysqli.php ${POT_FILE}: .././lib/pear/DB/mysql.php ${POT_FILE}: .././lib/pear/DB/oci8.php ${POT_FILE}: .././lib/pear/DB/odbc.php -${POT_FILE}: .././lib/pear/DB/Pager.php ${POT_FILE}: .././lib/pear/DB/pgsql.php ${POT_FILE}: .././lib/pear/DB.php ${POT_FILE}: .././lib/pear/DB/sqlite.php Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten =================================================================== --- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=%C3%84hnlicheSeiten; flags=""; Modified: trunk/locale/de/pgsrc/AlleBenutzer =================================================================== --- trunk/locale/de/pgsrc/AlleBenutzer 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/AlleBenutzer 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=AlleBenutzer; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeiten =================================================================== --- trunk/locale/de/pgsrc/AlleSeiten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/AlleSeiten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=AlleSeiten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=AlleSeitenEditiertVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=AlleSeitenErzeugtVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=AlleSeitenImBesitzVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/BackLinks =================================================================== --- trunk/locale/de/pgsrc/BackLinks 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/BackLinks 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=BackLinks; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen =================================================================== --- trunk/locale/de/pgsrc/BenutzerEinstellungen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=BenutzerEinstellungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/DebugAuthInfo =================================================================== --- trunk/locale/de/pgsrc/DebugAuthInfo 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/DebugAuthInfo 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=DebugAuthInfo; flags=LOCKED; Modified: trunk/locale/de/pgsrc/DebugGruppenInfo =================================================================== --- trunk/locale/de/pgsrc/DebugGruppenInfo 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/DebugGruppenInfo 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=DebugGruppenInfo; flags=LOCKED; Modified: trunk/locale/de/pgsrc/DebugInfo =================================================================== --- trunk/locale/de/pgsrc/DebugInfo 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/DebugInfo 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=DebugInfo; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/EditiereText =================================================================== --- trunk/locale/de/pgsrc/EditiereText 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/EditiereText 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=EditiereText; flags=""; Modified: trunk/locale/de/pgsrc/Einstellungen =================================================================== --- trunk/locale/de/pgsrc/Einstellungen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Einstellungen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Einstellungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/FuzzySuche =================================================================== --- trunk/locale/de/pgsrc/FuzzySuche 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/FuzzySuche 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=FuzzySuche; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch =================================================================== --- trunk/locale/de/pgsrc/G%C3%A4steBuch 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=G%C3%A4steBuch; flags=""; Modified: trunk/locale/de/pgsrc/GaesteBuch =================================================================== --- trunk/locale/de/pgsrc/GaesteBuch 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/GaesteBuch 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=GaesteBuch; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Geringf%C3%BCgige%C3%84nderungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/GleicheSeiten =================================================================== --- trunk/locale/de/pgsrc/GleicheSeiten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/GleicheSeiten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=GleicheSeiten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe =================================================================== --- trunk/locale/de/pgsrc/Hilfe 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAktionsSeite; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAutorenProtokollPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGraphVizPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGuterStil; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHalloWeltPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: 2015年2月11日 15:54:13 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHochLadenPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FInhaltsVerzeichnisPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeueSeitePlugin; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeuerKommentarPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: 2014年11月20日 14:24:56 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhpWiki; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextBearbeiten; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextFormatierungsRegeln; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FVorlagePlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWabiSabi; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWieManWikiBenutzt; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiTechnik; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiWikiWeb; flags=""; Modified: trunk/locale/de/pgsrc/HochLaden =================================================================== --- trunk/locale/de/pgsrc/HochLaden 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/HochLaden 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=HochLaden; flags=""; Modified: trunk/locale/de/pgsrc/InterWikiListe =================================================================== --- trunk/locale/de/pgsrc/InterWikiListe 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/InterWikiListe 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=InterWikiListe; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/KategorieAktionSeite =================================================================== --- trunk/locale/de/pgsrc/KategorieAktionSeite 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/KategorieAktionSeite 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=KategorieAktionSeite; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/KategorieKategorie =================================================================== --- trunk/locale/de/pgsrc/KategorieKategorie 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/KategorieKategorie 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=KategorieKategorie; flags=""; Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin =================================================================== --- trunk/locale/de/pgsrc/KategorieWikiPlugin 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=KategorieWikiPlugin; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/LinkSuche =================================================================== --- trunk/locale/de/pgsrc/LinkSuche 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/LinkSuche 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=LinkSuche; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ListeRelationen =================================================================== --- trunk/locale/de/pgsrc/ListeRelationen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/ListeRelationen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=ListeRelationen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ListeSeiten =================================================================== --- trunk/locale/de/pgsrc/ListeSeiten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/ListeSeiten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=ListeSeiten; flags=""; Modified: trunk/locale/de/pgsrc/MeistBesucht =================================================================== --- trunk/locale/de/pgsrc/MeistBesucht 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/MeistBesucht 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=MeistBesucht; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ModerierteSeite =================================================================== --- trunk/locale/de/pgsrc/ModerierteSeite 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/ModerierteSeite 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=ModerierteSeite; flags="LOCKED"; Modified: trunk/locale/de/pgsrc/NeueSeite =================================================================== --- trunk/locale/de/pgsrc/NeueSeite 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/NeueSeite 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=NeueSeite; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=Neueste%C3%84nderungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/NeuesteSeiten =================================================================== --- trunk/locale/de/pgsrc/NeuesteSeiten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/NeuesteSeiten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=NeuesteSeiten; flags=""; Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen =================================================================== --- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=PasswortZur%C3%BCcksetzen; flags=""; Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation =================================================================== --- trunk/locale/de/pgsrc/PhpWikiDokumentation 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=PhpWikiDokumentation; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,5 @@ -Date: Tue, 7 Oct 2014 19:05:52 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Date: Wed, 4 Mar 2015 14:19:50 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.3) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FAclSetzen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2015年03月04日 13:18:09 UTC (rev 9593) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2015年03月04日 13:28:25 UTC (rev 9594) @@ -1,5 +1,... [truncated message content]
Revision: 9593 http://sourceforge.net/p/phpwiki/code/9593 Author: vargenau Date: 2015年03月04日 13:18:09 +0000 (2015年3月04日) Log Message: ----------- Release 1.5.3: 2015年03月04日 Modified Paths: -------------- trunk/pgsrc/ReleaseNotes Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2015年03月04日 13:11:26 UTC (rev 9592) +++ trunk/pgsrc/ReleaseNotes 2015年03月04日 13:18:09 UTC (rev 9593) @@ -1,4 +1,4 @@ -Date: 2015年2月27日 18:40:24 +0000 +Date: Wed, 4 Mar 2015 14:17:34 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -8,7 +8,7 @@ <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>> -== 1.5.3 2015-02-XX Marc-Etienne Vargenau == +== 1.5.3 2015年03月04日 Marc-Etienne Vargenau == * Fix Bug#648 Call to protected method * easier file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9592 http://sourceforge.net/p/phpwiki/code/9592 Author: vargenau Date: 2015年03月04日 13:11:26 +0000 (2015年3月04日) Log Message: ----------- Custom pages for Fusionforge: FindPage, FullTextSearch, TitleSearch Modified Paths: -------------- trunk/themes/fusionforge/pgsrc/FindPage Added Paths: ----------- trunk/themes/fusionforge/pgsrc/FullTextSearch trunk/themes/fusionforge/pgsrc/TitleSearch Modified: trunk/themes/fusionforge/pgsrc/FindPage =================================================================== --- trunk/themes/fusionforge/pgsrc/FindPage 2015年03月03日 15:39:31 UTC (rev 9591) +++ trunk/themes/fusionforge/pgsrc/FindPage 2015年03月04日 13:11:26 UTC (rev 9592) @@ -1,4 +1,4 @@ -Date: Mon, 2 Mar 2015 17:55:39 +0000 +Date: Wed, 4 Mar 2015 14:01:52 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) Content-Type: application/x-phpwiki; pagename=FindPage; @@ -11,29 +11,21 @@ Here's a title search. Try something like ##wiki or sandwich##. -<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction - editbox[] name=s text="" - submit[] - checkbox[] name=case_exact - pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> +<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> == Full Text Search == Use the following for a full text search. The results will show all lines on a given page which contain a match. -<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction - editbox[] name=s text="" - submit[] - checkbox[] name=case_exact - pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">> +<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> == Fuzzy Search == In a fuzzy pages search the titles of all pages are examined to find those which are similarly spelled or similar sounding (English). -<?plugin-form FuzzyPages ?> +<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> == Tips == @@ -45,7 +37,7 @@ * Search for consecutive words by using quotes. <verbatim> - Example: ‘white dog’ will match "This is a white dog." + Example: 'white dog' or "white dog" will match "This is a white dog." </verbatim> * Search for some special chars, such as @ ! &, in the keyword is allowed. Yet you can NOT search for such chars only. @@ -56,5 +48,5 @@ <verbatim> Example: search for '!!!' will NOT return any result. </verbatim> -* Search for Chinese words is allowed. +* Search can be done in any language, including Chinese. * You can search titles in "Title Search" section, and search wiki contents in "Full Text Search" section. Added: trunk/themes/fusionforge/pgsrc/FullTextSearch =================================================================== --- trunk/themes/fusionforge/pgsrc/FullTextSearch (rev 0) +++ trunk/themes/fusionforge/pgsrc/FullTextSearch 2015年03月04日 13:11:26 UTC (rev 9592) @@ -0,0 +1,31 @@ +Date: Wed, 4 Mar 2015 14:01:52 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=FullTextSearch; + flags=PAGE_LOCKED; + charset=UTF-8 +Content-Transfer-Encoding: binary + +<<FullTextSearch>> + +---- + +Additional Searches: + +<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> + +<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> + +<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> +---- + +Create or edit page: + +<?plugin-form CreatePage ?> + +---- + +<<IncludePage page=FindPage quiet=1 section=Tips sectionhead=1>> + +---- +[[CategoryActionPage]] Added: trunk/themes/fusionforge/pgsrc/TitleSearch =================================================================== --- trunk/themes/fusionforge/pgsrc/TitleSearch (rev 0) +++ trunk/themes/fusionforge/pgsrc/TitleSearch 2015年03月04日 13:11:26 UTC (rev 9592) @@ -0,0 +1,26 @@ +Date: Wed, 4 Mar 2015 14:01:52 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.2) +Content-Type: application/x-phpwiki; + pagename=TitleSearch; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; + charset=UTF-8 +Content-Transfer-Encoding: binary + +<<TitleSearch>> + +---- + +Additional Searches: + +<<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> + +<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> + +<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >> + +---- + +<<IncludePage page=FindPage quiet=1 section=Tips sectionhead=1>> + +---- +[[CategoryActionPage]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9591 http://sourceforge.net/p/phpwiki/code/9591 Author: vargenau Date: 2015年03月03日 15:39:31 +0000 (2015年3月03日) Log Message: ----------- fix prototype for _lock_tables and _unlock_tables; PHP Doc Modified Paths: -------------- trunk/lib/WikiDB/ADODB.php trunk/lib/WikiDB/PDO.php trunk/lib/WikiDB/SQL.php 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/PDO.php trunk/lib/WikiDB/backend/PDO_oci8.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/file.php trunk/lib/WikiDB/backend/flatfile.php trunk/lib/WikiDB/backend.php Modified: trunk/lib/WikiDB/ADODB.php =================================================================== --- trunk/lib/WikiDB/ADODB.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/ADODB.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -38,7 +38,7 @@ parent::__construct($backend, $dbparams); } - /** + /* * Determine whether page exists (in non-default form). * @see WikiDB::isWikiPage for the slow generic version */ Modified: trunk/lib/WikiDB/PDO.php =================================================================== --- trunk/lib/WikiDB/PDO.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/PDO.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -36,7 +36,7 @@ parent::__construct($backend, $dbparams); } - /** + /* * Determine whether page exists (in non-default form). * @see WikiDB::isWikiPage for the slow generic version */ Modified: trunk/lib/WikiDB/SQL.php =================================================================== --- trunk/lib/WikiDB/SQL.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/SQL.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -37,7 +37,7 @@ ); } - /** + /* * Determine whether page exists (in non-default form). * @see WikiDB::isWikiPage for the slow generic version */ Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/ADODB.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -198,7 +198,7 @@ return; } - /** + /* * Read page information from database. */ function get_pagedata($pagename) @@ -367,7 +367,9 @@ /** * Get version data. * - * @param int $version Which version to get. + * @param string $pagename Name of the page + * @param int $version Which version to get + * @param bool $want_content Do we need content? * * @return array hash The version data, or false if specified version does not * exist. @@ -443,7 +445,7 @@ return $data; } - /** + /* * Create a new revision of a page. */ function set_versiondata($pagename, $version, $data) @@ -481,7 +483,7 @@ $this->unlock(array('page', 'recent', 'version', 'nonempty')); } - /** + /* * Delete an old revision of a page. */ function delete_versiondata($pagename, $version) @@ -501,7 +503,7 @@ $this->unlock(array('version')); } - /** + /* * Delete page from the database with backup possibility. * i.e save_page('') and DELETE nonempty id * @@ -557,9 +559,8 @@ } } - /** + /* * Delete page completely from the database. - * I'm not sure if this is what we want. Maybe just delete the revisions */ function purge_page($pagename) { @@ -760,7 +761,7 @@ return true; } - /** + /* * Find pages which link to or are linked from a page. * * Optimization: save request->_dbi->_iwpcache[] to avoid further iswikipage checks @@ -822,7 +823,7 @@ return new WikiDB_backend_ADODB_iter($this, $result, $fields); } - /** + /* * Find if a page links to another page */ function exists_link($pagename, $link, $reversed = false) @@ -906,7 +907,7 @@ return new WikiDB_backend_ADODB_iter($this, $result, $this->page_tbl_field_list); } - /** + /* * Title and fulltext search. */ public function text_search($search, $fulltext = false, @@ -970,7 +971,7 @@ return substr($s, 0, -1) . ")"; } - /** + /* * Find highest or lowest hit counts. */ public function most_popular($limit = 20, $sortby = '-hits') @@ -1006,7 +1007,7 @@ return new WikiDB_backend_ADODB_iter($this, $result, $this->page_tbl_field_list); } - /** + /* * Find recent changes. */ public function most_recent($params) @@ -1080,7 +1081,7 @@ array_merge($this->page_tbl_field_list, $this->version_tbl_field_list)); } - /** + /* * Find referenced empty pages. */ function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '') @@ -1122,7 +1123,7 @@ return new WikiDB_backend_ADODB_iter($this, $result, array('pagename', 'wantedfrom')); } - /** + /* * Rename page in the database. */ function rename_page($pagename, $to) @@ -1206,7 +1207,7 @@ $this->unlock(array('nonempty')); } - /** + /* * Grab a write lock on the tables in the SQL database. * * Calls can be nested. The tables won't be unlocked until @@ -1221,10 +1222,10 @@ } } - /** + /* * Overridden by non-transaction safe backends. */ - function _lock_tables($tables, $write_lock) + protected function _lock_tables($tables, $write_lock = true) { return $this->_current_lock; } @@ -1245,22 +1246,22 @@ return; } if (--$this->_lock_count <= 0 || $force) { - $this->_unlock_tables($tables, $force); + $this->_unlock_tables($tables); $this->_current_lock = false; $this->_lock_count = 0; } $this->_dbh->CompleteTrans(!$force); } - /** + /* * overridden by non-transaction safe backends */ - function _unlock_tables($tables, $write_lock = false) + protected function _unlock_tables($tables) { return; } - /** + /* * Serialize data */ function _serialize($data) @@ -1271,7 +1272,7 @@ return serialize($data); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mssql.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -35,14 +35,14 @@ return true; } - /** + /* * Lock tables. * * We don't really need to lock exclusive, but I'll relax it when I fully * understand phpWiki locking ;-) * */ - function _lock_tables($tables, $write_lock = true) + protected function _lock_tables($tables, $write_lock = true) { if (!$tables) return; @@ -62,16 +62,16 @@ } } - /** + /* * Release the locks. */ - function _unlock_tables($tables) + protected function _unlock_tables($tables) { $dbh = &$this->_dbh; $dbh->Execute("COMMIT WORK"); } - // Search callabcks + // Search callbacks // Page name function _sql_match_clause($word) { @@ -89,7 +89,7 @@ . "OR CHARINDEX(content, '$word') > 0"; } - /** + /* * Serialize data */ function _serialize($data) @@ -100,7 +100,7 @@ return serialize(addslashes($data)); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -53,7 +53,7 @@ . "OR CHARINDEX(content, '$word') > 0"; } - /** + /* * Serialize data */ function _serialize($data) @@ -64,7 +64,7 @@ return addslashes(serialize($data)); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mysql.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -51,8 +51,8 @@ } } - /** - * Kill timed out processes. ( so far only called on about every 50-th save. ) + /* + * Kill timed out processes (so far only called on about every 50-th save). */ function _timeout() { @@ -70,7 +70,7 @@ } } - /** + /* * Pack tables. */ function optimize() @@ -83,7 +83,7 @@ return true; } - /** + /* * Lock tables. As fine-grained application lock, which locks only the * same transaction (conflicting updates and edits), and as full table * write lock. @@ -91,7 +91,7 @@ * New: which tables as params, * support nested locks via app locks */ - function _lock_tables($tables, $write_lock = true) + protected function _lock_tables($tables, $write_lock = true) { if (!$tables) return; if (DO_APP_LOCK) { @@ -113,11 +113,11 @@ } } - /** + /* * Release the locks. * Support nested locks */ - function _unlock_tables($tables) + protected function _unlock_tables($tables) { if (!$tables) { $this->_dbh->Execute("UNLOCK TABLES"); @@ -187,7 +187,7 @@ return $id; } - /** + /* * Create a new revision of a page. */ function set_versiondata($pagename, $version, $data) Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -38,14 +38,14 @@ return true; } - /** + /* * Lock tables. * * We don't really need to lock exclusive, but I'll relax it when I fully * understand phpWiki locking ;-) * */ - function _lock_tables($tables, $write_lock = true) + protected function _lock_tables($tables, $write_lock = true) { if (!$tables) return; @@ -65,10 +65,10 @@ } } - /** + /* * Release the locks. */ - function _unlock_tables($tables) + protected function _unlock_tables($tables) { $dbh = &$this->_dbh; $dbh->Execute("COMMIT WORK"); @@ -97,7 +97,7 @@ } */ - /** + /* * Serialize data */ function _serialize($data) @@ -108,7 +108,7 @@ return $this->_dbh->BlobEncode(serialize($data)); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -98,25 +98,25 @@ } } - /** + /* * Lock all tables we might use. * postgresql has proper transactions so we dont need table locks. */ - function _lock_tables($tables, $write_lock = true) + protected function _lock_tables($tables, $write_lock = true) { ; } - /** + /* * Unlock all tables. * postgresql has proper transactions so we dont need table locks. */ - function _unlock_tables($tables, $write_lock = false) + protected function _unlock_tables($tables) { ; } - /** + /* * Serialize data */ function _serialize($data) @@ -127,7 +127,7 @@ return $this->_quote(serialize($data)); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PDO.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -265,7 +265,7 @@ $sth->execute(); } - /** + /* * Read page information from database. */ function get_pagedata($pagename) @@ -448,7 +448,9 @@ /** * Get version data. * - * @param $version int Which version to get. + * @param string $pagename Name of the page + * @param int $version Which version to get + * @param bool $want_content Do we need content? * * @return array hash The version data, or false if specified version does not * exist. @@ -526,7 +528,7 @@ return $data; } - /** + /* * Create a new revision of a page. */ function set_versiondata($pagename, $version, $data) @@ -585,7 +587,7 @@ $this->unlock(array('page', 'recent', 'version', 'nonempty')); } - /** + /* * Delete an old revision of a page. */ function delete_versiondata($pagename, $version) @@ -605,7 +607,7 @@ $this->unlock(array('version')); } - /** + /* * Delete page from the database with backup possibility. * i.e save_page('') and DELETE nonempty id * @@ -671,9 +673,8 @@ } } - /** + /* * Delete page completely from the database. - * I'm not sure if this is what we want. Maybe just delete the revisions */ function purge_page($pagename) { @@ -761,7 +762,7 @@ return true; } - /** + /* * Find pages which link to or are linked from a page. * * Optimization: save request->_dbi->_iwpcache[] to avoid further iswikipage checks @@ -804,7 +805,7 @@ return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list); } - /** + /* * Find if a page links to another page */ function exists_link($pagename, $link, $reversed = false) @@ -881,7 +882,7 @@ return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list); } - /** + /* * Title and fulltext search. */ public function text_search($search, $fulltext = false, @@ -940,7 +941,7 @@ return substr($s, 0, -1) . ")"; } - /** + /* * Find highest or lowest hit counts. */ public function most_popular($limit = 20, $sortby = '-hits') @@ -976,7 +977,7 @@ return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list); } - /** + /* * Find recent changes. */ public function most_recent($params) @@ -1048,7 +1049,7 @@ array_merge($this->page_tbl_field_list, $this->version_tbl_field_list)); } - /** + /* * Find referenced empty pages. */ function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '') @@ -1090,7 +1091,7 @@ return new WikiDB_backend_PDO_iter($this, $result, array('pagename', 'wantedfrom')); } - /** + /* * Rename page in the database. */ function rename_page($pagename, $to) @@ -1179,7 +1180,7 @@ $this->unlock(array('nonempty')); } - /** + /* * Grab a write lock on the tables in the SQL database. * * Calls can be nested. The tables won't be unlocked until @@ -1194,10 +1195,10 @@ } } - /** + /* * Overridden by non-transaction safe backends. */ - function _lock_tables($tables, $write_lock) + protected function _lock_tables($tables, $write_lock = true) { $lock_type = $write_lock ? "WRITE" : "READ"; foreach ($this->_table_names as $key => $table) { @@ -1209,7 +1210,8 @@ /** * Release a write lock on the tables in the SQL database. * - * @param $force boolean Unlock even if not every call to lock() has been matched + * @param array $tables + * @param bool $force Unlock even if not every call to lock() has been matched * by a call to unlock(). * * @see _lock_database @@ -1222,21 +1224,21 @@ } if (--$this->_lock_count <= 0 || $force) { if (!$this->_hasTransactions) - $this->_unlock_tables($tables); + $this->_unlock_tables(); $this->_current_lock = false; $this->_lock_count = 0; } } - /** + /* * overridden by non-transaction safe backends */ - function _unlock_tables($tables) + protected function _unlock_tables() { $this->_dbh->query("UNLOCK TABLES"); } - /** + /* * Serialize data */ function _serialize($data) @@ -1247,7 +1249,7 @@ return serialize($data); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/PDO_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_oci8.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PDO_oci8.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -36,10 +36,10 @@ return true; } - /** + /* * Lock all tables we might use. */ - function _lock_tables($write_lock = true) + protected function _lock_tables($tables, $write_lock = true) { $dbh = &$this->_dbh; Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PearDB.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -173,7 +173,7 @@ $dbh->escapeSimple($pagename))); } - /** + /* * Read page information from database. */ function get_pagedata($pagename) @@ -339,7 +339,9 @@ /** * Get version data. * - * @param $version int Which version to get. + * @param string $pagename Name of the page + * @param int $version Which version to get + * @param bool $want_content Do we need content? * * @return array hash The version data, or false if specified version does not * exist. @@ -408,7 +410,7 @@ return $data; } - /** + /* * Create a new revision of a page. */ function set_versiondata($pagename, $version, $data) @@ -446,7 +448,7 @@ $this->unlock(); } - /** + /* * Delete an old revision of a page. */ function delete_versiondata($pagename, $version) @@ -466,7 +468,7 @@ $this->unlock(); } - /** + /* * Delete page from the database with backup possibility. * i.e save_page('') and DELETE nonempty id * Can be undone and is seen in RecentChanges. @@ -489,9 +491,8 @@ } */ - /** + /* * Delete page completely from the database. - * I'm not sure if this is what we want. Maybe just delete the revisions */ function purge_page($pagename) { @@ -576,7 +577,7 @@ $this->unlock(); } - /** + /* * Find pages which link to or are linked from a page. * * TESTME relations: get_links is responsible to add the relation to the pagehash @@ -625,7 +626,7 @@ return new WikiDB_backend_PearDB_iter($this, $result); } - /** + /* * Find if a page links to another page */ function exists_link($pagename, $link, $reversed = false) @@ -706,7 +707,7 @@ return new WikiDB_backend_PearDB_iter($this, $result, $options); } - /** + /* * Text search (title or full text) * Todo: exclude */ @@ -794,7 +795,7 @@ return "pagename LIKE '%$word%' OR content LIKE '%$word%'"; } - /** + /* * Find highest or lowest hit counts. */ public function most_popular($limit = 20, $sortby = '-hits') @@ -832,7 +833,7 @@ return new WikiDB_backend_PearDB_iter($this, $result); } - /** + /* * Find recent changes. */ public function most_recent($params) @@ -905,7 +906,7 @@ return new WikiDB_backend_PearDB_iter($this, $result); } - /** + /* * Find referenced empty pages. */ function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '') @@ -947,7 +948,7 @@ return substr($s, 0, -1) . ")"; } - /** + /* * Rename page in the database. */ function rename_page($pagename, $to) @@ -1019,7 +1020,7 @@ $this->unlock(); } - /** + /* * Grab a write lock on the tables in the SQL database. * * Calls can be nested. The tables won't be unlocked until @@ -1031,10 +1032,10 @@ $this->_lock_tables($write_lock); } - /** + /* * Actually lock the required tables. */ - function _lock_tables($write_lock) + protected function _lock_tables($write_lock = true) { trigger_error("virtual", E_USER_ERROR); } @@ -1042,6 +1043,7 @@ /** * Release a write lock on the tables in the SQL database. * + * @param array $tables * @param bool $force Unlock even if not every call to lock() has been matched * by a call to unlock(). * @@ -1061,12 +1063,12 @@ /** * Actually unlock the required tables. */ - function _unlock_tables($write_lock) + protected function _unlock_tables() { trigger_error("virtual", E_USER_ERROR); } - /** + /* * Serialize data */ function _serialize($data) @@ -1077,7 +1079,7 @@ return serialize($data); } - /** + /* * Unserialize data */ function _unserialize($data) @@ -1088,7 +1090,7 @@ /** * Callback for PEAR (DB) errors. * - * @param A PEAR_error object. + * @param $error PEAR_error object. */ public function _pear_error_callback($error) { @@ -1100,7 +1102,7 @@ trigger_error($this->_pear_error_message($error), E_USER_ERROR); } - /** + /* * Detect false errors messages from PEAR DB. * * The version of PEAR DB which ships with PHP 4.0.6 has a bug in that @@ -1153,7 +1155,7 @@ return str_replace($this->_dsn, $safe_dsn, $message); } - /** + /* * Filter PHP errors notices from PEAR DB code. * * The PEAR DB code which ships with PHP 4.0.6 produces spurious Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -604,7 +604,7 @@ return true; } - /** + /* * Text search (title or full text) */ public function text_search($search, $fulltext = false, @@ -709,7 +709,7 @@ } } - /** + /* * use tsearch2. See schemas/psql-tsearch2.sql and /usr/share/postgresql/contrib/tsearch2.sql * TODO: don't parse the words into nodes. rather replace "[ +]" with & and "-" with "!" and " or " with "|" * tsearch2 query language: @@ "word | word", "word & word", ! word Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_mysql.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -50,7 +50,7 @@ } } - /** + /* * Create a new revision of a page. */ function set_versiondata($pagename, $version, $data) @@ -169,10 +169,10 @@ return true; } - /** + /* * Lock tables. */ - function _lock_tables($write_lock = true) + protected function _lock_tables($write_lock = true) { $lock_type = $write_lock ? "WRITE" : "READ"; foreach ($this->_table_names as $table) { @@ -181,10 +181,10 @@ $this->_dbh->query("LOCK TABLES " . join(",", $tables)); } - /** + /* * Release all locks. */ - function _unlock_tables() + protected function _unlock_tables() { $this->_dbh->query("UNLOCK TABLES"); } Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_oci8.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -41,10 +41,10 @@ return true; } - /** + /* * Lock all tables we might use. */ - function _lock_tables($write_lock = true) + protected function _lock_tables($write_lock = true) { $dbh = &$this->_dbh; Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -81,7 +81,7 @@ array($this->_quote($data), $pagename)); } - /** + /* * Create a new revision of a page. */ function _todo_set_versiondata($pagename, $version, $data) @@ -113,7 +113,7 @@ $this->unlock(); } - /** + /* * Delete an old revision of a page. */ function _todo_delete_versiondata($pagename, $version) @@ -123,7 +123,7 @@ $dbh->query(sprintf("SELECT delete_versiondata (%d, %d)", $id, $version)); } - /** + /* * Rename page in the database. */ function _todo_rename_page($pagename, $to) @@ -146,23 +146,23 @@ return $id; } - /** + /* * Lock all tables we might use. */ - function _lock_tables($write_lock = true) + protected function _lock_tables($write_lock = true) { $this->_dbh->query("BEGIN"); } - /** + /* * Unlock all tables. */ - function _unlock_tables() + protected function _unlock_tables() { $this->_dbh->query("COMMIT"); } - /** + /* * Serialize data */ function _serialize($data) @@ -173,7 +173,7 @@ return $this->_quote(serialize($data)); } - /** + /* * Unserialize data */ function _unserialize($data) @@ -187,7 +187,7 @@ return unserialize($this->_unquote($data)); } - /** + /* * Text search (title or full text) */ public function text_search($search, $fulltext = false, @@ -280,21 +280,20 @@ default | 39 | 124 */ - /** + /* * use tsearch2. See schemas/psql-tsearch2.sql and /usr/share/postgresql/contrib/tsearch2.sql * TODO: don't parse the words into nodes. rather replace "[ +]" with & and "-" with "!" and " or " with "|" * tsearch2 query language: @@ "word | word", "word & word", ! word * ~* '.*something that does not exist.*' + * + * phrase search for "history lesson": + * + * SELECT id FROM tab WHERE ts_idx_col @@ to_tsquery('history&lesson') + * AND text_col ~* '.*history\\s+lesson.*'; + * + * The full-text index will still be used, and the regex will be used to + * prune the results afterwards. */ - /* - phrase search for "history lesson": - - SELECT id FROM tab WHERE ts_idx_col @@ to_tsquery('history&lesson') - AND text_col ~* '.*history\\s+lesson.*'; - - The full-text index will still be used, and the regex will be used to - prune the results afterwards. - */ function _fulltext_match_clause($node) { $word = strtolower($node->word); Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -22,7 +22,7 @@ class WikiDB_backend_PearDB_sqlite extends WikiDB_backend_PearDB { - /** + /* * Pack tables. */ function optimize() @@ -31,23 +31,23 @@ // NOP } - /** + /* * Lock tables. */ - function _lock_tables($write_lock = true) + protected function _lock_tables($write_lock = true) { // NOP - SQLite does all locking automatically } - /** + /* * Release all locks. */ - function _unlock_tables() + protected function _unlock_tables() { // NOP } - /** + /* * Serialize data */ function _serialize($data) @@ -58,7 +58,7 @@ return base64_encode(serialize($data)); } - /** + /* * Unserialize data */ function _unserialize($data) Modified: trunk/lib/WikiDB/backend/file.php =================================================================== --- trunk/lib/WikiDB/backend/file.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/file.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -311,8 +311,7 @@ * * @param string $pagename Page name. * @param array $newdata hash New meta-data. - */ - /** + * * This will create a new page if page being requested does not * exist. */ @@ -397,7 +396,7 @@ return $vd; } - /** + /* * Rename all files for this page */ public function rename_page($pagename, $to) @@ -414,7 +413,7 @@ return true; } - /** + /* * See ADODB for a better delete_page(), which can be undone and is seen in RecentChanges. */ function delete_page($pagename) @@ -532,8 +531,13 @@ /** * Find pages which link to or are linked from a page. * - * @param $pagename string Page name. - * @param $reversed boolean True to get backlinks. + * @param string $pagename Page name. + * @param bool $reversed True to get backlinks. + * @param bool $include_empty True to get empty pages + * @param string $sortby + * @param string $limit + * @param string $exclude Pages to exclude. + * @param bool $want_relations True to get relations. * * FIXME: array or iterator? * @return object A WikiDB_backend_iterator. @@ -579,7 +583,7 @@ * Pages should be returned in alphabetical order if that is * feasable. * - * @param $include_defaulted boolean + * @param bool $include_empty * If set, even pages with no content will be returned * --- but still only if they have at least one revision (not * counting the default revision 0) entered in the database. @@ -588,6 +592,10 @@ * are not returned as these pages are considered to be * non-existing. * + * @param string $sortby + * @param string $limit + * @param string $exclude + * * @return object A WikiDB_backend_iterator. */ public function get_all_pages($include_empty = false, $sortby = '', $limit = '', $exclude = '') @@ -622,28 +630,28 @@ return count($this->_latest_versions); } - /** + /* * Lock backend database. */ function lock($tables = array(), $write_lock = true) { } - /** + /* * Unlock backend database. */ function unlock($tables = array(), $force = false) { } - /** + /* * Close database. */ function close() { } - /** + /* * Synchronize with filesystem. * * This should flush all unwritten data to the filesystem. @@ -652,7 +660,7 @@ { } - /** + /* * Optimize the database. */ function optimize() Modified: trunk/lib/WikiDB/backend/flatfile.php =================================================================== --- trunk/lib/WikiDB/backend/flatfile.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend/flatfile.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -97,7 +97,7 @@ return array(); // no values found } - /** Store latest version as full page_data flatfile, + /* Store latest version as full page_data flatfile, * earlier versions as file backend ver_data. * _cached_html will not be stored. * If the given ($pagename,$version) is already in the database, Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2015年03月03日 15:37:03 UTC (rev 9590) +++ trunk/lib/WikiDB/backend.php 2015年03月03日 15:39:31 UTC (rev 9591) @@ -547,7 +547,7 @@ return array($words, $exclude); } - /** + /* * Split the given limit parameter into offset,limit. (offset is optional. default: 0) * Duplicate the PageList function here to avoid loading the whole PageList.php * Usage: @@ -571,7 +571,7 @@ } } - /** + /* * Handle sortby requests for the DB iterator and table header links. * Prefix the column with + or - like "+pagename","-mtime", ... * supported actions: 'flip_order' "mtime" => "+mtime" => "-mtime" ... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9590 http://sourceforge.net/p/phpwiki/code/9590 Author: vargenau Date: 2015年03月03日 15:37:03 +0000 (2015年3月03日) Log Message: ----------- Revert __construct par ImageButton Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015年03月03日 15:35:23 UTC (rev 9589) +++ trunk/lib/WikiTheme.php 2015年03月03日 15:37:03 UTC (rev 9590) @@ -1797,7 +1797,7 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function __construct($text, $url, $class, $img_url, $img_attr = array()) + function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { /** * @var WikiRequest $request This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9589 http://sourceforge.net/p/phpwiki/code/9589 Author: vargenau Date: 2015年03月03日 15:35:23 +0000 (2015年3月03日) Log Message: ----------- Update LICENSE Modified Paths: -------------- trunk/lib/pear/LICENSE Modified: trunk/lib/pear/LICENSE =================================================================== --- trunk/lib/pear/LICENSE 2015年03月03日 15:33:34 UTC (rev 9588) +++ trunk/lib/pear/LICENSE 2015年03月03日 15:35:23 UTC (rev 9589) @@ -1,75 +1,27 @@ --------------------------------------------------------------------- - The PHP License, version 2.02 -Copyright (c) 1999, 2000 The PHP Group. All rights reserved. --------------------------------------------------------------------- +Copyright (c) 1997-2009, + Stig Bakken <ss...@ph...>, + Gregory Beaver <ce...@ph...>, + Helgi Þormar Þorbjörnsson <he...@ph...>, + Tomas V.V.Cox <co...@id...>, + Martin Jansen <mj...@ph...>. +All rights reserved. Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: +modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior permission from the - PHP Group. This does not apply to add-on libraries or tools - that work in conjunction with PHP. In such a case the PHP - name may be used to indicate that the product supports PHP. - - 4. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the - terms of that version. You may also choose to use such covered - code under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - 5. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP, freely available from - http://www.php.net/". - - 6. The software incorporates the Zend Engine, a product of Zend - Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the - PHP Association (pursuant to a grant from Zend that can be - found at http://www.php.net/license/ZendGrant/) for - distribution to you under this license agreement, only as a - part of PHP. In the event that you separate the Zend Engine - (or any portion thereof) from the rest of the software, or - modify the Zend Engine, or any portion thereof, your use of the - separated or modified Zend Engine software shall not be governed - by this license, and instead shall be governed by the license - set forth at http://www.zend.com/license/ZendLicense/. - - - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at gr...@ph.... - -For more information on the PHP Group and the PHP project, -please see <http://www.php.net>. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9588 http://sourceforge.net/p/phpwiki/code/9588 Author: vargenau Date: 2015年03月03日 15:33:34 +0000 (2015年3月03日) Log Message: ----------- Update PEAR to release 1.9.5, PEAR DB to release 1.8.2 Modified Paths: -------------- trunk/lib/pear/DB/common.php trunk/lib/pear/DB/dbase.php trunk/lib/pear/DB/fbsql.php trunk/lib/pear/DB/ibase.php trunk/lib/pear/DB/ifx.php trunk/lib/pear/DB/msql.php trunk/lib/pear/DB/mssql.php trunk/lib/pear/DB/mysql.php trunk/lib/pear/DB/mysqli.php trunk/lib/pear/DB/oci8.php trunk/lib/pear/DB/odbc.php trunk/lib/pear/DB/pgsql.php trunk/lib/pear/DB/sqlite.php trunk/lib/pear/DB/storage.php trunk/lib/pear/DB/sybase.php trunk/lib/pear/DB.php trunk/lib/pear/PEAR.php Removed Paths: ------------- trunk/lib/pear/DB/Pager.php trunk/lib/pear/DB/ldap.php Deleted: trunk/lib/pear/DB/Pager.php =================================================================== --- trunk/lib/pear/DB/Pager.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/Pager.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -1,253 +0,0 @@ -<?php -// -// Pear DB Pager - Retrieve and return information of databases -// result sets -// -// Copyright (C) 2001 Tomas Von Veschler Cox <co...@id...> -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -// -/// -// Based on DB_Pager 0.7 from the pear.php.net repository. -// The only modifications made have been modification of the include paths. -// -// From Pear CVS: Id: Pager.php,v 1.3 2002年05月12日 13:59:40 cox Exp - -require_once 'PEAR.php'; -require_once 'DB.php'; - -/** -* This class handles all the stuff needed for displaying paginated results -* from a database query of Pear DB, in a very easy way. -* Documentation and examples of use, can be found in: -* http://vulcanonet.com/soft/pager/ (could be outdated) -* -* IMPORTANT! -* Since PEAR DB already support native row limit (more fast and avaible in -* all the drivers), there is no more need to use $pager->build() or -* the $pager->fetch*() methods. -* -* Usage example: -* -*< ?php -* require_once 'DB/Pager.php'; -* $db = DB::connect('your DSN string'); -* $from = 0; // The row to start to fetch from (you might want to get this -* // param from the $_GET array -* $limit = 10; // The number of results per page -* $maxpages = 10; // The number of pages for displaying in the pager (optional) -* $res = $db->limitQuery($sql, $from, $limit); -* $nrows = 0; // Alternative you could use $res->numRows() -* while ($row = $res->fetchrow()) { -* // XXX code for building the page here -* $nrows++; -* } -* $data = DB_Pager::getData($from, $limit, $nrows, $maxpages); -* // XXX code for building the pager here -* ? > -* -* @version 0.7 -* @author Tomas V.V.Cox <co...@id...> -* @see http://vulcanonet.com/soft/pager/ -*/ - -class DB_Pager extends PEAR -{ - - /** - * Constructor - * - * @param object $res A DB_result object from Pear_DB - * @param int $from The row to start fetching - * @param int $limit How many results per page - * @param int $numrows Pager will automatically - * find this param if is not given. If your Pear_DB backend extension - * doesn't support numrows(), you can manually calculate it - * and supply later to the constructor - * @deprecated - */ - function DB_Pager (&$res, $from, $limit, $numrows = null) - { - $this->res = $res; - $this->from = $from; - $this->limit = $limit; - $this->numrows = $numrows; - } - - /** - * Calculates all the data needed by Pager to work - * - * @return mixed An assoc array with all the data (see getData) - * or DB_Error on error - * @see DB_Pager::getData - * @deprecated - */ - function build() - { - // if there is no numrows given, calculate it - if ($this->numrows === null) { - $this->numrows = $this->res->numrows(); - if (DB::isError($this->numrows)) { - return $this->numrows; - } - } - $data = $this->getData($this->from, $this->limit, $this->numrows); - if (DB::isError($data)) { - return $data; - } - $this->current = $this->from - 1; - $this->top = $data['to']; - return $data; - } - - /** - * @deprecated - */ - function fetchRow($mode=DB_FETCHMODE_DEFAULT) - { - $this->current++; - if ($this->current >= $this->top) { - return null; - } - return $this->res->fetchRow($mode, $this->current); - } - - /** - * @deprecated - */ - function fetchInto(&$arr, $mode=DB_FETCHMODE_DEFAULT) - { - $this->current++; - if ($this->current >= $this->top) { - return null; - } - return $this->res->fetchInto($arr, $mode, $this->current); - } - - /* - * Gets all the data needed to paginate results - * This is an associative array with the following - * values filled in: - * - * array( - * 'current' => X, // current page you are - * 'numrows' => X, // total number of results - * 'next' => X, // row number where next page starts - * 'prev' => X, // row number where prev page starts - * 'remain' => X, // number of results remaning *in next page* - * 'numpages'=> X, // total number of pages - * 'from' => X, // the row to start fetching - * 'to' => X, // the row to stop fetching - * 'limit' => X, // how many results per page - * 'maxpages' => X, // how many pages to show (google style) - * 'firstpage' => X, // the row number of the first page - * 'lastpage' => X, // the row number where the last page starts - * 'pages' => array( // assoc with page "number => start row" - * 1 => X, - * 2 => X, - * 3 => X - * ) - * ); - * @param int $from The row to start fetching - * @param int $limit How many results per page - * @param int $numrows Number of results from query - * - * @return array associative array with data or DB_error on error - * - */ - function &getData($from, $limit, $numrows, $maxpages = false) - { - if (empty($numrows) || ($numrows < 0)) { - return null; - } - $from = (empty($from)) ? 0 : $from; - - if ($limit <= 0) { - return PEAR::raiseError (null, 'wrong "limit" param', null, - null, null, 'DB_Error', true); - } - - // Total number of pages - $pages = ceil($numrows/$limit); - $data['numpages'] = $pages; - - // first & last page - $data['firstpage'] = 1; - $data['lastpage'] = $pages; - - // Build pages array - $data['pages'] = array(); - for ($i=1; $i <= $pages; $i++) { - $offset = $limit * ($i-1); - $data['pages'][$i] = $offset; - // $from must point to one page - if ($from == $offset) { - // The current page we are - $data['current'] = $i; - } - } - if (!isset($data['current'])) { - return PEAR::raiseError (null, 'wrong "from" param', null, - null, null, 'DB_Error', true); - } - - // Limit number of pages (goole algoritm) - if ($maxpages) { - $radio = floor($maxpages/2); - $minpage = $data['current'] - $radio; - if ($minpage < 1) { - $minpage = 1; - } - $maxpage = $data['current'] + $radio - 1; - if ($maxpage > $data['numpages']) { - $maxpage = $data['numpages']; - } - foreach (range($minpage, $maxpage) as $page) { - $tmp[$page] = $data['pages'][$page]; - } - $data['pages'] = $tmp; - $data['maxpages'] = $maxpages; - } else { - $data['maxpages'] = null; - } - - // Prev link - $prev = $from - $limit; - $data['prev'] = ($prev >= 0) ? $prev : null; - - // Next link - $next = $from + $limit; - $data['next'] = ($next < $numrows) ? $next : null; - - // Results remaining in next page & Last row to fetch - if ($data['current'] == $pages) { - $data['remain'] = 0; - $data['to'] = $numrows; - } else { - if ($data['current'] == ($pages - 1)) { - $data['remain'] = $numrows - ($limit*($pages-1)); - } else { - $data['remain'] = $limit; - } - $data['to'] = $data['current'] * $limit; - } - $data['numrows'] = $numrows; - $data['from'] = $from + 1; - $data['limit'] = $limit; - - return $data; - } -} Modified: trunk/lib/pear/DB/common.php =================================================================== --- trunk/lib/pear/DB/common.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/common.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -5,7 +5,7 @@ /** * Contains the DB_common base class * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: common.php 315557 2011年08月26日 14:32:35Z danielc $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -42,7 +42,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_common extends PEAR @@ -261,7 +261,7 @@ */ function quoteString($string) { - $string = $this->quote($string); + $string = $this->quoteSmart($string); if ($string{0} == "'") { return substr($string, 1, -1); } @@ -284,8 +284,7 @@ */ function quote($string = null) { - return ($string === null) ? 'NULL' - : "'" . str_replace("'", "''", $string) . "'"; + return $this->quoteSmart($string); } // }}} Modified: trunk/lib/pear/DB/dbase.php =================================================================== --- trunk/lib/pear/DB/dbase.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/dbase.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's dbase extension * for interacting with dBase databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: dbase.php 242771 2007年09月21日 13:40:42Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -41,7 +41,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_dbase extends DB_common Modified: trunk/lib/pear/DB/fbsql.php =================================================================== --- trunk/lib/pear/DB/fbsql.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/fbsql.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's fbsql extension * for interacting with FrontBase databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: fbsql.php 239211 2007年07月06日 05:19:21Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -41,7 +41,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB * @since Class functional since Release 1.7.0 */ Modified: trunk/lib/pear/DB/ibase.php =================================================================== --- trunk/lib/pear/DB/ibase.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/ibase.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -9,7 +9,7 @@ * While this class works with PHP 4, PHP's InterBase extension is * unstable in PHP 4. Use PHP 5. * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -23,7 +23,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: ibase.php 277804 2009年03月26日 07:16:31Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -49,7 +49,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB * @since Class became stable in Release 1.7.0 */ Modified: trunk/lib/pear/DB/ifx.php =================================================================== --- trunk/lib/pear/DB/ifx.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/ifx.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's ifx extension * for interacting with Informix databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: ifx.php 302738 2010年08月24日 03:06:52Z clockwerx $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -48,7 +48,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_ifx extends DB_common Deleted: trunk/lib/pear/DB/ldap.php =================================================================== --- trunk/lib/pear/DB/ldap.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/ldap.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -1,912 +0,0 @@ -<?php -// -// Pear DB LDAP - Database independent query interface definition -// for PHP's LDAP extension. -// -// Copyright (C) 2002 Ludovico Magnocavallo <lu...@su...> -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -// Contributors -// - Piotr Roszatycki <Pio...@ne...> -// DB_ldap::base() method, support for LDAP sequences, various fixes -// -// Based on DB 1.3 from the pear.php.net repository. -// The only modifications made have been modification of the include paths. -// -// From Pear CVS: Id: ldap.php,v 1.9 2002年02月11日 12:59:37 mj Exp - -require_once 'DB/common.php'; -define("DB_ERROR_BIND_FAILED", -26); -define("DB_ERROR_UNKNOWN_LDAP_ACTION", -27); - -/** - * LDAP result class - * - * LDAP_result extends DB_result to provide specific LDAP - * result methods. - * - * @version 1.0 - * @author Ludovico Magnocavallo <lu...@su...> - * @package DB - */ - -class LDAP_result extends DB_result -{ - - // {{{ properties - - /** - * data returned from ldap_entries() - * @access private - */ - var $_entries = null; - /** - * result rows as hash of records - * @access private - */ - var $_recordset = null; - /** - * current record as hash - * @access private - */ - var $_record = null; - - // }}} - // {{{ constructor - - /** - * class constructor, calls DB_result constructor - * @param ref $dbh reference to the db instance - * @param resource $result ldap command result - */ - function LDAP_result(&$dbh, $result) - { - $this->DB_result($dbh, $result); - } - - /** - * fetch rows of data into $this->_recordset - * - * called once as soon as something needs to be returned - * @access private - * @param resource $result ldap command result - * @return boolean true - */ - function getRows() { - if ($this->_recordset === null) { - // begin processing result into recordset - $this->_entries = ldap_get_entries($this->dbh->connection, $this->result); - $this->row_counter = $this->_entries['count']; - $i = 1; - $rs_template = array(); - if (count($this->dbh->attributes) > 0) { - reset($this->dbh->attributes); - while (list($a_index, $a_name) = each($this->dbh->attributes)) $rs_template[$a_name] = ''; - } - while (list($entry_idx, $entry) = each($this->_entries)) { - // begin first loop, iterate through entries - if (!empty($this->dbh->limit_from) && ($i < $this->dbh->limit_from)) continue; - if (!empty($this->dbh->limit_count) && ($i > $this->dbh->limit_count)) break; - $rs = $rs_template; - if (!is_array($entry)) continue; - while (list($attr, $attr_values) = each($entry)) { - // begin second loop, iterate through attributes - if (is_int($attr) || $attr == 'count') continue; - if (is_string($attr_values)) $rs[$attr] = $attr_values; - else { - $value = ''; - while (list($value_idx, $attr_value) = each($attr_values)) { - // begin third loop, iterate through attribute values - if (!is_int($value_idx)) continue; - if (empty($value)) $value = $attr_value; - else { - if (is_array($value)) $value[] = $attr_value; - else $value = array($value, $attr_value); - } -// else $value .= "\n$attr_value"; - // end third loop - } - $rs[$attr] = $value; - } - // end second loop - } - reset($rs); - $this->_recordset[$entry_idx] = $rs; - $i++; - // end first loop - } - $this->_entries = null; - if (!is_array($this->_recordset)) - $this->_recordset = array(); - if (!empty($this->dbh->sorting)) { - $sorting_method = (!empty($this->dbh->sorting_method) ? $this->dbh->sorting_method : 'cmp'); - uksort($this->_recordset, array(&$this, $sorting_method)); - } - reset($this->_recordset); - // end processing result into recordset - } - return DB_OK; - } - - - /** - * Fetch and return a row of data (it uses driver->fetchInto for that) - * @param int $fetchmode format of fetched row - * @param int $rownum the row number to fetch - * - * @return array a row of data, NULL on no more rows or PEAR_Error on error - * - * @access public - */ - function &fetchRow($fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) - { - $this->getRows(); - if (count($this->_recordset) == 0) return null; - if ($this->_record !== null) $this->_record = next($this->_recordset); - else $this->_record = current($this->_recordset); - $row = $this->_record; - return $row; - } - - - /** - * Fetch a row of data into an existing variable. - * - * @param mixed $arr reference to data containing the row - * @param integer $fetchmode format of fetched row - * @param integer $rownum the row number to fetch - * - * @return mixed DB_OK on success, NULL on no more rows or - * a DB_Error object on error - * - * @access public - */ - - function fetchInto(&$ar, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null) - { - $this->getRows(); - if ($this->_record !== null) $this->_record = next($this->_recordset); - else $this->_record = current($this->_recordset); - $ar = $this->_record; - if (!$ar) { - return null; - } - return DB_OK; - } - - /** - * return all records - * - * returns a hash of all records, basically returning - * a copy of $this->_recordset - * @param integer $fetchmode format of fetched row - * @param integer $rownum the row number to fetch (not used, here for interface compatibility) - * - * @return mixed DB_OK on success, NULL on no more rows or - * a DB_Error object on error - * - * @access public - */ - function fetchAll($fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null) - { - $this->getRows(); - return($this->_recordset); - } - - /** - * Get the the number of columns in a result set. - * - * @return int the number of columns, or a DB error - * - * @access public - */ - function numCols($result) - { - $this->getRows(); - return(count(array_keys($this->_record))); - } - - function cmp($a, $b) - { - return(strcmp(strtolower($this->_recordset[$a][$this->dbh->sorting]), strtolower($this->_recordset[$b][$this->dbh->sorting]))); - } - - /** - * Get the number of rows in a result set. - * - * @return int the number of rows, or a DB error - * - * @access public - */ - function numRows() - { - $this->getRows(); - return $this->row_counter; - } - - /** - * Get the next result if a batch of queries was executed. - * - * @return bool true if a new result is available or false if not. - * - * @access public - */ - function nextResult() - { - return $this->dbh->nextResult($this->result); - } - - /** - * Frees the resources allocated for this result set. - * @return int error code - * - * @access public - */ - function free() - { - $this->_recordset = null; - $this->_record = null; - ldap_free_result($this->result); - $this->result = null; - return true; - } - - /** - * @deprecated - */ - function tableInfo($mode = null) - { - return $this->dbh->tableInfo($this->result, $mode); - } - - /** - * returns the actual rows number - * @return integer - */ - function getRowCounter() - { - $this->getRows(); - return $this->row_counter; - } -} - -/** - * LDAP DB interface class - * - * LDAP extends DB_common to provide DB compliant - * access to LDAP servers - * - * @version 1.0 - * @author Ludovico Magnocavallo <lu...@su...> - * @package DB - */ - -class DB_ldap extends DB_common -{ - // {{{ properties - - /** - * LDAP connection - * @access private - */ - var $connection; - /** - * base dn - * @access private - */ - var $base = ''; - /** - * query base dn - * @access private - */ - var $q_base = ''; - /** - * array of LDAP actions that only manipulate data - * returning a true/false value - * @access private - */ - var $manip = array('add', 'compare', 'delete', 'modify', 'mod_add', 'mod_del', 'mod_replace', 'rename'); - /** - * store the real LDAP action to perform - * (ie PHP ldap function to call) for a query - * @access private - */ - var $q_action = ''; - /** - * store optional parameters passed - * to the real LDAP action - * @access private - */ - var $q_params = array(); - - // }}} - - /** - * Constructor, calls DB_common constructor - * - * @see DB_common::DB_common() - */ - function DB_ldap() - { - $this->DB_common(); - $this->phptype = 'ldap'; - $this->dbsyntax = 'ldap'; - $this->features = array( - 'prepare' => false, - 'pconnect' => false, - 'transactions' => false, - 'limit' => false - ); - } - - /** - * Connect and bind to LDAP server with either anonymous or authenticated bind depending on dsn info - * - * @param array $dsninfo dsn info as passed by DB::connect() - * @param boolean $persistent kept for interface compatibility - * @return DB_OK if successfully connected. A DB error code is returned on failure. - */ - function connect($dsninfo, $persistent = false) - { - if (!DB::assertExtension('ldap')) - return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); - - $this->dsn = $dsninfo; - $user = $dsninfo['username']; - $pw = $dsninfo['password']; - $host = $dsninfo['hostspec']; - $this->base = $dsninfo['database']; - - if ($host) { - $conn = ldap_connect($host); - } else { - return $this->raiseError("unknown host $host"); - } - if (!$conn) { - return $this->raiseError(DB_ERROR_CONNECT_FAILED); - } - if ($user && $pw) { - $bind = ldap_bind($conn, "${user}," . $this->base, $pw); - } else { - $bind = ldap_bind($conn); - } - if (!$bind) { - return $this->raiseError(DB_ERROR_BIND_FAILED); - } - $this->connection = $conn; - return DB_OK; - } - - /** - * Unbinds from LDAP server - * - * @return int ldap_unbind() return value - */ - function disconnect() - { - $ret = @ldap_unbind($this->connection); - $this->connection = null; - return $ret; - } - - - /** - * Performs a request against the LDAP server - * - * The type of request (and the corresponding PHP ldap function called) - * depend on two additional parameters, added in respect to the - * DB_common interface. - * - * @param string $filter text of the request to send to the LDAP server - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @return result from ldap function or DB Error object if no result - */ - function simpleQuery($filter, $action = null, $params = null) - { - if ($action === null) { - $action = (!empty($this->q_action) ? $this->q_action : 'search'); - } - if ($params === null) { - $params = (count($this->q_params) > 0 ? $this->q_params : array()); - } - if (!$this->isManip($action)) { - $base = $this->q_base ? $this->q_base : $this->base; - $attributes = array(); - $attrsonly = 0; - $sizelimit = 0; - $timelimit = 0; - $deref = LDAP_DEREF_NEVER; - $sorting = ''; - $sorting_method = ''; - reset($params); - while (list($k, $v) = each($params)) { - if (isset(${$k})) ${$k} = $v; - } - $this->sorting = $sorting; - $this->sorting_method = $sorting_method; - $this->attributes = $attributes; - if ($action == 'search') - $result = @ldap_search($this->connection, $base, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref); - else if ($action == 'list') - $result = @ldap_list($this->connection, $base, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref); - else if ($action == 'read') - $result = @ldap_read($this->connection, $base, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref); - else - return $this->raiseError(DB_ERROR_UNKNOWN_LDAP_ACTION); - if (!$result) { - return $this->raiseError(); - } - } else { - # If first argument is an array, it contains the entry with DN. - if (is_array($filter)) { - $entry = $filter; - $filter = $entry["dn"]; - } else { - $entry = array(); - } - unset($entry["dn"]); - $attribute = ''; - $value = ''; - $newrdn = ''; - $newparent = ''; - $deleteoldrdn = false; - reset($params); - while (list($k, $v) = each($params)) { - if (isset(${$k})) ${$k} = $v; - } - if ($action == 'add') - $result = @ldap_add($this->connection, $filter, $entry); - else if ($action == 'compare') - $result = @ldap_add($this->connection, $filter, $attribute, $value); - else if ($action == 'delete') - $result = @ldap_delete($this->connection, $filter); - else if ($action == 'modify') - $result = @ldap_modify($this->connection, $filter, $entry); - else if ($action == 'mod_add') - $result = @ldap_mod_add($this->connection, $filter, $entry); - else if ($action == 'mod_del') - $result = @ldap_mod_del($this->connection, $filter, $entry); - else if ($action == 'mod_replace') - $result = @ldap_mod_replace($this->connection, $filter, $entry); - else if ($action == 'rename') - $result = @ldap_rename($this->connection, $filter, $newrdn, $newparent, $deleteoldrdn); - else - return $this->raiseError(DB_ERROR_UNKNOWN_LDAP_ACTION); - if (!$result) { - return $this->raiseError(); - } - } - $this->freeQuery(); - return $result; - } - - /** - * Executes a query performing variables substitution in the query text - * - * @param string $stmt text of the request to send to the LDAP server - * @param array $data query variables values to substitute - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @return LDAP_result object or DB Error object if no result - * @see DB_common::executeEmulateQuery $this->simpleQuery() - */ - function execute($stmt, $data = false, $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - $realquery = $this->executeEmulateQuery($stmt, $data); - if (DB::isError($realquery)) { - return $realquery; - } - $result = $this->simpleQuery($realquery); - if (DB::isError($result) || $result === DB_OK) { - return $result; - } else { - return new LDAP_result($this, $result); - } - } - - /** - * Executes multiple queries performing variables substitution for each query - * - * @param string $stmt text of the request to send to the LDAP server - * @param array $data query variables values to substitute - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @return LDAP_result object or DB Error object if no result - * @see DB_common::executeMultiple - */ - function executeMultiple($stmt, &$data, $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - return(parent::executeMultiple($stmt, $data)); - } - - /** - * Executes a query substituting variables if any are present - * - * @param string $query text of the request to send to the LDAP server - * @param array $data query variables values to substitute - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @return LDAP_result object or DB Error object if no result - * @see DB_common::prepare() $this->execute()$this->simpleQuery() - */ - function &query($query, $data = array(), $action = 'search', $params = array()) { - $this->q_action = $action; - $this->q_params = $params; - if (sizeof($data) > 0) { - $sth = $this->prepare($query); - if (DB::isError($sth)) { - return $sth; - } - return $this->execute($sth, $data); - } else { - $result = $this->simpleQuery($query); - if (DB::isError($result) || $result === DB_OK) { - return $result; - } else { - return new LDAP_result($this, $result); - } - } - } - - /** - * Modifies a query to return only a set of rows, stores $from and $count for LDAP_result - * - * @param string $query text of the request to send to the LDAP server - * @param int $from record position from which to start returning data - * @param int $count number of records to return - * @return modified query text (no modifications are made, see above) - */ - function modifyLimitQuery($query, $from, $count) - { - $this->limit_from = $from; - $this->limit_count = $count; - return $query; - } - - /** - * Executes a query returning only a specified number of rows - * - * This method only saves the $from and $count parameters for LDAP_result - * where the actual records processing takes place - * - * @param string $query text of the request to send to the LDAP server - * @param int $from record position from which to start returning data - * @param int $count number of records to return - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @return LDAP_result object or DB Error object if no result - */ - function limitQuery($query, $from, $count, $action = 'search', $params = array()) - { - $query = $this->modifyLimitQuery($query, $from, $count); - $this->q_action = $action; - $this->q_params = $params; - return $this->query($query, $action, $params); - } - - /** - * Fetch the first column of the first row of data returned from - * a query. Takes care of doing the query and freeing the results - * when finished. - * - * @param $query the SQL query - * @param $data if supplied, prepare/execute will be used - * with this array as execute parameters - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @return array - * @see DB_common::getOne() - * @access public - */ - function &getOne($query, $data = array(), $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - return(parent::getOne($query, $data)); - } - - /** - * Fetch the first row of data returned from a query. Takes care - * of doing the query and freeing the results when finished. - * - * @param $query the SQL query - * @param $fetchmode the fetch mode to use - * @param $data array if supplied, prepare/execute will be used - * with this array as execute parameters - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @access public - * @return array the first row of results as an array indexed from - * 0, or a DB error code. - * @see DB_common::getRow() - * @access public - */ - function &getRow($query, - $data = null, - $fetchmode = DB_FETCHMODE_DEFAULT, - $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - return(parent::getRow($query, $data, $fetchmode)); - } - - /** - * Fetch the first column of data returned from a query. Takes care - * of doing the query and freeing the results when finished. - * - * @param $query the SQL query - * @param $col which column to return (integer [column number, - * starting at 0] or string [column name]) - * @param $data array if supplied, prepare/execute will be used - * with this array as execute parameters - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @access public - * @return array an indexed array with the data from the first - * row at index 0, or a DB error code. - * @see DB_common::getCol() - * @access public - */ - function &getCol($query, $col = 0, $data = array(), $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - return(parent::getCol($query, $col, $data)); - } - - /** - * Calls DB_common::getAssoc() - * - * @param $query the SQL query - * @param $force_array (optional) used only when the query returns - * exactly two columns. If true, the values of the returned array - * will be one-element arrays instead of scalars. - * starting at 0] or string [column name]) - * @param array $data if supplied, prepare/execute will be used - * with this array as execute parameters - * @param $fetchmode the fetch mode to use - * @param boolean $group see DB_Common::getAssoc() - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @access public - * @return array an indexed array with the data from the first - * row at index 0, or a DB error code. - * @see DB_common::getAssoc() - * @access public - */ - function &getAssoc($query, $force_array = false, $data = array(), - $fetchmode = DB_FETCHMODE_ORDERED, $group = false, - $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - return(parent::getAssoc($query, $force_array, $data, $fetchmode, $group)); - } - - /** - * Fetch all the rows returned from a query. - * - * @param $query the SQL query - * @param array $data if supplied, prepare/execute will be used - * with this array as execute parameters - * @param $fetchmode the fetch mode to use - * @param string $action type of request to perform, defaults to search (ldap_search()) - * @param array $params array of additional parameters to pass to the PHP ldap function requested - * @access public - * @return array an nested array, or a DB error - * @see DB_common::getAll() - */ - function &getAll($query, - $data = null, - $fetchmode = DB_FETCHMODE_DEFAULT, - $action = 'search', $params = array()) - { - $this->q_action = $action; - $this->q_params = $params; - return(parent::getAll($query, $data, $fetchmode)); - } - - function numRows($result) - { - return $result->numRows(); - } - - function getTables() - { - return $this->raiseError(DB_ERROR_NOT_CAPABLE); - } - - function getListOf($type) - { - return $this->raiseError(DB_ERROR_NOT_CAPABLE); - } - - function isManip($action) - { - return(in_array($action, $this->manip)); - } - - function freeResult() - { - return true; - } - - function freeQuery($query = '') - { - $this->q_action = ''; - $this->q_base = ''; - $this->q_params = array(); - $this->attributes = null; - $this->sorting = ''; - return true; - } - - function base($base = null) - { - $this->q_base = ($base !== null) ? $base : null; - return true; - } - - /** - * Get the next value in a sequence. - * - * LDAP provides transactions for only one entry and we need to - * prevent race condition. If unique value before and after modify - * aren't equal then wait and try again. - * - * The name of sequence is LDAP DN of entry. - * - * @access public - * @param string $seq_name the DN of the sequence - * @param bool $ondemand whether to create the sequence on demand - * @return a sequence integer, or a DB error - */ - function nextId($seq_name, $ondemand = true) - { - $repeat = 0; - do { - // Get the sequence entry - $this->base($seq_name); - $this->pushErrorHandling(PEAR_ERROR_RETURN); - $data = $this->getRow("objectClass=*"); - $this->popErrorHandling(); - - if (DB::isError($data)) { - // DB_ldap doesn't use DB_ERROR_NOT_FOUND - if ($ondemand && $repeat == 0 - && $data->getCode() == DB_ERROR) { - // Try to create sequence and repeat - $repeat = 1; - $data = $this->createSequence($seq_name); - if (DB::isError($data)) { - return $this->raiseError($data); - } - } else { - // Other error - return $this->raiseError($data); - } - } else { - // Increment sequence value - $data["cn"]++; - // Unique identificator of transaction - $seq_unique = mt_rand(); - $data["uid"] = $seq_unique; - // Modify the LDAP entry - $this->pushErrorHandling(PEAR_ERROR_RETURN); - $data = $this->simpleQuery($data, 'modify'); - $this->popErrorHandling(); - if (DB::isError($data)) { - return $this->raiseError($data); - } - // Get the entry and check if it contains our unique value - $this->base($seq_name); - $data = $this->getRow("objectClass=*"); - if (DB::isError($data)) { - return $this->raiseError($data); - } - if ($data["uid"] != $seq_unique) { - // It is not our entry. Wait a little time and repeat - sleep(1); - $repeat = 1; - } else { - $repeat = 0; - } - } - } while ($repeat); - - if (DB::isError($data)) { - return $data; - } - return $data["cn"]; - } - - /** - * Create the sequence - * - * The sequence entry is based on core schema with extensibleObject, - * so it should work with any LDAP server which doesn't check schema - * or supports extensibleObject object class. - * - * Sequence name have to be DN started with "sn=$seq_id,", i.e.: - * - * $seq_name = "sn=uidNumber,ou=sequences,dc=php,dc=net"; - * - * dn: $seq_name - * objectClass: top - * objectClass: extensibleObject - * sn: $seq_id - * cn: $seq_value - * uid: $seq_uniq - * - * @param string $seq_name the DN of the sequence - * @return mixed DB_OK on success or DB error on error - * @access public - */ - function createSequence($seq_name) - { - // Extract $seq_id from DN - ereg("^([^,]*),", $seq_name, $regs); - $seq_id = $regs[1]; - - // Create the sequence entry - $data = array( - dn => $seq_name, - objectclass => array("top", "extensibleObject"), - sn => $seq_id, - cn => 0, - uid => 0 - ); - - // Add the LDAP entry - $this->pushErrorHandling(PEAR_ERROR_RETURN); - $data = $this->simpleQuery($data, 'add'); - $this->popErrorHandling(); - return $data; - } - - /** - * Drop a sequence - * - * @param string $seq_name the DN of the sequence - * @return mixed DB_OK on success or DB error on error - * @access public - */ - function dropSequence($seq_name) - { - // Delete the sequence entry - $data = array( - dn => $seq_name, - ); - $this->pushErrorHandling(PEAR_ERROR_RETURN); - $data = $this->simpleQuery($data, 'delete'); - $this->popErrorHandling(); - return $data; - } - -} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ Modified: trunk/lib/pear/DB/msql.php =================================================================== --- trunk/lib/pear/DB/msql.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/msql.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -10,7 +10,7 @@ * 4.3.11 and 5.0.4. Make sure your version of PHP meets or exceeds * those versions. * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -23,7 +23,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: msql.php 242771 2007年09月21日 13:40:42Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -47,7 +47,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB * @since Class not functional until Release 1.7.0 */ Modified: trunk/lib/pear/DB/mssql.php =================================================================== --- trunk/lib/pear/DB/mssql.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/mssql.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's mssql extension * for interacting with Microsoft SQL Server databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: mssql.php 306603 2010年12月24日 06:05:07Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -49,7 +49,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_mssql extends DB_common Modified: trunk/lib/pear/DB/mysql.php =================================================================== --- trunk/lib/pear/DB/mysql.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/mysql.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's mysql extension * for interacting with MySQL databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: mysql.php 242769 2007年09月21日 13:32:52Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -41,7 +41,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_mysql extends DB_common @@ -773,17 +773,6 @@ } // }}} - // {{{ quote() - - /** - * @deprecated Deprecated in release 1.6.0 - */ - function quote($str) - { - return $this->quoteSmart($str); - } - - // }}} // {{{ escapeSimple() /** Modified: trunk/lib/pear/DB/mysqli.php =================================================================== --- trunk/lib/pear/DB/mysqli.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/mysqli.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's mysqli extension * for interacting with MySQL databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -19,7 +19,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: mysqli.php 315557 2011年08月26日 14:32:35Z danielc $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -43,7 +43,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB * @since Class functional since Release 1.6.3 */ Modified: trunk/lib/pear/DB/oci8.php =================================================================== --- trunk/lib/pear/DB/oci8.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/oci8.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's oci8 extension * for interacting with Oracle databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: oci8.php 293241 2010年01月08日 05:00:28Z danielc $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -47,7 +47,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_oci8 extends DB_common Modified: trunk/lib/pear/DB/odbc.php =================================================================== --- trunk/lib/pear/DB/odbc.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/odbc.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's odbc extension * for interacting with databases via ODBC connections * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -20,7 +20,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: odbc.php 239211 2007年07月06日 05:19:21Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -44,7 +44,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_odbc extends DB_common @@ -481,18 +481,6 @@ } // }}} - // {{{ quote() - - /** - * @deprecated Deprecated in release 1.6.0 - * @internal - */ - function quote($str) - { - return $this->quoteSmart($str); - } - - // }}} // {{{ nextId() /** Modified: trunk/lib/pear/DB/pgsql.php =================================================================== --- trunk/lib/pear/DB/pgsql.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/pgsql.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's pgsql extension * for interacting with PostgreSQL databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -21,7 +21,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: pgsql.php 306604 2010年12月24日 06:09:35Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -43,7 +43,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_pgsql extends DB_common @@ -466,18 +466,6 @@ } // }}} - // {{{ quote() - - /** - * @deprecated Deprecated in release 1.6.0 - * @internal - */ - function quote($str) - { - return $this->quoteSmart($str); - } - - // }}} // {{{ quoteBoolean() /** Modified: trunk/lib/pear/DB/sqlite.php =================================================================== --- trunk/lib/pear/DB/sqlite.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/sqlite.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's sqlite extension * for interacting with SQLite databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -21,7 +21,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 3.0 - * @version CVS: $Id: sqlite.php 306605 2010年12月24日 06:22:59Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -47,7 +47,7 @@ * @author Daniel Convissor <da...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_sqlite extends DB_common Modified: trunk/lib/pear/DB/storage.php =================================================================== --- trunk/lib/pear/DB/storage.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/storage.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -5,7 +5,7 @@ /** * Provides an object interface to a table row * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is available through the world-wide-web at the following URI: @@ -18,7 +18,7 @@ * @author Stig Bakken <st...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: storage.php 241120 2007年08月12日 05:27:25Z aharvey $ + * @version CVS: $Id$ * @link http://pear.php.net/package/DB */ @@ -38,7 +38,7 @@ * @author Stig Bakken <st...@ph...> * @copyright 1997-2007 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.7.14 + * @version Release: 1.8.2 * @link http://pear.php.net/package/DB */ class DB_storage extends PEAR Modified: trunk/lib/pear/DB/sybase.php =================================================================== --- trunk/lib/pear/DB/sybase.php 2015年03月03日 15:25:24 UTC (rev 9587) +++ trunk/lib/pear/DB/sybase.php 2015年03月03日 15:33:34 UTC (rev 9588) @@ -6,7 +6,7 @@ * The PEAR DB driver for PHP's sybase extension * for interacting with Sybase databases * - * PHP versions 4 and 5 + * PHP version 5 * * LICENSE: This source file is subject to version 3.0 of the PHP license * that is availabl... [truncated message content]
Revision: 9587 http://sourceforge.net/p/phpwiki/code/9587 Author: vargenau Date: 2015年03月03日 15:25:24 +0000 (2015年3月03日) Log Message: ----------- Align prototype for functions _getValue, _getSortableValue, format Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiTranslation.php trunk/lib/wikilens/PageListColumns.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/PageList.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -62,7 +62,7 @@ } } - function format($pagelist, $page_handle, &$revision_handle) + function format($pagelist, $page_handle, $revision_handle) { return HTML::td($this->_tdattr, $this->_getValue($page_handle, $revision_handle)); @@ -197,7 +197,7 @@ * @param WikiDB_PageRevision $revision_handle * @return mixed */ - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { if ($this->_need_rev) { if (!$revision_handle) @@ -214,7 +214,7 @@ * @param WikiDB_PageRevision $revision_handle * @return int|string */ - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { $val = $this->_getValue($page_handle, $revision_handle); if ($this->_field == 'hits') @@ -241,13 +241,13 @@ class _PageList_Column_size extends _PageList_Column { - function format($pagelist, $page_handle, &$revision_handle) + function format($pagelist, $page_handle, $revision_handle) { return HTML::td($this->_tdattr, $this->_getValuePageList($pagelist, $page_handle, $revision_handle)); } - function _getValuePageList($pagelist, $page_handle, &$revision_handle) + function _getValuePageList($pagelist, $page_handle, $revision_handle) { if (!$revision_handle or (!$revision_handle->_data['%content'] or $revision_handle->_data['%content'] === true) @@ -262,7 +262,7 @@ return $size; } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { if (!$revision_handle) $revision_handle = $page_handle->getCurrentRevision(true); @@ -286,7 +286,7 @@ $this->_textIfFalse = new RawXml('—'); //mdash } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { //FIXME: check if $this is available in the parent (->need_rev) $val = parent::_getValue($page_handle, $revision_handle); @@ -308,7 +308,7 @@ parent::__construct($field, $heading, 'center'); } - function _getValuePageList($pagelist, $page_handle, &$revision_handle) + function _getValuePageList($pagelist, $page_handle, $revision_handle) { $pagename = $page_handle->getName(); $selected = !empty($pagelist->_selected[$pagename]); @@ -327,7 +327,7 @@ } } - function format($pagelist, $page_handle, &$revision_handle) + function format($pagelist, $page_handle, $revision_handle) { return HTML::td($this->_tdattr, $this->_getValuePageList($pagelist, $page_handle, $revision_handle)); @@ -350,13 +350,13 @@ $this->WikiTheme = &$WikiTheme; } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $time = parent::_getValue($page_handle, $revision_handle); return $this->WikiTheme->formatDateTime($time); } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return parent::_getValue($page_handle, $revision_handle); } @@ -364,7 +364,7 @@ class _PageList_Column_version extends _PageList_Column { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { if (!$revision_handle) $revision_handle = $page_handle->getCurrentRevision(); @@ -396,7 +396,7 @@ } } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { if (!$revision_handle or (!$revision_handle->_data['%content'] or $revision_handle->_data['%content'] === true) @@ -465,7 +465,7 @@ true)); } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { if (is_object($page_handle) and !empty($page_handle->score)) return $page_handle->score; @@ -488,7 +488,7 @@ $this->dbi =& $request->getDbh(); } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $author = parent::_getValue($page_handle, $revision_handle); if ($this->dbi->isWikiPage($author)) @@ -497,7 +497,7 @@ return $author; } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return parent::_getValue($page_handle, $revision_handle); } @@ -505,7 +505,7 @@ class _PageList_Column_owner extends _PageList_Column_author { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $author = $page_handle->getOwner(); if ($this->dbi->isWikiPage($author)) @@ -514,7 +514,7 @@ return $author; } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return parent::_getValue($page_handle, $revision_handle); } @@ -522,7 +522,7 @@ class _PageList_Column_creator extends _PageList_Column_author { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $author = $page_handle->getCreator(); if ($this->dbi->isWikiPage($author)) @@ -531,7 +531,7 @@ return $author; } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return parent::_getValue($page_handle, $revision_handle); } @@ -548,7 +548,7 @@ $this->dbi = &$request->getDbh(); } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { if ($this->dbi->isWikiPage($page_handle->getName())) return WikiLink($page_handle, 'known'); @@ -556,7 +556,7 @@ return WikiLink($page_handle, 'unknown'); } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return $page_handle->getName(); } @@ -572,7 +572,7 @@ class _PageList_Column_perm extends _PageList_Column { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $perm_array = pagePermissions($page_handle->_pagename); return pagePermissionsSimpleFormat($perm_array, @@ -583,7 +583,7 @@ class _PageList_Column_acl extends _PageList_Column { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $perm_tree = pagePermissions($page_handle->_pagename); @@ -875,7 +875,7 @@ * Take a PageList_Page object, and return an HTML object to display * it in a table or list row. */ - private function renderPageRow(&$page_handle, $i = 0) + private function renderPageRow($page_handle, $i = 0) { $page_handle = $this->getPageFromHandle($page_handle); //FIXME. only on sf.net Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/BackLinks.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -192,7 +192,7 @@ // how many links from this backLink to other pages class _PageList_Column_BackLinks_count extends _PageList_Column { - function _getValue($page, &$revision_handle) + function _getValue($page, $revision_handle) { $iter = $page->getPageLinks(); $count = $iter->count(); Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/FullTextSearch.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -171,7 +171,7 @@ $this->_PageList_Column($params[0], $params[1], $params[2]); } - function _getValue(&$page, $revision_handle) + function _getValue($page, $revision_handle) { $pagename = $page->getName(); $count = count($this->parentobj->_wpagelist[$pagename]); Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/LinkDatabase.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -213,7 +213,7 @@ class _PageList_Column_LinkDatabase_links extends _PageList_Column { - function _getValue($page, &$revision_handle) + function _getValue($page, $revision_handle) { $out = HTML(); $links = $page->getPageLinks(); Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/LinkSearch.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -179,7 +179,7 @@ $this->_pagelist =& $pagelist; } - function _getValue(&$page, $revision_handle) + function _getValue($page, $revision_handle) { if (is_object($page)) $text = $page->getName(); else $text = $page; Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/ListPages.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -143,7 +143,7 @@ return $this->_PageList_Column($field, $display, 'center'); } - function _getValue($page, &$revision_handle) + function _getValue($page, $revision_handle) { $iter = $page->getLinks($this->_direction); $count = $iter->count(); Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/ListSubpages.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -125,7 +125,7 @@ // how many backlinks for this subpage class _PageList_Column_ListSubpages_count extends _PageList_Column { - function _getValue($page, &$revision_handle) + function _getValue($page, $revision_handle) { $iter = $page->getBackLinks(); $count = $iter->count(); Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/SemanticSearch.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -445,7 +445,7 @@ $this->_pagelist =& $pagelist; } - function _getValue(&$page, $revision_handle) + function _getValue($page, $revision_handle) { $link = $this->_pagelist->_links[$this->current_row]; return WikiLink($link['linkname'], 'if_known'); @@ -455,7 +455,7 @@ class _PageList_Column_SemanticSearch_link extends _PageList_Column_SemanticSearch_relation { - function _getValue(&$page, $revision_handle) + function _getValue($page, $revision_handle) { $link = $this->_pagelist->_links[$this->current_row]; if ($this->_field != 'value') Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/WantedPages.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -164,7 +164,7 @@ $this->_PageList_Column($params[0], $params[1], $params[2]); } - function _getValue(&$page, $revision_handle) + function _getValue($page, $revision_handle) { $html = false; $pagename = $page->getName(); @@ -189,7 +189,7 @@ $this->_PageList_Column($params[0], $params[1], $params[2]); } - function _getValue(&$page, $revision_handle) + function _getValue($page, $revision_handle) { $pagename = $page->getName(); $count = count($this->parentobj->_wpagelist[$pagename]); Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/WikiAdminRemove.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -247,7 +247,7 @@ class _PageList_Column_remove extends _PageList_Column { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { return Button(array('action' => 'remove'), _("Remove"), $page_handle->getName()); Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/WikiAdminRename.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -312,7 +312,7 @@ // moved from lib/PageList.php class _PageList_Column_renamed_pagename extends _PageList_Column { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { global $request; $post_args = $request->getArg('admin_rename'); Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/WikiAdminUtils.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -312,7 +312,7 @@ class _PageList_Column_email extends _PageList_Column { - function _getValue(&$prefs, $dummy) + function _getValue($prefs, $dummy) { return $prefs->get('email'); } @@ -321,7 +321,7 @@ class _PageList_Column_emailVerified extends _PageList_Column { - function _getValue(&$prefs, $status) + function _getValue($prefs, $status) { $name = $prefs->get('userid'); $input = HTML::input(array('type' => 'checkbox', Modified: trunk/lib/plugin/WikiTranslation.php =================================================================== --- trunk/lib/plugin/WikiTranslation.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/plugin/WikiTranslation.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -516,7 +516,7 @@ $this->_PageList_Column_base($this->_field); } - function _getValue($page, &$revision_handle) + function _getValue($page, $revision_handle) { if (is_object($page)) $text = $page->getName(); else $text = $page; Modified: trunk/lib/wikilens/PageListColumns.php =================================================================== --- trunk/lib/wikilens/PageListColumns.php 2015年03月02日 17:27:12 UTC (rev 9586) +++ trunk/lib/wikilens/PageListColumns.php 2015年03月03日 15:25:24 UTC (rev 9587) @@ -43,13 +43,13 @@ */ class _PageList_Column_numbacklinks extends _PageList_Column_custom { - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $theIter = $page_handle->getBackLinks(); return $theIter->count(); } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return $this->_getValue($page_handle, $revision_handle); } @@ -64,7 +64,7 @@ $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies'); } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { global $request; @@ -97,7 +97,7 @@ $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies'); } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { global $request, $WikiTheme; @@ -121,7 +121,7 @@ $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies'); } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { global $request, $WikiTheme; @@ -164,7 +164,7 @@ if (!$this->_dimension) $this->_dimension = 0; } - function format($pagelist, $page_handle, &$revision_handle) + function format($pagelist, $page_handle, $revision_handle) { /** * @var WikiRequest $request @@ -188,7 +188,7 @@ return $td; } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $pagename = $page_handle->getName(); @@ -215,7 +215,7 @@ } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return $this->_getValue($page_handle, $revision_handle); } @@ -235,7 +235,7 @@ if (!$this->_dimension) $this->_dimension = 0; } - function format($pagelist, $page_handle, &$revision_handle) + function format($pagelist, $page_handle, $revision_handle) { $plugin = new WikiPlugin_RateIt(); if (defined('FUSIONFORGE') && FUSIONFORGE) { @@ -250,7 +250,7 @@ return $td; } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { global $request; @@ -268,7 +268,7 @@ } } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return $this->_getValue($page_handle, $revision_handle); } @@ -294,7 +294,7 @@ $this->_users = $this->_pagelist->getOption('users'); } - function format($pagelist, $page_handle, &$revision_handle) + function format($pagelist, $page_handle, $revision_handle) { $pred = $this->_getValue($page_handle, $revision_handle); $mean = $this->_active_ratings_user->mean_rating($this->_dimension); @@ -310,7 +310,7 @@ return $td; } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $pagename = $page_handle->getName(); @@ -318,7 +318,7 @@ return sprintf("%.1f", min(5, max(0, $pred))); } - function _getSortableValue($page_handle, &$revision_handle) + function _getSortableValue($page_handle, $revision_handle) { return $this->_getValue($page_handle, $revision_handle); } @@ -352,7 +352,7 @@ } } - function _getValue($page_handle, &$revision_handle) + function _getValue($page_handle, $revision_handle) { $ratings = $this->_active_ratings_user->get_ratings(); $iter = $page_handle->getLinks(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9586 http://sourceforge.net/p/phpwiki/code/9586 Author: vargenau Date: 2015年03月02日 17:27:12 +0000 (2015年3月02日) Log Message: ----------- Fix crash with use of "-" in search Modified Paths: -------------- trunk/lib/TextSearchQuery.php Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2015年03月02日 17:21:46 UTC (rev 9585) +++ trunk/lib/TextSearchQuery.php 2015年03月02日 17:27:12 UTC (rev 9586) @@ -244,7 +244,7 @@ // TODO: "such a phrase" switch ($node->_op) { case TSQ_TOK_NOT: - return "!" . $node->leaves[0]; + return "!" . $node->leaves[0]->word; case TSQ_TOK_BINOP: $subclauses = array(); foreach ($node->leaves as $leaf) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9585 http://sourceforge.net/p/phpwiki/code/9585 Author: vargenau Date: 2015年03月02日 17:21:46 +0000 (2015年3月02日) Log Message: ----------- Remove assertions Modified Paths: -------------- trunk/lib/InlineParser.php Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2015年03月02日 17:20:45 UTC (rev 9584) +++ trunk/lib/InlineParser.php 2015年03月02日 17:21:46 UTC (rev 9585) @@ -453,9 +453,7 @@ function markup($match) { - $link = LinkBracketLink($match); - assert($link->isInlineElement()); - return $link; + return LinkBracketLink($match); } } @@ -465,9 +463,7 @@ function markup($match) { - $link = LinkBracketLink($match); - assert($link->isInlineElement()); - return $link; + return LinkBracketLink($match); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 9584 http://sourceforge.net/p/phpwiki/code/9584 Author: vargenau Date: 2015年03月02日 17:20:45 +0000 (2015年3月02日) Log Message: ----------- Remove unused function __getRelation Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2015年03月02日 17:19:09 UTC (rev 9583) +++ trunk/lib/CachedMarkup.php 2015年03月02日 17:20:45 UTC (rev 9584) @@ -25,7 +25,6 @@ class CacheableMarkup extends XmlContent { - function __construct($content, $basepage) { $this->_basepage = $basepage; @@ -294,11 +293,6 @@ { return $this->_url; } - - function __getRelation($basepage) - { - return $this->_relation; - } } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.