Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2012-11-19 16:59:13
|
Revision: 8490
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8490&view=rev
Author: vargenau
Date: 2012-11-19 16:58:59 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Remove extra empty lines
Modified Paths:
--------------
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiSVG.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FrameInclude.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GoTo.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GooglePlugin.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/HelloWorld.php
trunk/lib/plugin/Imdb.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/NoCache.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageDump.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PageInfo.php
trunk/lib/plugin/PageTrail.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/plugin/PhpWeather.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/PopUp.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/Processing.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SearchHighlight.php
trunk/lib/plugin/SemanticRelations.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SqlResult.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/Transclude.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/Video.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiForm.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/YouTube.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_PreferencesInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/_WikiTranslation.php
trunk/lib/plugin/text2png.php
Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AddComment.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -142,8 +142,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AllUsers.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -111,8 +111,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AppendText.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -153,8 +153,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AsciiSVG.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -87,8 +87,6 @@
}
}
-
-
class AsciiSVG_HTML extends HtmlElement
{
function startTag()
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AuthorHistory.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -221,8 +221,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/BackLinks.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -176,8 +176,6 @@
}
-
-
// how many links from this backLink to other pages
class _PageList_Column_BackLinks_count extends _PageList_Column
{
Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/BlogArchives.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -150,8 +150,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/BlogJournal.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -108,8 +108,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Calendar.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -246,8 +246,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CalendarList.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -226,8 +226,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/CategoryPage.php
===================================================================
--- trunk/lib/plugin/CategoryPage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CategoryPage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -82,8 +82,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Chart.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -154,8 +154,6 @@
}
}
-
-
class SVG_HTML extends HtmlElement
{
function startTag()
Modified: trunk/lib/plugin/Comment.php
===================================================================
--- trunk/lib/plugin/Comment.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Comment.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -60,8 +60,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CreateBib.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -158,8 +158,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CreatePage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -150,8 +150,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CreateToc.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -528,8 +528,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CurrentTime.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -85,8 +85,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/DeadEndPages.php
===================================================================
--- trunk/lib/plugin/DeadEndPages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/DeadEndPages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -33,8 +33,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Diff.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -169,7 +169,6 @@
}
$html->pushContent($otherdiffs);
-
if ($old and $old->getVersion() == 0)
$old = false;
@@ -202,8 +201,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/DynamicIncludePage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -97,8 +97,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ExternalSearch.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -154,8 +154,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FacebookLike.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -76,8 +76,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FileInfo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -351,8 +351,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FrameInclude.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -148,8 +148,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FullTextSearch.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -153,8 +153,6 @@
}
}
-
-
/*
* List of Links and link to ListLinks
*/
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FuzzyPages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -157,7 +157,6 @@
return $table;
}
-
function run($dbi, $argstr, &$request, $basepage)
{
$args = $this->getArgs($argstr, $request);
@@ -200,8 +199,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GoTo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -88,8 +88,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GoogleMaps.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -157,8 +157,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/GooglePlugin.php
===================================================================
--- trunk/lib/plugin/GooglePlugin.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GooglePlugin.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -126,8 +126,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GraphViz.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -464,8 +464,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/HelloWorld.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -72,8 +72,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Imdb.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -109,8 +109,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/IncludePage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -212,8 +212,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/IncludePages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -86,8 +86,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/JabberPresence.php
===================================================================
--- trunk/lib/plugin/JabberPresence.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/JabberPresence.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -74,8 +74,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LdapSearch.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -205,8 +205,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LikePages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -116,8 +116,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LinkDatabase.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -182,8 +182,6 @@
}
}
-
-
class _PageList_Column_LinkDatabase_links extends _PageList_Column
{
function _getValue($page, &$revision_handle)
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LinkSearch.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -165,8 +165,6 @@
}
}
-
-
// FIXME: sortby errors with this column
class _PageList_Column_LinkSearch_link
extends _PageList_Column
Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ListPages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -132,8 +132,6 @@
}
}
-
-
// how many back-/forwardlinks for this page
class _PageList_Column_ListPages_count extends _PageList_Column
{
Modified: trunk/lib/plugin/ListRelations.php
===================================================================
--- trunk/lib/plugin/ListRelations.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ListRelations.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -62,8 +62,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ListSubpages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -113,8 +113,6 @@
}
}
-
-
// how many backlinks for this subpage
class _PageList_Column_ListSubpages_count extends _PageList_Column
{
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ModeratedPage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -458,8 +458,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/MostPopular.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -102,8 +102,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/NewPagesPerUser.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -136,8 +136,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/NoCache.php
===================================================================
--- trunk/lib/plugin/NoCache.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/NoCache.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -61,8 +61,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/OldStyleTable.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -153,8 +153,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/OrphanedPages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -98,8 +98,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageDump.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -319,8 +319,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageGroup.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -203,8 +203,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageHistory.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -353,8 +353,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageInfo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -71,8 +71,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageTrail.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -93,8 +93,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PasswordReset.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -195,8 +195,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PhotoAlbum.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -669,8 +669,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PhpHighlight.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -182,8 +182,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PhpWeather.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -197,8 +197,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Ploticus.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -301,8 +301,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PluginManager.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -186,8 +186,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PopUp.php
===================================================================
--- trunk/lib/plugin/PopUp.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PopUp.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -100,8 +100,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PopularNearby.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -151,8 +151,6 @@
}
}
-
-
function cmp_by_hits($a, $b)
{
if ($a['hits'] == $b['hits']) return 0;
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PreferenceApp.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -310,8 +310,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Processing.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -86,8 +86,6 @@
}
}
-
-
class Processing_HTML extends HtmlElement
{
function startTag()
Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RandomPage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -113,8 +113,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RateIt.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -450,8 +450,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RecentChanges.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -121,7 +121,6 @@
return $this->authorHasPage() ? WikiURL($author) : false;
}
-
function status($rev)
{
if ($rev->hasDefaultContents())
@@ -728,7 +727,6 @@
"]");
}
-
function format($changes)
{
$this->_args['daylist'] = false; //don't show day buttons in Mozilla sidebar
@@ -1474,8 +1472,6 @@
}
-
-
class OptionsButtonBars extends HtmlElement
{
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RedirectTo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -106,8 +106,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RssFeed.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -129,8 +129,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SearchHighlight.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -110,8 +110,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SemanticRelations.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -143,8 +143,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SemanticSearch.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -435,8 +435,6 @@
}
}
-
-
class _PageList_Column_SemanticSearch_relation
extends _PageList_Column
{
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -220,8 +220,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SiteMap.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -141,7 +141,6 @@
return $pagearr;
}
-
function run($dbi, $argstr, &$request, $basepage)
{
include_once 'lib/BlockParser.php';
@@ -223,8 +222,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SpellCheck.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -191,8 +191,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SqlResult.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -220,8 +220,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SyncWiki.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -365,8 +365,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SyntaxHighlighter.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -162,8 +162,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TeX2png.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -238,8 +238,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Template.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -267,8 +267,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TexToPng.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -191,7 +191,6 @@
return strtr($help, '/', '\\');
} // helptext
-
function checkParams(&$tex, &$magstep, $subslash, &$aalias, &$transp)
{
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TitleSearch.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -109,8 +109,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Transclude.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -162,8 +162,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TranslateText.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -135,8 +135,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UnfoldSubpages.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -181,8 +181,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UriResolver.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -65,8 +65,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UserPreferences.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -176,8 +176,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UserRatings.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -233,8 +233,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Video.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -146,8 +146,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/VisualWiki.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -219,7 +219,6 @@
array(255, 255, 255));
}
-
/**
* Selects the first (smallest or biggest) WikiPages in
* a given category.
@@ -272,7 +271,6 @@
return array_keys($selected);
}
-
/**
* Extracts a subset of all pages from the wiki and find their
* connections to other pages. Also collects some page features
@@ -456,7 +454,6 @@
if ($width and $height)
$dot .= " size=\"$width,$height\";\n ";
-
switch ($shape) {
case 'point':
$dot .= "edge [arrowhead=none];\nnode [shape=$shape,fontname=$fontname,width=0.15,height=0.15,fontsize=$fontsize];\n";
@@ -538,7 +535,6 @@
return $ok;
}
-
/**
* static workaround on broken Cache or broken dot executable,
* called only if debug=static.
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WatchPage.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -172,8 +172,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WhoIsOnline.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -206,8 +206,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -156,8 +156,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminRemove.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -248,8 +248,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminRename.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -331,8 +331,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -181,8 +181,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminUtils.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -311,8 +311,6 @@
}
}
-
-
require_once 'lib/PageList.php';
class _PageList_Column_email
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiBlog.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -432,8 +432,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiForm.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -116,8 +116,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiFormRich.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -399,8 +399,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiForum.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -136,8 +136,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiPoll.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -337,8 +337,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/YouTube.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -200,8 +200,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_AuthInfo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -201,8 +201,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_BackendInfo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -201,8 +201,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/_PreferencesInfo.php
===================================================================
--- trunk/lib/plugin/_PreferencesInfo.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_PreferencesInfo.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -51,8 +51,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_Retransform.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -85,8 +85,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_WikiTranslation.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -382,8 +382,6 @@
}
}
-
-
class _PageList_Column_customlang extends _PageList_Column
{
function _PageList_Column_customlang($field, $from_lang, $plugin)
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/text2png.php 2012-11-19 16:58:59 UTC (rev 8490)
@@ -44,7 +44,6 @@
if (!defined('text2png_debug'))
define('text2png_debug', DEBUG & _DEBUG_VERBOSE);
-
class WikiPlugin_text2png
extends WikiPlugin
{
@@ -231,8 +230,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-20 19:51:19
|
Revision: 8501
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8501&view=rev
Author: vargenau
Date: 2012-11-20 19:51:13 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
MacIE is dead
Modified Paths:
--------------
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/CreateToc.php
Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php 2012-11-20 17:21:56 UTC (rev 8500)
+++ trunk/lib/plugin/AddComment.php 2012-11-20 19:51:13 UTC (rev 8501)
@@ -84,10 +84,6 @@
if ($request->isPost() and !empty($comment['addcomment'])) {
$this->add($request, $comment, 'comment'); // noreturn
}
- if ($args['jshide'] and isBrowserIE() and browserDetect("Mac")) {
- //trigger_error(_("jshide set to 0 on Mac IE"), E_USER_NOTICE);
- $args['jshide'] = 0;
- }
// Now we display previous comments and/or provide entry box
// for new comments
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2012-11-20 17:21:56 UTC (rev 8500)
+++ trunk/lib/plugin/CreateToc.php 2012-11-20 19:51:13 UTC (rev 8501)
@@ -29,7 +29,6 @@
* @author: Reini Urban, Marc-Etienne Vargenau
*
* Known problems:
- * - MacIE will not work with jshide.
* - it will crash with old markup and Apache2 (?)
* - Certain corner-edges will not work with TOC_FULL_SYNTAX.
* I believe I fixed all of them now, but who knows?
@@ -399,9 +398,6 @@
if (!$pagename) {
return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
}
- if (isBrowserIE() and browserDetect("Mac")) {
- $jshide = 0;
- }
if (($notoc) or ($liststyle == 'ol')) {
$with_counter = 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 19:51:39
|
Revision: 8550
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8550&view=rev
Author: vargenau
Date: 2012-11-26 19:51:33 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Less messages
Modified Paths:
--------------
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/UnfoldSubpages.php
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2012-11-26 19:49:36 UTC (rev 8549)
+++ trunk/lib/plugin/IncludePage.php 2012-11-26 19:51:33 UTC (rev 8550)
@@ -105,7 +105,7 @@
// Check if user is allowed to get the Page.
if (!mayAccessPage('view', $page)) {
- return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+ return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
$page));
}
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php 2012-11-26 19:49:36 UTC (rev 8549)
+++ trunk/lib/plugin/UnfoldSubpages.php 2012-11-26 19:51:33 UTC (rev 8550)
@@ -108,7 +108,7 @@
// Check if user is allowed to get the Page.
if (!mayAccessPage('view', $cpagename)) {
- return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+ return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
$cpagename));
}
@@ -140,7 +140,7 @@
// Check if user is allowed to get the Page.
if (!mayAccessPage('view', $cpagename)) {
- return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+ return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
$cpagename));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-30 15:16:19
|
Revision: 8578
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8578&view=rev
Author: vargenau
Date: 2012-11-30 15:16:08 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Better use method
Modified Paths:
--------------
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/PopularTags.php
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2012-11-30 14:49:10 UTC (rev 8577)
+++ trunk/lib/plugin/NewPagesPerUser.php 2012-11-30 15:16:08 UTC (rev 8578)
@@ -31,6 +31,12 @@
class WikiPlugin_NewPagesPerUser
extends WikiPlugin
{
+ private function cmp_by_count($a, $b)
+ {
+ if ($a['count'] == $b['count']) return 0;
+ return $a['count'] < $b['count'] ? 1 : -1;
+ }
+
function getName()
{
return _("NewPagesPerUser");
@@ -101,7 +107,7 @@
foreach ($pages as $monthname => $parr) {
$html->pushContent(HTML::tr(HTML::td(array('colspan' => 2),
HTML::strong($parr['month']))));
- uasort($parr['author'], 'cmp_by_count');
+ uasort($parr['author'], array($this, 'cmp_by_count'));
foreach ($parr['author'] as $user => $authorarr) {
$count = $authorarr['count'];
$id = preg_replace("/ /", "_", 'pages-' . $monthname . '-' . $user);
@@ -136,12 +142,6 @@
}
}
-function cmp_by_count($a, $b)
-{
- if ($a['count'] == $b['count']) return 0;
- return $a['count'] < $b['count'] ? 1 : -1;
-}
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php 2012-11-30 14:49:10 UTC (rev 8577)
+++ trunk/lib/plugin/PopularTags.php 2012-11-30 15:16:08 UTC (rev 8578)
@@ -21,7 +21,7 @@
*/
/* Usage:
- * <<PopularTags >>
+ * <<PopularTags>>
*/
require_once 'lib/PageList.php';
@@ -29,6 +29,13 @@
class WikiPlugin_PopularTags
extends WikiPlugin
{
+ // get list of categories sorted by number of backlinks
+ private function cmp_by_count($a, $b)
+ {
+ if ($a['count'] == $b['count']) return 0;
+ return $a['count'] < $b['count'] ? 1 : -1;
+ }
+
function getName()
{
return _("PopularTags");
@@ -64,7 +71,7 @@
'count' => $pages->count());
}
- usort($bl, 'cmp_by_count');
+ usort($bl, array($this, 'cmp_by_count'));
$html = HTML::ul();
$i = 0;
foreach ($bl as $b) {
@@ -83,13 +90,6 @@
}
}
-// get list of categories sorted by number of backlinks
-function cmp_by_count($a, $b)
-{
- if ($a['count'] == $b['count']) return 0;
- return $a['count'] < $b['count'] ? 1 : -1;
-}
-
// Local Variables:
// mode: php
// tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-12-04 12:49:54
|
Revision: 8595
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8595&view=rev
Author: vargenau
Date: 2012-12-04 12:49:42 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Use smart quotes
Modified Paths:
--------------
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/plugin/PhpWeather.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/text2png.php
Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/AddComment.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -74,7 +74,7 @@
{
$args = $this->getArgs($argstr, $request);
if (!$args['pagename']) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
}
// Get our form args.
@@ -129,7 +129,7 @@
}
break;
default:
- return $this->error(sprintf("Bad mode ('%s')", $show));
+ return $this->error(sprintf("Bad mode (“%s”)", $show));
}
}
$html->pushContent($div);
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/Chart.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -80,7 +80,7 @@
global $WikiTheme;
$args = $this->getArgs($argstr, $request);
if (!$args['data']) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'data'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'data'));
}
extract($args);
Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/CreateBib.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -110,7 +110,7 @@
$pagename = $page->name;
}
if (!$pagename) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
}
// Get the links page contents
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/CreatePage.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -73,9 +73,9 @@
if ($verify) {
$head = _("CreatePage failed");
if ($dbi->isWikiPage($verify)) {
- $msg = _("Do you really want to create the page '%s'?");
+ $msg = _("Do you really want to create the page “%s”?");
} else {
- $msg = _("Do you really want to create the page '%s'?");
+ $msg = _("Do you really want to create the page “%s”?");
}
if (isSubPage($s)) {
$main = subPageSlice(0);
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/CreateToc.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -396,7 +396,7 @@
$pagename = $page->name;
}
if (!$pagename) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
}
if (($notoc) or ($liststyle == 'ol')) {
$with_counter = 1;
@@ -410,7 +410,7 @@
// Check if page exists.
if (!($dbi->isWikiPage($pagename))) {
- return $this->error(sprintf(_("Page '%s' does not exist."), $pagename));
+ return $this->error(sprintf(_("Page “%s” does not exist."), $pagename));
}
// Check if user is allowed to get the page.
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/FileInfo.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -62,10 +62,10 @@
$args = $this->getArgs($argstr, $request);
extract($args);
if (!$file) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'file'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'file'));
}
if (!$display) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'display'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'display'));
}
if (string_starts_with($file, "Upload:")) {
$file = preg_replace("/^Upload:(.*)$/", getUploadFilePath() . "\\1", $file);
@@ -79,7 +79,7 @@
if ($quiet) {
return HTML::raw('');
} else {
- return $this->error(sprintf(_("File '%s' not found."), $file));
+ return $this->error(sprintf(_("File “%s” not found."), $file));
}
}
// sanify $file name
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/FullTextSearch.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -119,7 +119,7 @@
$list->pushContent(HTML::dd(_("<no matches>")));
if (!empty($pages->stoplisted))
- $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"),
+ $list = HTML(HTML::p(fmt(_("Ignored stoplist words “%s”"),
join(', ', $pages->stoplisted))),
$list);
if ($noheader)
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/FuzzyPages.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -102,7 +102,7 @@
$link = WikiLink($this->_searchterm, 'auto');
else
$link = $this->_searchterm;
- $caption = fmt("These page titles match fuzzy with '%s'", $link);
+ $caption = fmt("These page titles match fuzzy with “%s”", $link);
$table->pushContent(HTML::caption($caption));
}
@@ -144,7 +144,7 @@
{
if (empty($list)) {
- return HTML::p(fmt("No fuzzy matches with '%s'", $this->_searchterm));
+ return HTML::p(fmt("No fuzzy matches with “%s”", $this->_searchterm));
}
$table = HTML::table(array('class' => 'pagelist'));
$this->addTableCaption($table, $dbi);
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/GoogleMaps.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -90,10 +90,10 @@
extract($args);
if ($Longitude === '') {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'Longitude'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'Longitude'));
}
if ($Latitude === '') {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'Latitude'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'Latitude'));
}
$maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/GraphViz.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -289,7 +289,7 @@
$cmdline = "$dotbin $args";
$code = $this->execute($cmdline, $outfile);
if (!$code)
- $this->complain(sprintf(_("Couldn't start commandline '%s'"), $cmdline));
+ $this->complain(sprintf(_("Couldn't start commandline “%s”"), $cmdline));
} else {
$args = "-T$gif -o $outfile";
$cmdline = "$dotbin $args";
@@ -297,11 +297,11 @@
//if (!isWindows()) $cmdline .= " 2>&1";
$code = $this->filterThroughCmd($source, $cmdline);
if ($code)
- $this->complain(sprintf(_("Couldn't start commandline '%s'"), $cmdline));
+ $this->complain(sprintf(_("Couldn't start commandline “%s”"), $cmdline));
sleep(0.1);
}
if (!file_exists($outfile)) {
- $this->complain(sprintf(_("%s error: outputfile '%s' not created"),
+ $this->complain(sprintf(_("%s error: outputfile “%s” not created"),
"GraphViz", $outfile));
$this->complain("\ncmd-line: $cmdline");
return false;
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/IncludePage.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -87,7 +87,7 @@
$page = $page->name;
}
if (!$page) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
}
// A page can include itself once (this is needed, e.g., when editing
@@ -100,7 +100,7 @@
// Check if page exists
if (!($dbi->isWikiPage($page))) {
- return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+ return $this->error(sprintf(_("Page “%s” does not exist"), $page));
}
// Check if user is allowed to get the Page.
Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/LikePages.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -33,7 +33,7 @@
function getDescription()
{
- return sprintf(_("List page names which share an initial or final title word with '%s'."),
+ return sprintf(_("List page names which share an initial or final title word with “%s”."),
'[pagename]');
}
@@ -63,9 +63,9 @@
if ($prefix) {
$suffix = false;
- $descrip = fmt("Page names with prefix '%s'", $prefix);
+ $descrip = fmt("Page names with prefix “%s”", $prefix);
} elseif ($suffix) {
- $descrip = fmt("Page names with suffix '%s'", $suffix);
+ $descrip = fmt("Page names with suffix “%s”", $suffix);
} elseif ($page) {
$words = preg_split('/[\s:-;.,]+/',
SplitPagename($page));
@@ -74,7 +74,7 @@
$prefix = reset($words);
$suffix = end($words);
- $descrip = fmt("These pages share an initial or final title word with '%s'",
+ $descrip = fmt("These pages share an initial or final title word with “%s”",
WikiLink($page, 'auto'));
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/ModeratedPage.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -66,7 +66,7 @@
// Handle moderation request from URLs sent by e-mail
if (!empty($args['id']) and !empty($args['pass'])) {
if (!$args['page']) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
}
$page = $dbi->getPage($args['page']);
if ($moderated = $page->get("moderated")) {
@@ -159,12 +159,12 @@
}
$page->set('moderation', array('status' => $status));
return $this->notice(
- fmt("ModeratedPage status update:\n Moderators: '%s'\n require_access: '%s'",
+ fmt("ModeratedPage status update:\n Moderators: “%s”\n require_access: “%s”",
join(',', $status['moderators']), $status['require_access']));
} else {
$page->set('moderation', false);
return $this->notice(HTML($status,
- fmt("'%s' is no ModeratedPage anymore.", $page->getName())));
+ fmt("“%s” is no ModeratedPage anymore.", $page->getName())));
}
}
@@ -184,7 +184,7 @@
}
$page->set('moderation', array('status' => $status));
return $this->notice(
- fmt("ModeratedPage status update: '%s' is now a ModeratedPage.\n Moderators: '%s'\n require_access: '%s'",
+ fmt("ModeratedPage status update: “%s” is now a ModeratedPage.\n Moderators: “%s”\n require_access: “%s”",
$page->getName(), join(',', $status['moderators']), $status['require_access']));
} else { // error
return $status;
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PageGroup.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -98,7 +98,7 @@
$args = $this->getArgs($argstr, $request);
extract($args);
if (empty($parent)) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'parent'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'parent'));
}
$directions = array('next' => _("Next"),
'previous' => _("Previous"),
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PhotoAlbum.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -621,7 +621,7 @@
return;
}
if (!file_exists($src))
- return $this->error(fmt("Unable to find src='%s'", $src));
+ return $this->error(fmt("Unable to find src=“%s”", $src));
$photos[] = array("src" => $src,
"name" => "../" . $src,
"name_tile" => $src,
@@ -633,7 +633,7 @@
if ($web_location == 0) {
$fp = @fopen($src, "r");
if (!$fp) {
- return $this->error(fmt("Unable to read src='%s'", $src));
+ return $this->error(fmt("Unable to read src=“%s”", $src));
}
while ($data = fgetcsv($fp, 1024, ';')) {
if (count($data) == 0 || empty($data[0])
Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PhpHighlight.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -139,14 +139,14 @@
static $MAXLEN = 7;
foreach (array($string, $comment, $keyword, $bg, $default, $html) as $color) {
$length = strlen($color);
- //trigger_error(sprintf(_("DEBUG: color '%s' is length %d."), $color, $length), E_USER_NOTICE);
+ //trigger_error(sprintf(_("DEBUG: color “%s” is length %d."), $color, $length), E_USER_NOTICE);
if (($length == 7 || $length == 4) && substr($color, 0, 1) == "#"
&& "#" == preg_replace("/[a-fA-F0-9]/", "", $color)
) {
- //trigger_error(sprintf(_("DEBUG: color '%s' appears to be hex."), $color), E_USER_NOTICE);
+ //trigger_error(sprintf(_("DEBUG: color “%s” appears to be hex."), $color), E_USER_NOTICE);
// stop checking, ok to go
} elseif (($length < $MAXLEN + 1) && in_array($color, $html4colors)) {
- //trigger_error(sprintf(_("DEBUG color '%s' appears to be an HTML 4 color."), $color), E_USER_NOTICE);
+ //trigger_error(sprintf(_("DEBUG color “%s” appears to be an HTML 4 color."), $color), E_USER_NOTICE);
// stop checking, ok to go
} else {
trigger_error(sprintf(_("Invalid color: %s"),
Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PhpWeather.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -100,7 +100,7 @@
if (!$w->get_country_code()) {
/* The country code couldn't be resolved, so we
* shouldn't use the ICAO: */
- trigger_error(sprintf(_("The ICAO '%s' wasn't recognized."),
+ trigger_error(sprintf(_("The ICAO “%s” wasn't recognized."),
$icao), E_USER_NOTICE);
$icao = '';
}
@@ -111,7 +111,7 @@
/* We check and correct the language if necessary: */
//if (!in_array($language, array_keys($w->get_languages('text')))) {
if (!in_array($language, array_keys(get_languages('text')))) {
- trigger_error(sprintf(_("%s does not know about the language '%s', using 'en' instead."),
+ trigger_error(sprintf(_("%s does not know about the language “%s”, using 'en' instead."),
$this->getName(), $language),
E_USER_NOTICE);
$language = 'en';
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/Ploticus.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -259,9 +259,9 @@
sleep(1);
}
//if (empty($code))
- // return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+ // return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
if (!file_exists($tempfile . ".$gif")) {
- $this->_errortext .= sprintf(_("%s error: outputfile '%s' not created"),
+ $this->_errortext .= sprintf(_("%s error: outputfile “%s” not created"),
"Ploticus", "$tempfile.$gif");
if (isWindows())
$this->_errortext .= ("\ncmd-line: " . PLOTICUS_EXE . " $tempfile.plo $args");
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/RecentChanges.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -346,7 +346,7 @@
$edits .= sprintf(_(" for all pages linking to %s"), $category);
}
if (!empty($pagematch)) {
- $edits .= sprintf(_(" for all pages matching '%s'"), $pagematch);
+ $edits .= sprintf(_(" for all pages matching “%s”"), $pagematch);
}
if ($timespan = $days > 0) {
if (intval($days) != $days)
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/RedirectTo.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -84,7 +84,7 @@
}
if ($page == $request->getArg('pagename')) {
- return $this->error(fmt("Recursive redirect to self: '%s'", $url));
+ return $this->error(fmt("Recursive redirect to self: “%s”", $url));
}
if ($request->getArg('action') != 'browse') {
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SpellCheck.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -146,7 +146,7 @@
$cache = new WikiPluginCached;
$code = $cache->filterThroughCmd($source, $commandLine);
if (empty($code))
- return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+ return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
$sugg = array();
foreach (preg_split("/\n/", $code) as $line) {
if (preg_match("/^& (\w+) \d+ \d+: (.+)$/", $line, $m)) {
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SyncWiki.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -71,7 +71,7 @@
$args['action'] = 'syncwiki';
extract($args);
if (empty($args['url'])) {
- return $this->error(fmt("A required argument '%s' is missing.", "url"));
+ return $this->error(fmt("A required argument “%s” is missing.", "url"));
}
if ($request->getArg('action') != 'browse') {
return $this->disabled(_("Plugin not run: not in browse mode"));
Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SyntaxHighlighter.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -113,7 +113,7 @@
extract($this->getArgs($argstr, $request));
$source =& $this->source;
if (empty($syntax)) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'syntax'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'syntax'));
}
if (empty($source)) {
return HTML::div(array('class' => "error"),
@@ -143,7 +143,7 @@
$commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
$code = $this->newFilterThroughCmd($source, $commandLine);
if (empty($code)) {
- return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+ return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
}
$pre = HTML::pre(HTML::raw($code));
$html->pushContent($pre);
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SystemInfo.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -470,7 +470,7 @@
. implode(', ', $available_languages) . ". "
. _("Current language") . _(": ") . $GLOBALS['LANG']
. ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
- ? ". " . sprintf(_("Default language: '%s'"), DEFAULT_LANGUAGE)
+ ? ". " . sprintf(_("Default language: “%s”"), DEFAULT_LANGUAGE)
: '');
}
@@ -483,7 +483,7 @@
. implode(', ', $available_themes) . ". "
. _("Current theme") . _(": ") . $WikiTheme->_name
. ((THEME != $WikiTheme->_name)
- ? ". " . sprintf(_("Default theme: '%s'"), THEME)
+ ? ". " . sprintf(_("Default theme: “%s”"), THEME)
: '');
}
@@ -496,7 +496,7 @@
!in_array($arg, array('ADMIN_PASSWD', 'DATABASE_DSN', 'DBAUTH_AUTH_DSN'))
)
return constant($arg); else
- return $this->error(sprintf(_("unknown argument '%s' to SystemInfo"), $arg));
+ return $this->error(sprintf(_("unknown argument “%s” to SystemInfo"), $arg));
}
function run($dbi, $argstr, &$request, $basepage)
@@ -507,7 +507,7 @@
$args['seperator'] = ' ';
$availableargs = // name => callback + 0 args
array('appname' => create_function('', "return 'PhpWiki';"),
- 'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"),
+ 'version' => create_function('', "return sprintf(“%s”, PHPWIKI_VERSION);"),
'LANG' => create_function('', 'return $GLOBALS["LANG"];'),
'LC_ALL' => create_function('', 'return setlocale(LC_ALL, 0);'),
'current_language' => create_function('', 'return $GLOBALS["LANG"];'),
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/Template.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -112,7 +112,7 @@
$page = $page->name;
}
if (!$page) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
}
// If "Template:$page" exists, use it
@@ -133,7 +133,7 @@
// Check if page exists
if (!($dbi->isWikiPage($page))) {
- return $this->error(sprintf(_("Page '%s' does not exist."), $page));
+ return $this->error(sprintf(_("Page “%s” does not exist."), $page));
}
// Check if user is allowed to get the Page.
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/TitleSearch.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -94,9 +94,9 @@
$s = WikiLink($args['s'], 'auto');
}
if ($total) {
- $pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total));
+ $pagelist->setCaption(fmt("Title search results for “%s” (%d total)", $s, $total));
} else {
- $pagelist->setCaption(fmt("Title search results for '%s'", $s));
+ $pagelist->setCaption(fmt("Title search results for “%s”", $s));
}
}
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/TranslateText.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -92,7 +92,7 @@
'author' => $user->getId());
}
$text .= $user->getId() . " " . Iso8601DateTime() . "\n" .
- "* " . sprintf(_("Translate '%s' to '%s' in *%s*"),
+ "* " . sprintf(_("Translate “%s” to “%s” in *%s*"),
$pagename, $trans, $lang);
$text .= "\n <verbatim>locale/po/$lang.po:\n msgid \"" . $pagename . "\"\n msgstr \"" . $trans . "\"\n </verbatim>";
$meta['summary'] = sprintf(_("Translate %s to %s in %s"),
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/UpLoad.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -213,7 +213,7 @@
$u_userfile = preg_replace("/ /", "%20", $u_userfile);
$userfile_tmpname = $userfile->getTmpName();
$err_header = HTML::div(array('class' => 'error'),
- HTML::p(fmt("ERROR uploading '%s'", $userfile_name)));
+ HTML::p(fmt("ERROR uploading “%s”", $userfile_name)));
if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i",
$userfile_name)
) {
Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminChmod.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -74,10 +74,10 @@
if ($perm = new PagePermission($acl)) {
foreach ($pages as $name) {
if ($perm->store($dbi->getPage($name))) {
- $ul->pushContent(HTML::li(fmt("chmod page '%s' to '%s'.", $name, $permstring)));
+ $ul->pushContent(HTML::li(fmt("chmod page “%s” to “%s”.", $name, $permstring)));
$count++;
} else {
- $ul->pushContent(HTML::li(fmt("Couldn't chmod page '%s' to '%s'.", $name, $permstring)));
+ $ul->pushContent(HTML::li(fmt("Couldn't chmod page “%s” to “%s”.", $name, $permstring)));
}
}
} else {
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminChown.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -66,7 +66,7 @@
$newowner != $owner
) {
if (!mayAccessPage('change', $name)) {
- $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",
+ $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.",
WikiLink($name))));
} else {
$version = $current->getVersion();
@@ -79,11 +79,11 @@
$page->set('owner', $newowner);
$page->save($text, $version + 1, $meta);
if ($page->get('owner') === $newowner) {
- $ul->pushContent(HTML::li(fmt("Change owner of page '%s' to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Change owner of page “%s” to “%s”.",
WikiLink($name), WikiLink($newowner))));
$count++;
} else {
- $ul->pushContent(HTML::li(fmt("Could not change owner of page '%s' to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Could not change owner of page “%s” to “%s”.",
WikiLink($name), $newowner)));
}
}
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -58,12 +58,12 @@
$oldperm = getPagePermissions($page);
setPagePermissions($page, $perm);
$result->setAttr('class', 'feedback');
- $result->pushContent(HTML::p(fmt("ACL deleted for page '%s'", $pagename)));
+ $result->pushContent(HTML::p(fmt("ACL deleted for page “%s”", $pagename)));
$current = $page->getCurrentRevision();
$version = $current->getVersion();
$meta = $current->_data;
$text = $current->getPackedContent();
- $meta['summary'] = sprintf(_("ACL deleted for page '%s'"), $pagename);
+ $meta['summary'] = sprintf(_("ACL deleted for page “%s”"), $pagename);
$meta['is_minor_edit'] = 1;
$meta['author'] = $request->_user->UserName();
unset($meta['mtime']); // force new date
Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminMarkup.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -66,7 +66,7 @@
if (!$markup or $newmarkup != $markup) {
if (!mayAccessPage('change', $name)) {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.",
+ $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.",
WikiLink($name))));
} else {
$version = $current->getVersion();
@@ -81,11 +81,11 @@
$page->save($text, $version + 1, $meta);
$current = $page->getCurrentRevision();
if ($current->get('markup') === $newmarkup) {
- $ul->pushContent(HTML::li(fmt("change page '%s' to markup type '%s'.",
+ $ul->pushContent(HTML::li(fmt("change page “%s” to markup type “%s”.",
WikiLink($name), $newmarkup)));
$count++;
} else {
- $ul->pushContent(HTML::li(fmt("Couldn't change page '%s' to markup type '%s'.",
+ $ul->pushContent(HTML::li(fmt("Couldn't change page “%s” to markup type “%s”.",
WikiLink($name), $newmarkup)));
}
}
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminPurge.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -69,10 +69,10 @@
$name = str_replace(array('%5B', '%5D'), array('[', ']'), $name);
if (mayAccessPage('purge', $name)) {
$dbi->purgePage($name);
- $ul->pushContent(HTML::li(fmt("Purged page '%s' successfully.", $name)));
+ $ul->pushContent(HTML::li(fmt("Purged page “%s” successfully.", $name)));
$count++;
} else {
- $ul->pushContent(HTML::li(fmt("Didn't purge page '%s'. Access denied.", $name)));
+ $ul->pushContent(HTML::li(fmt("Didn't purge page “%s”. Access denied.", $name)));
}
}
if ($count) {
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminRemove.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -113,10 +113,10 @@
$name = str_replace(array('%5B', '%5D'), array('[', ']'), $name);
if (mayAccessPage('remove', $name)) {
$dbi->deletePage($name);
- $ul->pushContent(HTML::li(fmt("Removed page '%s' successfully.", $name)));
+ $ul->pushContent(HTML::li(fmt("Removed page “%s” successfully.", $name)));
$count++;
} else {
- $ul->pushContent(HTML::li(fmt("Didn't remove page '%s'. Access denied.", $name)));
+ $ul->pushContent(HTML::li(fmt("Didn't remove page “%s”. Access denied.", $name)));
}
}
if ($count) {
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminRename.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -83,9 +83,9 @@
if (strlen($newname) > MAX_PAGENAME_LENGTH)
$ul->pushContent(HTML::li(_("Cannot rename. New page name too long.")));
elseif ($dbi->isWikiPage($newname))
- $ul->pushContent(HTML::li(fmt("Page '%s' already exists. Ignored.",
+ $ul->pushContent(HTML::li(fmt("Page “%s” already exists. Ignored.",
WikiLink($newname)))); elseif (!mayAccessPage('edit', $name))
- $ul->pushContent(HTML::li(fmt("Access denied to rename page '%s'.",
+ $ul->pushContent(HTML::li(fmt("Access denied to rename page “%s”.",
WikiLink($name)))); elseif ($dbi->renamePage($name, $newname, $updatelinks)) {
/* not yet implemented for all backends */
$page = $dbi->getPage($newname);
@@ -93,7 +93,7 @@
$version = $current->getVersion();
$meta = $current->_data;
$text = $current->getPackedContent();
- $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'."), $name, $newname);
+ $meta['summary'] = sprintf(_("Renamed page from “%s” to “%s”."), $name, $newname);
$meta['is_minor_edit'] = 1;
$meta['author'] = $request->_user->UserName();
unset($meta['mtime']); // force new date
@@ -102,21 +102,21 @@
$page = $dbi->getPage($name);
$text = "<<RedirectTo page=\"" . $newname . "\">>";
$meta['summary'] =
- sprintf(_("Renaming created redirect page from '%s' to '%s'"),
+ sprintf(_("Renaming created redirect page from “%s” to “%s”"),
$name, $newname);
$meta['is_minor_edit'] = 0;
$meta['author'] = $request->_user->UserName();
$page->save($text, 1, $meta);
}
- $ul->pushContent(HTML::li(fmt("Renamed page from '%s' to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Renamed page from “%s” to “%s”.",
$name, WikiLink($newname))));
$count++;
} else {
- $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
$name, $newname)));
}
} else {
- $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
$name, $newname)));
}
}
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -76,7 +76,7 @@
}
if ($text != $newtext) {
$meta = $current->_data;
- $meta['summary'] = sprintf(_("Replace '%s' by '%s'"), $from, $to);
+ $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to);
$meta['is_minor_edit'] = 0;
$meta['author'] = $request->_user->UserName();
unset($meta['mtime']); // force new date
@@ -97,9 +97,9 @@
$regex = !empty($post_args['regex']);
foreach ($pages as $pagename) {
if (!mayAccessPage('edit', $pagename)) {
- $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.", $pagename)));
+ $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename)));
} elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
- $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.",
+ $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.",
$from, $to, WikiLink($pagename))));
$count++;
}
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSelect.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -205,7 +205,7 @@
// if the plugin requires more args than the pagename,
// then this plugin will not return. (Rename, SearchReplace, ...)
$action_result = $plugin->run($dbi, $plugin_args, $request, $basepage);
- $ul->pushContent(HTML::li(fmt("Selected page '%s' passed to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Selected page “%s” passed to “%s”.",
$name, $select)));
$ul->pushContent(HTML::ul(HTML::li($action_result)));
}
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -93,15 +93,15 @@
$oldperm->sanify();
if ($oldperm and $perm->equal($oldperm->perm)) {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p(fmt("ACL not changed for page '%s'.", $pagename)));
+ $result->pushContent(HTML::p(fmt("ACL not changed for page “%s”.", $pagename)));
} elseif (mayAccessPage('change', $pagename)) {
setPagePermissions($page, $perm);
$result->setAttr('class', 'feedback');
- $result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
+ $result->pushContent(HTML::p(fmt("ACL changed for page “%s”",
$pagename)));
- $result->pushContent(HTML::p(fmt("from '%s'",
+ $result->pushContent(HTML::p(fmt("from “%s”",
$oldperm ? $oldperm->asAclLines() : "None")));
- $result->pushContent(HTML::p(fmt("to '%s'.",
+ $result->pushContent(HTML::p(fmt("to “%s”.",
$perm->asAclLines())));
// Create new revision so that ACL change appears in history.
@@ -109,7 +109,7 @@
$version = $current->getVersion();
$meta = $current->_data;
$text = $current->getPackedContent();
- $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
+ $meta['summary'] = sprintf(_("ACL changed for page “%s” from “%s” to “%s”."),
$pagename,
$oldperm ? $oldperm->asAclLines() : "None",
$perm->asAclLines());
@@ -121,7 +121,7 @@
$count++;
} else {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.", $pagename)));
+ $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.", $pagename)));
}
}
} else {
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -67,12 +67,12 @@
if (!$external) {
if (!mayAccessPage('change', $name)) {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.",
+ $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.",
WikiLink($name))));
} else {
$version = $current->getVersion();
$page->set('external', (bool)1);
- $ul->pushContent(HTML::li(fmt("change page '%s' to external.", WikiLink($name))));
+ $ul->pushContent(HTML::li(fmt("change page “%s” to external.", WikiLink($name))));
$count++;
}
}
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiBlog.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -154,7 +154,7 @@
$html->pushContent($this->showForm($request, $args));
break;
default:
- return $this->error(sprintf("Bad mode ('%s')", $show));
+ return $this->error(sprintf("Bad mode (“%s”)", $show));
}
}
return $html;
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiFormRich.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -176,7 +176,7 @@
{
extract($this->getArgs($argstr, $request));
if (empty($action)) {
- return $this->error(fmt("A required argument '%s' is missing.", "action"));
+ return $this->error(fmt("A required argument “%s” is missing.", "action"));
}
$form = HTML::form(array('action' => $request->getPostURL(),
@@ -193,7 +193,7 @@
$text = '';
if ($inputtype != 'submit') {
if (empty($input['name']))
- return $this->error(fmt("A required argument '%s' is missing.",
+ return $this->error(fmt("A required argument “%s” is missing.",
$inputtype . "[][name]"));
if (!isset($input['text'])) $input['text'] = gettext($input['name']);
$text = $input['text'];
Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiForum.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -72,7 +72,7 @@
{
$args = $this->getArgs($argstr, $request);
if (!$args['pagename']) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
}
// Get our form args.
@@ -102,7 +102,7 @@
$html->pushContent($this->showForm($request, $args, 'forumadd'));
break;
default:
- return $this->error(sprintf("Bad mode ('%s')", $show));
+ return $this->error(sprintf("Bad mode (“%s”)", $show));
}
}
// FIXME: on empty showTopics() and mode!=add and mode!=summary provide a showForm() here.
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiPoll.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -109,7 +109,7 @@
foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
if (!preg_match("/^(answer_|question_)/", $arg))
- trigger_error(sprintf(_("argument '%s' not declared by plugin"),
+ trigger_error(sprintf(_("argument “%s” not declared by plugin"),
$arg), E_USER_NOTICE);
}
@@ -146,7 +146,7 @@
$request->setArg('nocache', 'purge');
$args = $this->getArgs($argstr, $request);
if (!$args['page']) {
- return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+ return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
}
if (!empty($args['admin']) and $request->_user->isAdmin()) {
// reset statistics
Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/_AuthInfo.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -96,7 +96,7 @@
unset($DBAuthParams['dummy']);
$table->pushContent($this->_showhash("\$DBAuthParams[]", $DBAuthParams));
$html->pushContent($table);
- $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for '%s'", $userid))));
+ $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid))));
if (!$user) {
$html->pushContent(HTML::p(fmt("No userid")));
} else {
Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/_BackendInfo.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -54,7 +54,7 @@
$this->readonly_pagemeta = array();
$this->hidden_pagemeta = array('_cached_html');
- $html = HTML(HTML::h3(fmt("Querying backend directly for '%s'",
+ $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
$page)));
$table = HTML::table(array('border' => 1,
Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/_Retransform.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -49,7 +49,7 @@
if (empty($page))
return '';
- $html = HTML(HTML::h3(fmt("Retransform page '%s'",
+ $html = HTML(HTML::h3(fmt("Retransform page “%s”",
$page)));
// bypass WikiDB and cache, go directly through the backend.
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/text2png.php 2012-12-04 12:49:42 UTC (rev 8595)
@@ -223,7 +223,7 @@
'alt' => $text,
'title' => '"' . $text . '"' . _(" produced by ") . $this->getName())));
} else {
- trigger_error(sprintf(_("couldn't open file '%s' for writing"),
+ trigger_error(sprintf(_("couldn't open file “%s” for writing"),
$filepath . $filename), E_USER_NOTICE);
}
return $html;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-12-11 15:54:52
|
Revision: 8647
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8647&view=rev
Author: vargenau
Date: 2012-12-11 15:54:41 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
HTML::raw
Modified Paths:
--------------
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/RecentComments.php
===================================================================
--- trunk/lib/plugin/RecentComments.php 2012-12-11 15:48:55 UTC (rev 8646)
+++ trunk/lib/plugin/RecentComments.php 2012-12-11 15:54:41 UTC (rev 8647)
@@ -98,7 +98,9 @@
function format_revision($rev)
{
static $doublettes = array();
- if (isset($doublettes[$rev->getPageName()])) return;
+ if (isset($doublettes[$rev->getPageName()])) {
+ return HTML::raw('');
+ }
$doublettes[$rev->getPageName()] = 1;
$args = &$this->_args;
$class = 'rc-' . $this->importance($rev);
Modified: trunk/lib/plugin/RecentReferrers.php
===================================================================
--- trunk/lib/plugin/RecentReferrers.php 2012-12-11 15:48:55 UTC (rev 8646)
+++ trunk/lib/plugin/RecentReferrers.php 2012-12-11 15:54:41 UTC (rev 8647)
@@ -62,7 +62,6 @@
'class' => 'pagelist'));
if (!$args['noheader'] and !empty($args['caption']))
$table->pushContent(HTML::caption(array('align' => 'top'), $args['caption']));
- $logs = array();
$limit = $args['limit'];
$accesslog =& $request->_accesslog;
if ($logiter = $accesslog->get_referer($limit, "external_only")
@@ -79,6 +78,7 @@
}
return $table;
}
+ return HTML::raw('');
}
}
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2012-12-11 15:48:55 UTC (rev 8646)
+++ trunk/lib/plugin/WikiAdminUtils.php 2012-12-11 15:54:41 UTC (rev 8647)
@@ -304,7 +304,7 @@
$pagelist->_generateTable(false),
HTML::p(Button('submit:', _("Change Verification Status"),
'wikiadmin'),
- HTML::Raw(' '),
+ HTML::raw(' '),
Button('cancel', _("Cancel")))
);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-16 14:03:11
|
Revision: 8748
http://sourceforge.net/p/phpwiki/code/8748
Author: vargenau
Date: 2013-04-16 14:03:08 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Add private keyword for functions
Modified Paths:
--------------
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/Transclude.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikicreoleTable.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/_WikiTranslation.php
Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -53,7 +53,7 @@
* ."WHERE referer IS NOT NULL "
* .$where_conditions
*/
- function _getQueryString(&$args)
+ private function _getQueryString(&$args)
{
// extract any parametrised conditions from the arguments,
// in particular, how much history to select
@@ -224,7 +224,7 @@
/** Honeypot for xgettext. Those strings are translated dynamically.
*/
- function _locale_dummy()
+ private function _locale_dummy()
{
$dummy = array(
// mode caption
@@ -304,7 +304,7 @@
$tbody);
}
- function _getQueryResults($query, &$dbi)
+ private function _getQueryResults($query, &$dbi)
{
$queryResult = $dbi->genericSqlIter($query);
if (!$queryResult) {
@@ -325,7 +325,7 @@
return $tbody;
}
- function _setHeaders($row)
+ private function _setHeaders($row)
{
if (!$this->_headerSet) {
foreach ($row as $key => $value) {
@@ -335,7 +335,7 @@
}
}
- function _getWhereConditions(&$args)
+ private function _getWhereConditions(&$args)
{
$where_conditions = '';
@@ -389,7 +389,7 @@
return $where_conditions;
}
- function _getCaption(&$args)
+ private function _getCaption(&$args)
{
$caption = $args['caption'];
if ($caption == '')
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/AppendText.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -54,7 +54,7 @@
);
}
- function _fallback($addtext, $oldtext, $notfound, &$message)
+ private function _fallback($addtext, $oldtext, $notfound, &$message)
{
$message->pushContent(sprintf(_("%s not found"), $notfound) . ". " .
_("Appending at the end.") . "\n");
@@ -78,7 +78,7 @@
}
}
- function _work($pagename, $args, $dbi, &$request)
+ private function _work($pagename, $args, $dbi, &$request)
{
if (empty($args['s'])) {
if ($request->isPost()) {
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/BackLinks.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -179,7 +179,7 @@
// how many links from this backLink to other pages
class _PageList_Column_BackLinks_count extends _PageList_Column
{
- function _getValue($page, &$revision_handle)
+ private function _getValue($page, &$revision_handle)
{
$iter = $page->getPageLinks();
$count = $iter->count();
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/Calendar.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -76,7 +76,7 @@
}
}
- function __header($pagename, $time)
+ private function __header($pagename, $time)
{
$args = &$this->args;
@@ -111,7 +111,7 @@
$row)));
}
- function __daynames($start_wday)
+ private function __daynames($start_wday)
{
$time = mktime(12, 0, 0, 1, 1, 2001);
$t = localtime($time, 1);
@@ -136,7 +136,7 @@
return $row;
}
- function __date($dbi, $time)
+ private function __date($dbi, $time)
{
$args = &$this->args;
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/CalendarList.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -97,7 +97,7 @@
}
}
- function _count_events($dbi, $n = 7, $direction = 1)
+ private function _count_events($dbi, $n = 7, $direction = 1)
{
// This is used by the last_n/next_n options to determine the date that
// accounts for the number of N events in the past/future.
@@ -120,7 +120,7 @@
return $timeTMP;
}
- function _date($dbi, $time)
+ private function _date($dbi, $time)
{
$args = &$this->args;
$date_string = strftime($args['date_format'], $time);
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/CreateToc.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -72,14 +72,14 @@
}
// Initialisation of toc counter
- function _initTocCounter()
+ private function _initTocCounter()
{
$counter = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0);
return $counter;
}
// Update toc counter with a new title
- function _tocCounter(&$counter, $level)
+ private function _tocCounter(&$counter, $level)
{
$counter[$level]++;
for ($i = $level + 1; $i <= 5; $i++) {
@@ -87,7 +87,7 @@
}
}
- function _roman_counter($number)
+ private function _roman_counter($number)
{
$n = intval($number);
@@ -104,7 +104,7 @@
return $result;
}
- function _letter_counter($number)
+ private function _letter_counter($number)
{
if ($number <= 26) {
return chr(ord("A") + $number - 1);
@@ -114,7 +114,7 @@
}
// Get string corresponding to the current title
- function _getCounter(&$counter, $level, $firstlevelstyle)
+ private function _getCounter(&$counter, $level, $firstlevelstyle)
{
if ($firstlevelstyle == 'roman') {
$str = $this->_roman_counter($counter[1]);
@@ -131,7 +131,7 @@
}
// Get HTML header corresponding to current level (level is set of ! or =)
- function _getHeader($level)
+ private function _getHeader($level)
{
$count = substr_count($level, '!');
@@ -159,7 +159,7 @@
return "";
}
- function _quote($heading)
+ private function _quote($heading)
{
if (TOC_FULL_SYNTAX) {
$theading = TransformInline($heading);
@@ -234,7 +234,7 @@
/** prevent from duplicate anchors,
* beautify spaces: " " => "_" and not "x20."
*/
- function _nextAnchor($s)
+ private function _nextAnchor($s)
{
static $anchors = array();
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/EditMetaData.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -163,7 +163,7 @@
return $html;
}
- function _showvalue($key, $val, $prefix = '')
+ private function _showvalue($key, $val, $prefix = '')
{
if (is_array($val) or is_object($val)) return $val;
if (in_array($key, $this->hidden_pagemeta)) return '';
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ExternalSearch.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -47,7 +47,7 @@
//fixme: better description
}
- function _getInterWikiUrl(&$request)
+ private function _getInterWikiUrl(&$request)
{
$intermap = getInterwikiMap();
$map = $intermap->_map;
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FileInfo.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -197,7 +197,7 @@
return '';
}
- function _formatsize($n, $factor, $suffix = '')
+ private function _formatsize($n, $factor, $suffix = '')
{
if ($n > $factor) {
$b = $n / $factor;
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FoafViewer.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -57,7 +57,7 @@
{
// The handler is handled okay. The only problem is that it still
// throws a fatal.
- function _error_handler($error)
+ private function _error_handler($error)
{
if (strstr($error->errstr, "Failed opening required 'XML/FOAF/Parser.php'"))
return true;
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FullTextSearch.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -157,13 +157,13 @@
*/
class _PageList_Column_hilight extends _PageList_Column
{
- function _PageList_Column_WantedPages_links(&$params)
+ private function _PageList_Column_WantedPages_links(&$params)
{
$this->parentobj =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- function _getValue(&$page, $revision_handle)
+ private function _getValue(&$page, $revision_handle)
{
$pagename = $page->getName();
$count = count($this->parentobj->_wpagelist[$pagename]);
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FuzzyPages.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -173,14 +173,14 @@
return $this->formatTable($this->_list, $dbi);
}
- function _pushDebugHeadingTDinto(&$row)
+ private function _pushDebugHeadingTDinto(&$row)
{
$row->pushContent(HTML::td(_("Spelling Score")),
HTML::td(_("Sound Score")),
HTML::td('Metaphones'));
}
- function _pushDebugTDinto(&$row, $pagename)
+ private function _pushDebugTDinto(&$row, $pagename)
{
// This actually calculates everything a second time for each pagename
// so the individual scores can be displayed separately for debugging.
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/GraphViz.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -73,7 +73,7 @@
extends WikiPluginCached
{
- function _mapTypes()
+ private function _mapTypes()
{
return array("imap", "cmapx", "ismap", "cmap");
}
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/HtmlConverter.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -95,7 +95,7 @@
return $result;
}
- function _processA(&$file)
+ private function _processA(&$file)
{
$file = eregi_replace(
@@ -104,7 +104,7 @@
$file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:\200-\377\(\)[:space:]]+)}}([^<]+)</a>", "[ \\2 | \\1 ]", $file);
}
- function _processIMG(&$file)
+ private function _processIMG(&$file)
{
$img_regexp = "_<img\s+src\s*=\s*\"([-/.a-zA-Z0-9\_~#@%$?&=:\200-\377\(\)\s]+)\"[^>]*>_";
@@ -112,7 +112,7 @@
$file = preg_replace($img_regexp, "\n\n[Upload:\\1]", $file);
}
- function _processUL(&$file)
+ private function _processUL(&$file)
{
// put any <li>-Tag in a new line to indent correctly and strip trailing white space (including new-lines)
@@ -132,7 +132,7 @@
}
}
- function _process($file_name)
+ private function _process($file_name)
{
$result = HTML();
$file = file_get_contents($file_name);
Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/InterWikiSearch.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -84,12 +84,12 @@
$this->_transform($this->_getFooter($text)));
}
- function _formatMap()
+ private function _formatMap()
{
return $this->_arrayToTable($this->_getMap(), $GLOBALS['request']);
}
- function _arrayToTable($array, &$request)
+ private function _arrayToTable($array, &$request)
{
$thead = HTML::thead();
$label[0] = _("Wiki Name");
Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/LikePages.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -110,7 +110,7 @@
return $pagelist;
}
- function _quote($str)
+ private function _quote($str)
{
return "'" . str_replace("'", "''", $str) . "'";
}
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/LinkDatabase.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -188,7 +188,7 @@
class _PageList_Column_LinkDatabase_links extends _PageList_Column
{
- function _getValue($page, &$revision_handle)
+ private function _getValue($page, &$revision_handle)
{
$out = HTML();
$links = $page->getPageLinks();
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/LinkSearch.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -168,7 +168,7 @@
class _PageList_Column_LinkSearch_link
extends _PageList_Column
{
- function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
+ private function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
{
$this->_field = $field;
$this->_heading = $heading;
@@ -177,7 +177,7 @@
$this->_pagelist =& $pagelist;
}
- function _getValue(&$page, $revision_handle)
+ private 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 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ListPages.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -135,13 +135,13 @@
// how many back-/forwardlinks for this page
class _PageList_Column_ListPages_count extends _PageList_Column
{
- function _PageList_Column_ListPages_count($field, $display, $backwards = false)
+ private function _PageList_Column_ListPages_count($field, $display, $backwards = false)
{
$this->_direction = $backwards;
return $this->_PageList_Column($field, $display, 'center');
}
- function _getValue($page, &$revision_handle)
+ private function _getValue($page, &$revision_handle)
{
$iter = $page->getLinks($this->_direction);
$count = $iter->count();
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ListSubpages.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -116,7 +116,7 @@
// how many backlinks for this subpage
class _PageList_Column_ListSubpages_count extends _PageList_Column
{
- function _getValue($page, &$revision_handle)
+ private function _getValue($page, &$revision_handle)
{
$iter = $page->getBackLinks();
$count = $iter->count();
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ModeratedPage.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -371,7 +371,7 @@
}
}
- function _approval_form(&$request, $args, $moderation, $pass = 'approve')
+ private function _approval_form(&$request, $args, $moderation, $pass = 'approve')
{
$header = HTML::h3(_("Please approve or reject this request:"));
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/OldStyleTable.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -118,7 +118,7 @@
return $table;
}
- function _parse_row($line, $basepage)
+ private function _parse_row($line, $basepage)
{
$brkt_link = "\\[ .*? [^]\s] .*? \\]";
$cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/PageHistory.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -25,7 +25,7 @@
class _PageHistory_PageRevisionIter
extends WikiDB_PageRevisionIterator
{
- function _PageHistory_PageRevisionIter($rev_iter, $params)
+ private function _PageHistory_PageRevisionIter($rev_iter, $params)
{
$this->_iter = $rev_iter;
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/PluginManager.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -62,12 +62,12 @@
return $h;
}
- function _generatePageheader(&$info, &$html)
+ private function _generatePageheader(&$info, &$html)
{
$html->pushContent(HTML::p($this->getDescription()));
}
- function _generateColheadings(&$info, &$table)
+ private function _generateColheadings(&$info, &$table)
{
// table headings
$tr = HTML::tr();
@@ -80,7 +80,7 @@
$table->pushContent(HTML::thead($tr));
}
- function _generateTableBody(&$info, &$dbi, &$request, &$table)
+ private function _generateTableBody(&$info, &$dbi, &$request, &$table)
{
global $AllAllowedPlugins;
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/RateIt.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -127,7 +127,7 @@
* Take a string and quote it sufficiently to be passed as a Javascript
* string between ''s
*/
- function _javascript_quote_string($s)
+ private function _javascript_quote_string($s)
{
return str_replace("'", "\'", $s);
}
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/RecentChanges.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -28,7 +28,7 @@
var $_absurls = false;
var $action = "RecentChanges";
- function _RecentChanges_Formatter($rc_args)
+ private function _RecentChanges_Formatter($rc_args)
{
$this->_args = $rc_args;
$this->_diffargs = array('action' => 'diff');
@@ -1515,7 +1515,7 @@
$this->pushContent($table);
}
- function _makeDayButton($days_button, $days)
+ private function _makeDayButton($days_button, $days)
{
global $request;
@@ -1533,7 +1533,7 @@
return ($days_button == $days) ? $selected : $unselected;
}
- function _makeUsersButton($users)
+ private function _makeUsersButton($users)
{
global $request;
@@ -1554,7 +1554,7 @@
HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
}
- function _makePagesButton($pages)
+ private function _makePagesButton($pages)
{
global $request;
@@ -1575,7 +1575,7 @@
HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
}
- function _makeMinorButton($minor_button, $show_minor)
+ private function _makeMinorButton($minor_button, $show_minor)
{
global $request;
@@ -1587,7 +1587,7 @@
return ($minor_button == $show_minor) ? $selected : $unselected;
}
- function _makeShowAllButton($showall_button, $show_all)
+ private function _makeShowAllButton($showall_button, $show_all)
{
global $request;
@@ -1599,7 +1599,7 @@
return ($showall_button == $show_all) ? $selected : $unselected;
}
- function _makeNewPagesButton($newpages_button, $only_new)
+ private function _makeNewPagesButton($newpages_button, $only_new)
{
global $request;
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/SemanticSearch.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -435,7 +435,7 @@
class _PageList_Column_SemanticSearch_relation
extends _PageList_Column
{
- function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
+ private function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
{
$this->_field = $field;
$this->_heading = $heading;
@@ -444,7 +444,7 @@
$this->_pagelist =& $pagelist;
}
- function _getValue(&$page, $revision_handle)
+ private function _getValue(&$page, $revision_handle)
{
$link = $this->_pagelist->_links[$this->current_row];
return WikiLink($link['linkname'], 'if_known');
@@ -454,7 +454,7 @@
class _PageList_Column_SemanticSearch_link
extends _PageList_Column_SemanticSearch_relation
{
- function _getValue(&$page, $revision_handle)
+ private function _getValue(&$page, $revision_handle)
{
$link = $this->_pagelist->_links[$this->current_row];
if ($this->_field != 'value')
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/SyncWiki.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -87,7 +87,7 @@
return $this->_makeButton($request, $args, $label);
}
- function _do_syncwiki(&$request, $args)
+ private function _do_syncwiki(&$request, $args)
{
longer_timeout(240);
@@ -250,7 +250,7 @@
}
/* path must have ending slash */
- function _dir($path)
+ private function _dir($path)
{
$dh = @opendir($path);
while ($filename = readdir($dh)) {
@@ -265,7 +265,7 @@
closedir($dh);
}
- function _addConflict($what, $args, $our, $extdate = null)
+ private function _addConflict($what, $args, $our, $extdate = null)
{
$pagename = $our->getName();
$meb = Button(array('action' => $args['action'],
@@ -285,7 +285,7 @@
}
// TODO: store log or checkpoint for restauration?
- function _import($args, $our, $extdate = null)
+ private function _import($args, $our, $extdate = null)
{
$reaction = 'import ';
if ($args['noimport']) return ($reaction . _("skipped"));
@@ -309,7 +309,7 @@
}
// TODO: store log or checkpoint for restauration?
- function _export($args, $our)
+ private function _export($args, $our)
{
global $request;
$reaction = 'export ';
@@ -338,7 +338,7 @@
}
// TODO: store log or checkpoint for restauration?
- function _upload($args, $path, $timeout)
+ private function _upload($args, $path, $timeout)
{
$reaction = 'upload ';
if ($args['noupload']) return ($reaction . _("skipped"));
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/SystemInfo.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -211,7 +211,7 @@
}
// numeric array
- function _stats($hits, $treshold = 10.0)
+ private function _stats($hits, $treshold = 10.0)
{
sort($hits);
reset($hits);
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/Transclude.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -132,7 +132,7 @@
*
* @access private
*/
- function _js()
+ private function _js()
{
static $seen = false;
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WantedPages.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -147,13 +147,13 @@
// which links to the missing page
class _PageList_Column_WantedPages_wanted extends _PageList_Column
{
- function _PageList_Column_WantedPages_wanted(&$params)
+ private function _PageList_Column_WantedPages_wanted(&$params)
{
$this->parentobj =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- function _getValue(&$page, $revision_handle)
+ private function _getValue(&$page, $revision_handle)
{
$html = false;
$pagename = $page->getName();
@@ -172,13 +172,13 @@
*/
class _PageList_Column_WantedPages_links extends _PageList_Column
{
- function _PageList_Column_WantedPages_links(&$params)
+ private function _PageList_Column_WantedPages_links(&$params)
{
$this->parentobj =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- function _getValue(&$page, $revision_handle)
+ private function _getValue(&$page, $revision_handle)
{
$pagename = $page->getName();
$count = count($this->parentobj->_wpagelist[$pagename]);
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WantedPagesOld.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -152,7 +152,7 @@
}
}
- function _generateTable($caption)
+ private function _generateTable($caption)
{
if (count($this->pagelist) > 0) {
@@ -187,7 +187,7 @@
return $table;
}
- function _generateList($caption)
+ private function _generateList($caption)
{
$list = HTML();
$c = count($this->pagelist);
@@ -202,7 +202,7 @@
return $list;
}
- function _iterateLinks($page_handle, $dbi)
+ private function _iterateLinks($page_handle, $dbi)
{
$links_iter = $page_handle->getLinks($reversed = false);
while ($link_handle = $links_iter->next()) {
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminRemove.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -241,7 +241,7 @@
class _PageList_Column_remove extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ private 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 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminRename.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -310,7 +310,7 @@
// moved from lib/PageList.php
class _PageList_Column_renamed_pagename extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ private function _getValue($page_handle, &$revision_handle)
{
global $request;
$post_args = $request->getArg('admin_rename');
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminSelect.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -234,7 +234,7 @@
}
}
- function _tablePush(&$table, $first, $second)
+ private function _tablePush(&$table, $first, $second)
{
$table->pushContent(
HTML::tr(
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminUtils.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -84,7 +84,7 @@
return $this->_makeButton($request, $args, $label);
}
- function _makeButton(&$request, $args, $label)
+ private function _makeButton(&$request, $args, $label)
{
$args['return_url'] = $request->getURLtoSelf();
return HTML::form(array('action' => $request->getPostURL(),
@@ -111,7 +111,7 @@
$alert->show(); // noreturn
}
- function _getLabel($action)
+ private function _getLabel($action)
{
$labels = array('purge-cache' => _("Purge Markup Cache"),
'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"),
@@ -125,7 +125,7 @@
return @$labels[$action];
}
- function _do_purge_cache(&$request, $args)
+ private function _do_purge_cache(&$request, $args)
{
$dbi = $request->getDbh();
$pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
@@ -135,7 +135,7 @@
return _("Markup cache purged!");
}
- function _do_purge_bad_pagenames(&$request, $args)
+ private function _do_purge_bad_pagenames(&$request, $args)
{
// FIXME: this should be moved into WikiDB::normalize() or something...
$dbi = $request->getDbh();
@@ -163,7 +163,7 @@
/**
* Purge all non-referenced empty pages. Mainly those created by bad link extraction.
*/
- function _do_purge_empty_pages(&$request, $args)
+ private function _do_purge_empty_pages(&$request, $args)
{
$dbi = $request->getDbh();
$count = 0;
@@ -198,7 +198,7 @@
: ''));
}
- function _do_convert_cached_html(&$request, $args)
+ private function _do_convert_cached_html(&$request, $args)
{
require_once 'lib/upgrade.php';
@@ -215,7 +215,7 @@
}
}
- function _do_db_check(&$request, $args)
+ private function _do_db_check(&$request, $args)
{
longer_timeout(180);
$dbh = $request->getDbh();
@@ -223,7 +223,7 @@
return $dbh->_backend->check($args);
}
- function _do_db_rebuild(&$request, $args)
+ private function _do_db_rebuild(&$request, $args)
{
longer_timeout(240);
$dbh = $request->getDbh();
@@ -233,13 +233,13 @@
//TODO: We need a separate plugin for this.
// Too many options.
- function _do_access_restrictions(&$request, &$args)
+ private function _do_access_restrictions(&$request, &$args)
{
return _("Sorry. Access Restrictions not yet implemented");
}
// pagelist with enable/disable button
- function _do_email_verification(&$request, &$args)
+ private function _do_email_verification(&$request, &$args)
{
$dbi = $request->getDbh();
$pagelist = new PageList('pagename', 0, $args);
@@ -316,7 +316,7 @@
class _PageList_Column_email
extends _PageList_Column
{
- function _getValue(&$prefs, $dummy)
+ private function _getValue(&$prefs, $dummy)
{
return $prefs->get('email');
}
@@ -325,7 +325,7 @@
class _PageList_Column_emailVerified
extends _PageList_Column
{
- function _getValue(&$prefs, $status)
+ private function _getValue(&$prefs, $status)
{
$name = $prefs->get('userid');
$input = HTML::input(array('type' => 'checkbox',
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiBlog.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -306,7 +306,7 @@
// Subpage for the basepage. All Blogs/Forum/Comment entries are
// Subpages under this pagename, to find them faster.
- function _blogPrefix($type = 'wikiblog')
+ private function _blogPrefix($type = 'wikiblog')
{
if ($type == 'wikiblog')
$basepage = "Blog";
@@ -317,7 +317,7 @@
return $basepage;
}
- function _transformOldFormatBlog($rev, $type = 'wikiblog')
+ private function _transformOldFormatBlog($rev, $type = 'wikiblog')
{
$page = $rev->getPage();
$metadata = array();
@@ -370,7 +370,7 @@
}
// "2004-12" => "December 2004"
- function _monthTitle($month)
+ private function _monthTitle($month)
{
if (!$month) $month = strftime("%Y-%m");
//list($year,$mon) = explode("-",$month);
@@ -378,7 +378,7 @@
}
// "UserName/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
- function _blog($rev_or_page)
+ private function _blog($rev_or_page)
{
$pagename = $rev_or_page->getName();
if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
@@ -393,7 +393,7 @@
'prefix' => $prefix);
}
- function _nonDefaultArgs($args)
+ private function _nonDefaultArgs($args)
{
return array_diff_assoc($args, $this->getDefaultArguments());
}
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiFormRich.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -318,7 +318,7 @@
return $form;
}
- function _doautocomplete(&$form, $inputtype, &$input, &$values)
+ private function _doautocomplete(&$form, $inputtype, &$input, &$values)
{
global $request;
$input['class'] = "dropdown";
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikicreoleTable.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -135,7 +135,7 @@
return $htmltable;
}
- function _parse_row($line)
+ private function _parse_row($line)
{
$brkt_link = "\\[ .*? [^]\s] .*? \\]";
$cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";
@@ -158,7 +158,7 @@
* $i and $j: indexes of cell to compute
* $imax and $jmax: table dimensions
*/
- function _compute_tablecell($table, $i, $j, $imax, $jmax)
+ private function _compute_tablecell($table, $i, $j, $imax, $jmax)
{
// What is implemented:
Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_AuthInfo.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -130,7 +130,7 @@
return $html;
}
- function _showhash($heading, $hash, $depth = 0)
+ private function _showhash($heading, $hash, $depth = 0)
{
static $seen = array();
static $maxdepth = 0;
@@ -189,7 +189,7 @@
return $rows;
}
- function _buildConstHash($constants)
+ private function _buildConstHash($constants)
{
$hash = array();
foreach ($constants as $c) {
Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_BackendInfo.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -108,7 +108,7 @@
* Really should have a _fixupPagedata and _fixupVersiondata, but this works.
* also used in plugin/EditMetaData
*/
- function _fixupData(&$data, $prefix = '')
+ private function _fixupData(&$data, $prefix = '')
{
if (!is_array($data)) return;
@@ -167,7 +167,7 @@
}
/* also used in plugin/EditMetaData */
- function _showhash($heading, $hash, $prefix = '')
+ private function _showhash($heading, $hash, $prefix = '')
{
$rows = array();
if ($heading)
@@ -194,7 +194,7 @@
}
/* also used in plugin/EditMetaData */
- function _showvalue($key, $val, $prefix = '')
+ private function _showvalue($key, $val, $prefix = '')
{
return $val ? $val : HTML::raw(' ');
}
Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_Retransform.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -70,7 +70,7 @@
return $html;
}
- function _DebugPrintArray(&$array)
+ private function _DebugPrintArray(&$array)
{
$html = HTML();
foreach ($array as $line) {
Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php 2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_WikiTranslation.php 2013-04-16 14:03:08 UTC (rev 8748)
@@ -371,7 +371,7 @@
class _PageList_Column_customlang extends _PageList_Column
{
- function _PageList_Column_customlang($field, $from_lang, $plugin)
+ private function _PageList_Column_customlang($field, $from_lang, $plugin)
{
$this->_field = $field;
$this->_from_lang = $from_lang;
@@ -387,7 +387,7 @@
$this->_PageList_Column_base($this->_field);
}
- function _getValue($page, &$revision_handle)
+ private function _getValue($page, &$revision_handle)
{
if (is_object($page)) $text = $page->getName();
else $text = $page;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-16 14:40:04
|
Revision: 8752
http://sourceforge.net/p/phpwiki/code/8752
Author: vargenau
Date: 2013-04-16 14:40:01 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
function _getValue is not private
Modified Paths:
--------------
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
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/BackLinks.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -179,7 +179,7 @@
// how many links from this backLink to other pages
class _PageList_Column_BackLinks_count extends _PageList_Column
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/FullTextSearch.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -163,7 +163,7 @@
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/LinkDatabase.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -188,7 +188,7 @@
class _PageList_Column_LinkDatabase_links extends _PageList_Column
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/LinkSearch.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -177,7 +177,7 @@
$this->_pagelist =& $pagelist;
}
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/ListPages.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -141,7 +141,7 @@
return $this->_PageList_Column($field, $display, 'center');
}
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/ListSubpages.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -116,7 +116,7 @@
// how many backlinks for this subpage
class _PageList_Column_ListSubpages_count extends _PageList_Column
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/SemanticSearch.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -444,7 +444,7 @@
$this->_pagelist =& $pagelist;
}
- private function _getValue(&$page, $revision_handle)
+ function _getValue(&$page, $revision_handle)
{
$link = $this->_pagelist->_links[$this->current_row];
return WikiLink($link['linkname'], 'if_known');
@@ -454,7 +454,7 @@
class _PageList_Column_SemanticSearch_link
extends _PageList_Column_SemanticSearch_relation
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WantedPages.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -153,7 +153,7 @@
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- private function _getValue(&$page, $revision_handle)
+ function _getValue(&$page, $revision_handle)
{
$html = false;
$pagename = $page->getName();
@@ -178,7 +178,7 @@
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WikiAdminRemove.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -241,7 +241,7 @@
class _PageList_Column_remove extends _PageList_Column
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WikiAdminRename.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -310,7 +310,7 @@
// moved from lib/PageList.php
class _PageList_Column_renamed_pagename extends _PageList_Column
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WikiAdminUtils.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -316,7 +316,7 @@
class _PageList_Column_email
extends _PageList_Column
{
- private function _getValue(&$prefs, $dummy)
+ function _getValue(&$prefs, $dummy)
{
return $prefs->get('email');
}
@@ -325,7 +325,7 @@
class _PageList_Column_emailVerified
extends _PageList_Column
{
- private 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 2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/_WikiTranslation.php 2013-04-16 14:40:01 UTC (rev 8752)
@@ -387,7 +387,7 @@
$this->_PageList_Column_base($this->_field);
}
- private function _getValue($page, &$revision_handle)
+ function _getValue($page, &$revision_handle)
{
if (is_object($page)) $text = $page->getName();
else $text = $page;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-16 14:42:34
|
Revision: 8753
http://sourceforge.net/p/phpwiki/code/8753
Author: vargenau
Date: 2013-04-16 14:42:30 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
function _PageList_Column* are not private
Modified Paths:
--------------
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/_WikiTranslation.php
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/FullTextSearch.php 2013-04-16 14:42:30 UTC (rev 8753)
@@ -157,7 +157,7 @@
*/
class _PageList_Column_hilight extends _PageList_Column
{
- private function _PageList_Column_WantedPages_links(&$params)
+ function _PageList_Column_WantedPages_links(&$params)
{
$this->parentobj =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/LinkSearch.php 2013-04-16 14:42:30 UTC (rev 8753)
@@ -168,7 +168,7 @@
class _PageList_Column_LinkSearch_link
extends _PageList_Column
{
- private function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
+ function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
{
$this->_field = $field;
$this->_heading = $heading;
Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php 2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/ListPages.php 2013-04-16 14:42:30 UTC (rev 8753)
@@ -135,7 +135,7 @@
// how many back-/forwardlinks for this page
class _PageList_Column_ListPages_count extends _PageList_Column
{
- private function _PageList_Column_ListPages_count($field, $display, $backwards = false)
+ function _PageList_Column_ListPages_count($field, $display, $backwards = false)
{
$this->_direction = $backwards;
return $this->_PageList_Column($field, $display, 'center');
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/SemanticSearch.php 2013-04-16 14:42:30 UTC (rev 8753)
@@ -435,7 +435,7 @@
class _PageList_Column_SemanticSearch_relation
extends _PageList_Column
{
- private function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
+ function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
{
$this->_field = $field;
$this->_heading = $heading;
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/WantedPages.php 2013-04-16 14:42:30 UTC (rev 8753)
@@ -147,7 +147,7 @@
// which links to the missing page
class _PageList_Column_WantedPages_wanted extends _PageList_Column
{
- private function _PageList_Column_WantedPages_wanted(&$params)
+ function _PageList_Column_WantedPages_wanted(&$params)
{
$this->parentobj =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
@@ -172,7 +172,7 @@
*/
class _PageList_Column_WantedPages_links extends _PageList_Column
{
- private function _PageList_Column_WantedPages_links(&$params)
+ function _PageList_Column_WantedPages_links(&$params)
{
$this->parentobj =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php 2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/_WikiTranslation.php 2013-04-16 14:42:30 UTC (rev 8753)
@@ -371,7 +371,7 @@
class _PageList_Column_customlang extends _PageList_Column
{
- private function _PageList_Column_customlang($field, $from_lang, $plugin)
+ function _PageList_Column_customlang($field, $from_lang, $plugin)
{
$this->_field = $field;
$this->_from_lang = $from_lang;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-16 14:57:17
|
Revision: 8755
http://sourceforge.net/p/phpwiki/code/8755
Author: vargenau
Date: 2013-04-16 14:57:15 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
private --> protected
Modified Paths:
--------------
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiFormRich.php
Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php 2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/BlogArchives.php 2013-04-16 14:57:15 UTC (rev 8755)
@@ -88,7 +88,7 @@
// unset($pagelist->_columns['pagename']);
if (!empty($args['month'])) {
- $prefix = $parent . $this->_blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month'];
+ $prefix = $parent . $this->blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month'];
$pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix, true, 'posix'));
$html = HTML::ul();
while ($page = $pages->next()) {
@@ -98,7 +98,7 @@
$html->pushContent(HTML::li(WikiLink($page, 'known', $rev->get('summary'))));
}
if (!$args['noheader'])
- return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->_monthTitle($args['month']))),
+ return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->monthTitle($args['month']))),
$html);
else
return $html;
@@ -118,11 +118,11 @@
$mon = $blog['month'];
if (empty($months[$mon]))
$months[$mon] =
- array('title' => $this->_monthTitle($mon),
+ array('title' => $this->monthTitle($mon),
'num' => 1,
'month' => $mon,
'link' => WikiURL($basepage,
- $this->_nonDefaultArgs(array('month' => $mon))));
+ $this->nonDefaultArgs(array('month' => $mon))));
else
$months[$mon]['num']++;
}
Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php 2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/BlogJournal.php 2013-04-16 14:57:15 UTC (rev 8755)
@@ -79,7 +79,7 @@
}
$parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR);
- $prefix = $base = $parent . $this->_blogPrefix('wikiblog');
+ $prefix = $base = $parent . $this->blogPrefix('wikiblog');
if ($args['month'])
$prefix .= (SUBPAGE_SEPARATOR . $args['month']);
$pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix . SUBPAGE_SEPARATOR, true, 'posix'));
@@ -100,7 +100,7 @@
if (!$i)
return HTML(HTML::h3(_("No Blog Entries")), $html);
if (!$args['noheader'])
- return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->_monthTitle($args['month']))),
+ return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->monthTitle($args['month']))),
$html);
else
return $html;
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/WikiBlog.php 2013-04-16 14:57:15 UTC (rev 8755)
@@ -196,7 +196,7 @@
$saved = false;
if ($type != 'wikiforum')
- $pagename = $this->_blogPrefix($type);
+ $pagename = $this->blogPrefix($type);
else {
$pagename = substr($summary, 0, 12);
if (empty($pagename)) {
@@ -286,14 +286,14 @@
if ($args['order'] == 'reverse')
$blogs = array_reverse($blogs);
- $name = $this->_blogPrefix($type);
+ $name = $this->blogPrefix($type);
if (!$args['noheader'])
$html->pushContent(HTML::h4(array('class' => "$type-heading"),
fmt("%s on %s:", $name, WikiLink($basepage))));
foreach ($blogs as $rev) {
if (!$rev->get($type)) {
// Ack! this is an old-style blog with data ctime in page meta-data.
- $content = $this->_transformOldFormatBlog($rev, $type);
+ $content = $this->transformOldFormatBlog($rev, $type);
} else {
$content = $rev->getTransformedContent($type);
}
@@ -306,7 +306,7 @@
// Subpage for the basepage. All Blogs/Forum/Comment entries are
// Subpages under this pagename, to find them faster.
- private function _blogPrefix($type = 'wikiblog')
+ protected function blogPrefix($type = 'wikiblog')
{
if ($type == 'wikiblog')
$basepage = "Blog";
@@ -317,7 +317,7 @@
return $basepage;
}
- private function _transformOldFormatBlog($rev, $type = 'wikiblog')
+ private function transformOldFormatBlog($rev, $type = 'wikiblog')
{
$page = $rev->getPage();
$metadata = array();
@@ -334,7 +334,7 @@
{
$prefix = (empty($basepage)
? ""
- : $basepage . SUBPAGE_SEPARATOR) . $this->_blogPrefix($type);
+ : $basepage . SUBPAGE_SEPARATOR) . $this->blogPrefix($type);
$pages = $dbi->titleSearch(new TextSearchQuery('"' . $prefix . '"', true, 'none'));
$blogs = array();
@@ -370,7 +370,7 @@
}
// "2004-12" => "December 2004"
- private function _monthTitle($month)
+ protected function monthTitle($month)
{
if (!$month) $month = strftime("%Y-%m");
//list($year,$mon) = explode("-",$month);
@@ -378,7 +378,7 @@
}
// "UserName/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
- private function _blog($rev_or_page)
+ protected function _blog($rev_or_page)
{
$pagename = $rev_or_page->getName();
if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
@@ -386,14 +386,14 @@
return array('pagename' => $pagename,
// page (list pages per month) or revision (list months)?
//'title' => isa($rev_or_page,'WikiDB_PageRevision') ? $rev_or_page->get('summary') : '',
- //'monthtitle' => $this->_monthTitle($month),
+ //'monthtitle' => $this->monthTitle($month),
'month' => $month,
'day' => $day,
'time' => $time,
'prefix' => $prefix);
}
- private function _nonDefaultArgs($args)
+ protected function nonDefaultArgs($args)
{
return array_diff_assoc($args, $this->getDefaultArguments());
}
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/WikiFormRich.php 2013-04-16 14:57:15 UTC (rev 8755)
@@ -238,7 +238,7 @@
if (empty($input['value']) and ($s = $request->getArg($input['name'])))
$input['value'] = $s;
if (!empty($input['autocomplete']))
- $this->_doautocomplete($form, $inputtype, $input, $input['value']);
+ $this->do_autocomplete($form, $inputtype, $input, $input['value']);
if ($nobr)
$form->pushContent($text, $nbsp, HTML::input($input));
else
@@ -252,7 +252,7 @@
unset($input['type']);
if (is_string($values)) $values = explode(",", $values);
if (!empty($input['autocomplete']))
- $this->_doautocomplete($form, $inputtype, $input, $values);
+ $this->do_autocomplete($form, $inputtype, $input, $values);
$select = HTML::select($input);
if (empty($values) and ($s = $request->getArg($input['name']))) {
$select->pushContent(HTML::option(array('value' => $s), $s));
@@ -318,7 +318,7 @@
return $form;
}
- private function _doautocomplete(&$form, $inputtype, &$input, &$values)
+ private function do_autocomplete(&$form, $inputtype, &$input, &$values)
{
global $request;
$input['class'] = "dropdown";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-17 10:06:43
|
Revision: 8763
http://sourceforge.net/p/phpwiki/code/8763
Author: vargenau
Date: 2013-04-17 10:06:40 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
No underscore for private function
Modified Paths:
--------------
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_Retransform.php
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/AppendText.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -54,7 +54,7 @@
);
}
- private function _fallback($addtext, $oldtext, $notfound, &$message)
+ private function fallback($addtext, $oldtext, $notfound, &$message)
{
$message->pushContent(sprintf(_("%s not found"), $notfound) . ". " .
_("Appending at the end.") . "\n");
@@ -66,19 +66,19 @@
$args = $this->getArgs($argstr, $request);
if (!$args['pages'] or !$request->isPost()) {
- return $this->_work($args['page'], $args, $dbi, $request);
+ return $this->work($args['page'], $args, $dbi, $request);
} else {
$html = HTML();
if ($args['page'] != $basepage)
$html->pushContent("pages argument overrides page argument. ignored.", HTML::br());
foreach ($args['pages'] as $pagename) {
- $html->pushContent($this->_work($pagename, $args, $dbi, $request));
+ $html->pushContent($this->work($pagename, $args, $dbi, $request));
}
return $html;
}
}
- private function _work($pagename, $args, $dbi, &$request)
+ private function work($pagename, $args, $dbi, &$request)
{
if (empty($args['s'])) {
if ($request->isPost()) {
@@ -109,7 +109,7 @@
? preg_replace("/(\n${before})/",
"\n" . preg_quote($text, "/") . "\\1",
$oldtext)
- : $this->_fallback($text, $oldtext, $args['before'], $message);
+ : $this->fallback($text, $oldtext, $args['before'], $message);
} elseif (!empty($args['after'])) {
// Insert after
$after = preg_quote($args['after'], "/");
@@ -117,7 +117,7 @@
? preg_replace("/(\n${after})/",
"\\1\n" . preg_quote($text, "/"),
$oldtext)
- : $this->_fallback($text, $oldtext, $args['after'], $message);
+ : $this->fallback($text, $oldtext, $args['after'], $message);
} else {
// Append at the end
$newtext = $oldtext .
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/ExternalSearch.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -47,7 +47,7 @@
//fixme: better description
}
- private function _getInterWikiUrl(&$request)
+ private function getInterWikiUrl(&$request)
{
$intermap = getInterwikiMap();
$map = $intermap->_map;
@@ -88,7 +88,7 @@
if (in_array('url', array_keys($posted))) {
$s = $posted['s'];
$this->_url = $posted['url'];
- $this->_getInterWikiUrl($request);
+ $this->getInterWikiUrl($request);
if (strstr($this->_url, '%s')) {
$this->_url = sprintf($this->_url, $s);
} else
@@ -104,7 +104,7 @@
if ($formsize < 1)
$formsize = 30;
$this->_url = $url;
- $this->_getInterWikiUrl($request);
+ $this->getInterWikiUrl($request);
$form = HTML::form(array('action' => $request->getPostURL(),
'method' => 'post',
//'class' => 'class', //fixme
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/FoafViewer.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -57,7 +57,7 @@
{
// The handler is handled okay. The only problem is that it still
// throws a fatal.
- private function _error_handler($error)
+ private function error_handler($error)
{
if (strstr($error->errstr, "Failed opening required 'XML/FOAF/Parser.php'"))
return true;
@@ -90,7 +90,7 @@
/* ignore fatal on loading */
/*
global $ErrorManager;
- $ErrorManager->pushErrorHandler(new WikiMethodCb($this,'_error_handler'));
+ $ErrorManager->pushErrorHandler(new WikiMethodCb($this,'error_handler'));
*/
// Require the XML_FOAF_Parser class. This is a PEAR library not included with phpwiki.
// see doc/README.foaf
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/FuzzyPages.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -111,7 +111,7 @@
$row = HTML::tr(HTML::th(_("Name")), HTML::th(_("Score")));
if (defined('DEBUG') && DEBUG && $this->debug) {
- $this->_pushDebugHeadingTDinto($row);
+ $this->pushDebugHeadingTDinto($row);
}
$table->pushContent(HTML::thead($row));
@@ -132,7 +132,7 @@
round($score)));
if (defined('DEBUG') && DEBUG && $this->debug) {
- $this->_pushDebugTDinto($row, $found_pagename);
+ $this->pushDebugTDinto($row, $found_pagename);
}
$tbody->pushContent($row);
@@ -173,14 +173,14 @@
return $this->formatTable($this->_list, $dbi);
}
- private function _pushDebugHeadingTDinto(&$row)
+ private function pushDebugHeadingTDinto(&$row)
{
$row->pushContent(HTML::td(_("Spelling Score")),
HTML::td(_("Sound Score")),
HTML::td('Metaphones'));
}
- private function _pushDebugTDinto(&$row, $pagename)
+ private function pushDebugTDinto(&$row, $pagename)
{
// This actually calculates everything a second time for each pagename
// so the individual scores can be displayed separately for debugging.
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/GraphViz.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -73,7 +73,7 @@
extends WikiPluginCached
{
- private function _mapTypes()
+ private function mapTypes()
{
return array("imap", "cmapx", "ismap", "cmap");
}
@@ -89,7 +89,7 @@
if ($type == $this->_args['imgtype'])
return PLUGIN_CACHED_IMG_INLINE;
$device = strtolower($this->_args['imgtype']);
- if (in_array($device, $this->_mapTypes()))
+ if (in_array($device, $this->mapTypes()))
return PLUGIN_CACHED_MAP;
if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps'))) {
switch ($this->_args['imgtype']) {
@@ -185,7 +185,7 @@
//$other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
//unset ($other_imgtypes[$def['imgtype']]);
$imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
- $imgtypes = array_merge($imgtypes, array("svg", "svgz", "ps"), $this->_mapTypes());
+ $imgtypes = array_merge($imgtypes, array("svg", "svgz", "ps"), $this->mapTypes());
$helparr = array(
'<<GraphViz ' .
'imgtype' => ' = "' . $def['imgtype'] . "(default)|" . join('|', $imgtypes) . '"',
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/HtmlConverter.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -83,7 +83,7 @@
} else {
$message->pushContent(_("Processed $userfile_name"), HTML::br(), HTML::br());
$message->pushContent(_("Copy the output below and paste it into your Wiki page."), HTML::br());
- $message->pushContent($this->_process($userfile_tmpname));
+ $message->pushContent($this->process($userfile_tmpname));
}
} else {
$message->pushContent(HTML::br(), HTML::br());
@@ -95,7 +95,7 @@
return $result;
}
- private function _processA(&$file)
+ private function processA(&$file)
{
$file = eregi_replace(
@@ -104,7 +104,7 @@
$file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:\200-\377\(\)[:space:]]+)}}([^<]+)</a>", "[ \\2 | \\1 ]", $file);
}
- private function _processIMG(&$file)
+ private function processIMG(&$file)
{
$img_regexp = "_<img\s+src\s*=\s*\"([-/.a-zA-Z0-9\_~#@%$?&=:\200-\377\(\)\s]+)\"[^>]*>_";
@@ -112,7 +112,7 @@
$file = preg_replace($img_regexp, "\n\n[Upload:\\1]", $file);
}
- private function _processUL(&$file)
+ private function processUL(&$file)
{
// put any <li>-Tag in a new line to indent correctly and strip trailing white space (including new-lines)
@@ -132,15 +132,15 @@
}
}
- private function _process($file_name)
+ private function process($file_name)
{
$result = HTML();
$file = file_get_contents($file_name);
$file = html_entity_decode($file);
- $this->_processA($file);
- $this->_processIMG($file);
- $this->_processUL($file);
+ $this->processA($file);
+ $this->processIMG($file);
+ $this->processUL($file);
$file = str_replace("\r\n", "\n", $file);
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/ModeratedPage.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -321,7 +321,7 @@
// timestamp,user(obj)+userid
// handle $moderated['data'][$id]['args']['action']
} else {
- return $this->_approval_form($request, $args, $moderation, 'approve');
+ return $this->approval_form($request, $args, $moderation, 'approve');
}
}
@@ -335,7 +335,7 @@
// clean up and notify the requestor. Mabye: store and revert to have a diff later on?
$this->cleanup_and_notify($request, $args, $moderation);
} else {
- return $this->_approval_form($request, $args, $moderation, 'reject');
+ return $this->approval_form($request, $args, $moderation, 'reject');
}
}
@@ -371,7 +371,7 @@
}
}
- private function _approval_form(&$request, $args, $moderation, $pass = 'approve')
+ private function approval_form(&$request, $args, $moderation, $pass = 'approve')
{
$header = HTML::h3(_("Please approve or reject this request:"));
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/OldStyleTable.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -111,17 +111,17 @@
// bogus error if argument
trigger_error(sprintf(_("Line %s does not begin with a '|'."), $line), E_USER_WARNING);
} else {
- $table->pushContent($this->_parse_row($line, $basepage));
+ $table->pushContent($this->parse_row($line, $basepage));
}
}
return $table;
}
- private function _parse_row($line, $basepage)
+ private function parse_row($line, $basepage)
{
- $brkt_link = "\\[ .*? [^]\s] .*? \\]";
- $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";
+ $bracket_link = "\\[ .*? [^]\s] .*? \\]";
+ $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $bracket_link )*?";
preg_match_all("/(\\|+) (v*) ([<>^]?) \s* ($cell_content) \s* (?=\\||\$)/x",
$line, $matches, PREG_SET_ORDER);
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/SystemInfo.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -211,7 +211,7 @@
}
// numeric array
- private function _stats($hits, $treshold = 10.0)
+ private function get_stats($hits, $treshold = 10.0)
{
sort($hits);
reset($hits);
@@ -268,7 +268,7 @@
}
}
$treshold = 10.0;
- $stats = $this->_stats($hits, $treshold);
+ $stats = $this->get_stats($hits, $treshold);
$s = sprintf(_("total hits: %d"), $stats['sum']);
$s .= ", " . sprintf(_("max: %d"), $stats['max']);
@@ -353,8 +353,8 @@
$stats['sum']['major'], $stats['sum']['major_perc'],
$stats['sum']['minor'], $stats['sum']['minor_perc'], $stats['sum']['all']);
- $stats['perpage'] = $this->_stats($stats['perpage']);
- $stats['perpage_major'] = $this->_stats($stats['perpage_major']);
+ $stats['perpage'] = $this->get_stats($stats['perpage']);
+ $stats['perpage_major'] = $this->get_stats($stats['perpage_major']);
$stats['perpage']['major_perc'] = $stats['perpage_major']['sum'] * 100.0 / $stats['perpage']['sum'];
$stats['perpage']['minor_perc'] = 100 - $stats['perpage']['major_perc'];
$stats['perpage_minor']['sum'] = $stats['perpage']['sum'] - $stats['perpage_major']['sum'];
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/WantedPagesOld.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -76,12 +76,12 @@
$name = $page_handle->getName();
if ($name == __("InterWikiMap")) continue;
if (!in_array($name, $exclude))
- $this->_iterateLinks($page_handle, $dbi);
+ $this->iterateLinks($page_handle, $dbi);
}
} elseif ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
//only get WantedPages links for one page
$page_handle = $dbi->getPage($page);
- $this->_iterateLinks($page_handle, $dbi);
+ $this->iterateLinks($page_handle, $dbi);
if (!$request->getArg('count')) {
$args['count'] = count($this->pagelist);
} else {
@@ -111,7 +111,7 @@
$caption = fmt("Wanted Pages for %s (%d total):",
$pagelink, $c);
}
- return $this->_generateList($caption);
+ return $this->generateList($caption);
} else {
$spacer = new RawXml(" ");
@@ -146,13 +146,13 @@
$c);
$this->_columns = array(_("Count"), _("Page Name"));
if ($c > 0)
- return $this->_generateTable($caption);
+ return $this->generateTable($caption);
else
return HTML(HTML::p($caption), HTML::p($this->_messageIfEmpty));
}
}
- private function _generateTable($caption)
+ private function generateTable($caption)
{
if (count($this->pagelist) > 0) {
@@ -187,7 +187,7 @@
return $table;
}
- private function _generateList($caption)
+ private function generateList($caption)
{
$list = HTML();
$c = count($this->pagelist);
@@ -202,7 +202,7 @@
return $list;
}
- private function _iterateLinks($page_handle, $dbi)
+ private function iterateLinks($page_handle, $dbi)
{
$links_iter = $page_handle->getLinks($reversed = false);
while ($link_handle = $links_iter->next()) {
Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/_AuthInfo.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -65,36 +65,36 @@
$table = HTML::table(array('border' => 1,
'cellpadding' => 2,
'cellspacing' => 0));
- $table->pushContent($this->_showhash("AUTH DEFINES",
- $this->_buildConstHash(
+ $table->pushContent($this->show_hash("AUTH DEFINES",
+ $this->buildConstHash(
array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
"ALLOW_ANON_EDIT", "ALLOW_BOGO_LOGIN",
"REQUIRE_SIGNIN_BEFORE_EDIT", "ALLOW_USER_PASSWORDS",
"PASSWORD_LENGTH_MINIMUM", "USE_DB_SESSION"))));
if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
- $table->pushContent($this->_showhash("LDAP DEFINES",
- $this->_buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
+ $table->pushContent($this->show_hash("LDAP DEFINES",
+ $this->buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
- $table->pushContent($this->_showhash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
+ $table->pushContent($this->show_hash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
if (defined('AUTH_USER_FILE') or in_array("File", $GLOBALS['USER_AUTH_ORDER']))
- $table->pushContent($this->_showhash("AUTH_USER_FILE",
- $this->_buildConstHash(array("AUTH_USER_FILE",
+ $table->pushContent($this->show_hash("AUTH_USER_FILE",
+ $this->buildConstHash(array("AUTH_USER_FILE",
"AUTH_USER_FILE_STORABLE"))));
if (defined('GROUP_METHOD'))
- $table->pushContent($this->_showhash("GROUP_METHOD",
- $this->_buildConstHash(array("GROUP_METHOD", "AUTH_GROUP_FILE", "GROUP_LDAP_QUERY"))));
- $table->pushContent($this->_showhash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER']));
- $table->pushContent($this->_showhash("USER_AUTH_POLICY", array("USER_AUTH_POLICY" => USER_AUTH_POLICY)));
+ $table->pushContent($this->show_hash("GROUP_METHOD",
+ $this->buildConstHash(array("GROUP_METHOD", "AUTH_GROUP_FILE", "GROUP_LDAP_QUERY"))));
+ $table->pushContent($this->show_hash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER']));
+ $table->pushContent($this->show_hash("USER_AUTH_POLICY", array("USER_AUTH_POLICY" => USER_AUTH_POLICY)));
$DBParams = $GLOBALS['DBParams'];
$DBParams['dsn'] = class_exists('WikiDB_SQL') ? WikiDB_SQL::view_dsn($DBParams['dsn']) : '';
- $table->pushContent($this->_showhash("\$DBParams[]", $DBParams));
+ $table->pushContent($this->show_hash("\$DBParams[]", $DBParams));
$DBAuthParams = $GLOBALS['DBAuthParams'];
if (isset($DBAuthParams['auth_dsn']) and class_exists('WikiDB_SQL'))
$DBAuthParams['auth_dsn'] = WikiDB_SQL::view_dsn($DBAuthParams['auth_dsn']);
else
$DBAuthParams['auth_dsn'] = '';
unset($DBAuthParams['dummy']);
- $table->pushContent($this->_showhash("\$DBAuthParams[]", $DBAuthParams));
+ $table->pushContent($this->show_hash("\$DBAuthParams[]", $DBAuthParams));
$html->pushContent($table);
$html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid))));
if (!$user) {
@@ -110,33 +110,33 @@
$userdata['_file']->users[$u] = "<hidden>";
}
}
- $table->pushContent($this->_showhash("User: Object of " . get_class($user), $userdata));
+ $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata));
if (ENABLE_USER_NEW) {
$group = &$request->getGroup();
$groups = $group->getAllGroupsIn();
$groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd'));
unset($groupdata['request']);
- $table->pushContent($this->_showhash("Group: Object of " . get_class($group), $groupdata));
+ $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata));
$groups = $group->getAllGroupsIn();
$groupdata = array('getAllGroupsIn' => $groups);
foreach ($groups as $g) {
$groupdata["getMembersOf($g)"] = $group->getMembersOf($g);
$groupdata["isMember($g)"] = $group->isMember($g);
}
- $table->pushContent($this->_showhash("Group Methods: ", $groupdata));
+ $table->pushContent($this->show_hash("Group Methods: ", $groupdata));
}
$html->pushContent($table);
}
return $html;
}
- private function _showhash($heading, $hash, $depth = 0)
+ private function show_hash($heading, $hash, $depth = 0)
{
static $seen = array();
- static $maxdepth = 0;
+ static $max_depth = 0;
$rows = array();
- $maxdepth++;
- if ($maxdepth > 35) return $heading;
+ $max_depth++;
+ if ($max_depth > 35) return $heading;
if ($heading)
$rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
@@ -157,7 +157,7 @@
$val = HTML::table(array('border' => 1,
'cellpadding' => 2,
'cellspacing' => 0),
- $this->_showhash($heading, obj2hash($val), $depth + 1));
+ $this->show_hash($heading, obj2hash($val), $depth + 1));
} else {
$val = $heading;
}
@@ -169,7 +169,7 @@
$val = HTML::table(array('border' => 1,
'cellpadding' => 2,
'cellspacing' => 0),
- $this->_showhash($heading, $val, $depth + 1));
+ $this->show_hash($heading, $val, $depth + 1));
} else {
$val = $heading;
}
@@ -189,7 +189,7 @@
return $rows;
}
- private function _buildConstHash($constants)
+ private function buildConstHash($constants)
{
$hash = array();
foreach ($constants as $c) {
Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php 2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/_Retransform.php 2013-04-17 10:06:40 UTC (rev 8763)
@@ -38,8 +38,7 @@
function getDefaultArguments()
{
- return array('page' => '[pagename]',
- );
+ return array('page' => '[pagename]');
}
function run($dbi, $argstr, &$request, $basepage)
@@ -49,8 +48,7 @@
if (empty($page))
return '';
- $html = HTML(HTML::h3(fmt("Retransform page “%s”",
- $page)));
+ $html = HTML(HTML::h3(fmt("Retransform page “%s”", $page)));
// bypass WikiDB and cache, go directly through the backend.
$backend = &$dbi->_backend;
@@ -61,16 +59,16 @@
include_once 'lib/PageType.php';
$formatted = new TransformedText($dbi->getPage($page), $vdata['%content'], $vdata);
$content =& $formatted->_content;
- $html->pushContent($this->_DebugPrintArray($content));
+ $html->pushContent($this->DebugPrintArray($content));
$links = $formatted->getWikiPageLinks();
if (count($links) > 0) {
$html->pushContent(HTML::h3("Links"));
- $html->pushContent($this->_DebugPrintArray($links));
+ $html->pushContent($this->DebugPrintArray($links));
}
return $html;
}
- private function _DebugPrintArray(&$array)
+ private function DebugPrintArray(&$array)
{
$html = HTML();
foreach ($array as $line) {
@@ -82,7 +80,6 @@
}
return $html;
}
-
}
// Local Variables:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-17 10:34:05
|
Revision: 8764
http://sourceforge.net/p/phpwiki/code/8764
Author: vargenau
Date: 2013-04-17 10:34:01 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
return
Modified Paths:
--------------
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/text2png.php
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2013-04-17 10:06:40 UTC (rev 8763)
+++ trunk/lib/plugin/TeX2png.php 2013-04-17 10:34:01 UTC (rev 8764)
@@ -232,7 +232,7 @@
$link = "http://www.php.net/manual/pl/ref.image.php";
$error_html .= sprintf(_("See %s"), $link) . ".";
trigger_error($error_html, E_USER_NOTICE);
- return;
+ return HTML::p($error_html);
}
}
}
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2013-04-17 10:06:40 UTC (rev 8763)
+++ trunk/lib/plugin/text2png.php 2013-04-17 10:34:01 UTC (rev 8764)
@@ -83,7 +83,7 @@
$link = "http://www.php.net/manual/pl/ref.image.php";
$error_html .= sprintf(_("See %s"), $link) . ".";
trigger_error($error_html, E_USER_NOTICE);
- return;
+ return HTML::p($error_html);
}
}
@@ -170,7 +170,7 @@
$link = "http://www.php.net/manual/en/function.imagecreate.php";
$error_html .= sprintf(_("See %s"), $link) . ".";
trigger_error($error_html, E_USER_NOTICE);
- return;
+ return HTML::p($error_html);
}
$rgb = $this->hexcolor($backcolor, array(255, 255, 255));
$bg_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-17 10:36:53
|
Revision: 8765
http://sourceforge.net/p/phpwiki/code/8765
Author: vargenau
Date: 2013-04-17 10:36:49 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
HTML::Raw --> HTML::raw
Modified Paths:
--------------
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiFormRich.php
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/AppendText.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -146,7 +146,7 @@
} else {
$link = HTML::em(WikiLink($pagename));
- $message->pushContent(HTML::Raw(sprintf(_("Go to %s."), $link->asXml())));
+ $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXml())));
}
return $message;
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/PasswordReset.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -96,7 +96,7 @@
{
if (!$header) {
$header = HTML::p(_("Reset password of user: "),
- HTML::Raw(' '),
+ HTML::raw(' '),
HTML::input(array('type' => 'text',
'name' => "user",
'value' => $userid))
@@ -107,7 +107,7 @@
$footer = HTML::p(Button('submit:admin_reset[reset]',
$isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
- HTML::Raw(' '),
+ HTML::raw(' '),
Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
}
return HTML::form(array('action' => $request->getPostURL(),
@@ -153,7 +153,7 @@
$buttons = HTML::p(Button('submit:admin_reset[reset]',
$isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
- HTML::Raw(' '),
+ HTML::raw(' '),
Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
$header = HTML::strong("Verify");
if (!$user->isAdmin()) {
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/RateIt.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -392,7 +392,7 @@
//This adds a space between the rating smilies:
//if (($i%2) == 0) $html->pushContent("\n");
}
- $html->pushContent(HTML::Raw(" "));
+ $html->pushContent(HTML::raw(" "));
$a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
. "'$reImgId','$dimension','X')"));
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/UserPreferences.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -117,7 +117,7 @@
HiddenInputs($request->getArgs()),
HTML::p(_("Do you really want to reset all your UserPreferences?")),
HTML::p(Button('submit:delete', _("Yes"), 'delete'),
- HTML::Raw(' '),
+ HTML::raw(' '),
Button('cancel', _("Cancel")))
));
} elseif ($rp = $request->getArg('pref')) {
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/WatchPage.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -88,12 +88,12 @@
HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"),
($verified ? _("really") : ""), $page)),
HTML::p(Button('submit:add', _("Yes")),
- HTML::Raw(' '),
+ HTML::raw(' '),
Button('submit:cancel', _("Cancel"))));
} else {
$form->pushContent(HTML::p(fmt("The page %s is already watched!", $page)),
HTML::p(Button('submit:edit', _("Edit")),
- HTML::Raw(' '),
+ HTML::raw(' '),
Button('submit:cancel', _("Cancel"))));
}
$fieldset = HTML::fieldset(HTML::legend(_("Watch Page")), $form);
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/WhoIsOnline.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -78,7 +78,7 @@
if (!$request) $request =& $GLOBALS['request'];
$stats = $this->getStats($request->_dbi, $request, 'summary');
return $this->makeBox(_("Who is Online"),
- HTML(HTML::Raw('· '),
+ HTML(HTML::raw('· '),
WikiLink(_("WhoIsOnline"), 'auto',
fmt("%d online users", $stats['NUM_USERS']))));
}
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2013-04-17 10:34:01 UTC (rev 8764)
+++ trunk/lib/plugin/WikiFormRich.php 2013-04-17 10:36:49 UTC (rev 8765)
@@ -183,7 +183,7 @@
'class' => 'wikiformrich',
'accept-charset' => 'UTF-8'),
HiddenInputs(array('action' => $action)));
- $nbsp = HTML::Raw(' ');
+ $nbsp = HTML::raw(' ');
$already_submit = 0;
foreach ($this->inputbox as $inputbox) {
foreach ($inputbox as $inputtype => $input) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-18 09:36:21
|
Revision: 8769
http://sourceforge.net/p/phpwiki/code/8769
Author: vargenau
Date: 2013-04-18 09:36:18 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
tablePush is protected
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2013-04-18 09:34:48 UTC (rev 8768)
+++ trunk/lib/plugin/WikiAdminRename.php 2013-04-18 09:36:18 UTC (rev 8769)
@@ -274,28 +274,28 @@
function renameForm(&$header, $post_args, $singlepage)
{
$table = HTML::table();
- $this->_tablePush($table, _("Rename") . " " . _("from") . _(": "),
+ $this->tablePush($table, _("Rename") . " " . _("from") . _(": "),
HTML::input(array('name' => 'admin_rename[from]',
'size' => MAX_PAGENAME_LENGTH,
'maxlength' => MAX_PAGENAME_LENGTH,
'readonly' => 'readonly',
'value' => $post_args['from'])));
- $this->_tablePush($table, _("to") . _(": "),
+ $this->tablePush($table, _("to") . _(": "),
HTML::input(array('name' => 'admin_rename[to]',
'size' => MAX_PAGENAME_LENGTH,
'maxlength' => MAX_PAGENAME_LENGTH,
'value' => $post_args['to'])));
if ($singlepage === false) {
- $this->_tablePush($table, '',
+ $this->tablePush($table, '',
$this->checkBox($post_args, 'regex', _("Regex?")));
- $this->_tablePush($table, '',
+ $this->tablePush($table, '',
$this->checkBox($post_args, 'icase', _("Case insensitive?")));
}
if (defined('EXPERIMENTAL') and EXPERIMENTAL) // not yet stable
- $this->_tablePush($table, '',
+ $this->tablePush($table, '',
$this->checkBox($post_args, 'updatelinks',
_("Change pagename in all linked pages also?")));
- $this->_tablePush($table, '',
+ $this->tablePush($table, '',
$this->checkBox($post_args, 'createredirect',
_("Create redirect from old to new name?")));
$header->pushContent($table);
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2013-04-18 09:34:48 UTC (rev 8768)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2013-04-18 09:36:18 UTC (rev 8769)
@@ -239,16 +239,16 @@
_("Replace all occurences of the given string in the content of all pages.")),
HTML::br());
$table = HTML::table();
- $this->_tablePush($table, _("Replace") . _(": "),
+ $this->tablePush($table, _("Replace") . _(": "),
HTML::input(array('name' => 'admin_replace[from]',
'size' => 90,
'value' => $post_args['from'])));
- $this->_tablePush($table, _("by") . _(": "),
+ $this->tablePush($table, _("by") . _(": "),
HTML::input(array('name' => 'admin_replace[to]',
'size' => 90,
'value' => $post_args['to'])));
- $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
- $this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
+ $this->tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
+ $this->tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
$header->pushContent($table);
return $header;
}
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2013-04-18 09:34:48 UTC (rev 8768)
+++ trunk/lib/plugin/WikiAdminSelect.php 2013-04-18 09:36:18 UTC (rev 8769)
@@ -234,7 +234,7 @@
}
}
- private function _tablePush(&$table, $first, $second)
+ protected function tablePush(&$table, $first, $second)
{
$table->pushContent(
HTML::tr(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-26 12:48:17
|
Revision: 8770
http://sourceforge.net/p/phpwiki/code/8770
Author: vargenau
Date: 2013-04-26 12:48:14 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add return argument
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/PhotoAlbum.php 2013-04-26 12:48:14 UTC (rev 8770)
@@ -185,7 +185,9 @@
if ($align != 'left' && $align != 'center' && $align != 'right') {
$align = 'center';
}
- if (count($photos) == 0) return;
+ if (count($photos) == 0) {
+ return HTML::raw();
+ }
if (in_array("sort", $attributes))
sort($photos);
@@ -605,7 +607,7 @@
"src" => $src . "/$file",
"desc" => "");
}
- return;
+ return '';
}
// check if $src is an image
foreach (array('jpeg', 'jpg', 'png', 'gif') as $ext) {
@@ -618,7 +620,7 @@
"name_tile" => $src,
"src" => $src,
"desc" => "");
- return;
+ return '';
}
if (!file_exists($src))
return $this->error(fmt("Unable to find src=“%s”", $src));
@@ -627,7 +629,7 @@
"name_tile" => $src,
"src" => $src,
"desc" => "");
- return;
+ return '';
}
}
if ($web_location == 0) {
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/RateIt.php 2013-04-26 12:48:14 UTC (rev 8770)
@@ -294,7 +294,9 @@
function box($args = false, $request = false, $basepage = false)
{
if (!$request) $request =& $GLOBALS['request'];
- if (!$request->_user->isSignedIn()) return;
+ if (!$request->_user->isSignedIn()) {
+ return HTML::raw();
+ }
if (!isset($args)) $args = array();
$args['small'] = 1;
$argstr = '';
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/WatchPage.php 2013-04-26 12:48:14 UTC (rev 8770)
@@ -145,12 +145,12 @@
array('warningmsg' => _('WatchPage cancelled')),
'absolute_url'));
// noreturn
- return;
+ return '';
}
if ($request->getArg('edit')) {
$request->redirect(WikiURL(_("UserPreferences"),
false, 'absolute_url')); // noreturn
- return;
+ return '';
}
$add = $request->getArg('add');
if ($add and !$request->getArg('verify')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-26 13:06:23
|
Revision: 8771
http://sourceforge.net/p/phpwiki/code/8771
Author: vargenau
Date: 2013-04-26 13:06:20 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add missing return
Modified Paths:
--------------
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FrameInclude.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/FileInfo.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -204,6 +204,7 @@
$n -= floor($factor * $b);
return number_format($b, $n ? 3 : 0) . $suffix;
}
+ return '';
}
function phonysize($a)
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/FoafViewer.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -187,6 +187,7 @@
return $html;
}
}
+ return '';
}
/**
Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/FrameInclude.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -145,6 +145,7 @@
$request->discardOutput();
displayPage($request, new Template('frameset', $request, $tokens));
$request->finish(); //noreturn
+ return '';
}
}
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/LinkDatabase.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -183,6 +183,7 @@
} else {
return $this->error(fmt("Unsupported format argument %s", $args['format']));
}
+ return '';
}
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/ModeratedPage.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -323,6 +323,7 @@
} else {
return $this->approval_form($request, $args, $moderation, 'approve');
}
+ return '';
}
/**
@@ -337,6 +338,7 @@
} else {
return $this->approval_form($request, $args, $moderation, 'reject');
}
+ return '';
}
function cleanup_and_notify(&$request, $args, &$moderation)
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/PhotoAlbum.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -549,6 +549,7 @@
}
$photos[] = array("name" => $src, //album_location."/$src".album_default_extension,
"desc" => "");
+ return '';
}
/**
@@ -668,6 +669,7 @@
"name_tile" => dirname($src) . "/" . trim($data[0]));
}
}
+ return '';
}
}
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/RateIt.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -288,6 +288,7 @@
}
return $html;
}
+ return HTML::raw();
}
// box is used to display a fixed-width, narrow version with common header
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/WatchPage.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -169,6 +169,7 @@
}
}
}
+ return '';
}
}
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/WikiAdminSelect.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -232,6 +232,7 @@
} else {
; //return $action_result;
}
+ return '';
}
protected function tablePush(&$table, $first, $second)
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2013-04-26 12:48:14 UTC (rev 8770)
+++ trunk/lib/plugin/WikiAdminUtils.php 2013-04-26 13:06:20 UTC (rev 8771)
@@ -108,6 +108,7 @@
$message,
array(_("Back") => $args['return_url']));
$alert->show(); // noreturn
+ return '';
}
private function _getLabel($action)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-26 13:12:48
|
Revision: 8772
http://sourceforge.net/p/phpwiki/code/8772
Author: vargenau
Date: 2013-04-26 13:12:45 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add missing return
Modified Paths:
--------------
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2013-04-26 13:06:20 UTC (rev 8771)
+++ trunk/lib/plugin/FileInfo.php 2013-04-26 13:12:45 UTC (rev 8772)
@@ -295,6 +295,7 @@
$pValue->dwFileVersionLS & 0xFFFF);
}
}
+ return '';
}
// Read "RT_VERSION/VERSIONINFO" exe/dll resource info for MSWin32 binaries
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2013-04-26 13:06:20 UTC (rev 8771)
+++ trunk/lib/plugin/WikiAdminUtils.php 2013-04-26 13:12:45 UTC (rev 8772)
@@ -300,6 +300,7 @@
Button('cancel', _("Cancel")))
);
}
+ return HTML::raw();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-04-26 14:10:59
|
Revision: 8776
http://sourceforge.net/p/phpwiki/code/8776
Author: vargenau
Date: 2013-04-26 14:10:54 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
private
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/YouTube.php
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/WikiAdminRename.php 2013-04-26 14:10:54 UTC (rev 8776)
@@ -55,7 +55,7 @@
));
}
- function renameHelper($name, $from, $to, $options = false)
+ private function renameHelper($name, $from, $to, $options = false)
{
if (isset($options['regex'])) {
return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name);
@@ -66,7 +66,7 @@
}
}
- function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
+ private function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
$createredirect = false)
{
$result = HTML::div();
@@ -259,7 +259,7 @@
=> WIKIAUTH_ADMIN))));
}
- function checkBox(&$post_args, $name, $msg)
+ private function checkBox(&$post_args, $name, $msg)
{
$id = 'admin_rename-' . $name;
$checkbox = HTML::input(array('type' => 'checkbox',
@@ -271,7 +271,7 @@
return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
}
- function renameForm(&$header, $post_args, $singlepage)
+ private function renameForm(&$header, $post_args, $singlepage)
{
$table = HTML::table();
$this->tablePush($table, _("Rename") . " " . _("from") . _(": "),
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2013-04-26 14:10:54 UTC (rev 8776)
@@ -53,7 +53,7 @@
));
}
- function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
+ private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
{
$page = $dbi->getPage($pagename);
if ($page->exists()) { // don't replace default contents
@@ -86,7 +86,7 @@
return false;
}
- function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
+ private function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
{
if (empty($from)) return HTML::p(HTML::strong(fmt("Error: Empty search string.")));
$result = HTML::div();
@@ -221,7 +221,7 @@
: HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
}
- function checkBox(&$post_args, $name, $msg)
+ private function checkBox(&$post_args, $name, $msg)
{
$id = 'admin_replace-' . $name;
$checkbox = HTML::input(array('type' => 'checkbox',
@@ -233,7 +233,7 @@
return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
}
- function replaceForm(&$header, $post_args)
+ private function replaceForm(&$header, $post_args)
{
$header->pushContent(HTML::div(array('class' => 'hint'),
_("Replace all occurences of the given string in the content of all pages.")),
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/WikiPoll.php 2013-04-26 14:10:54 UTC (rev 8776)
@@ -124,7 +124,7 @@
return;
}
- function str2array($var, $obarray = false)
+ private function str2array($var, $obarray = false)
{
if (!$obarray) $obarray = $GLOBALS;
$i = 0;
@@ -235,7 +235,7 @@
return $html;
}
- function bar($percent)
+ private function bar($percent)
{
global $WikiTheme;
return HTML(HTML::img(array('src' => $WikiTheme->getImageUrl('leftbar'),
@@ -248,7 +248,7 @@
'alt' => '>')));
}
- function doPoll($page, $request, $answers, $readonly = false)
+ private function doPoll($page, $request, $answers, $readonly = false)
{
$question = $this->_args['question'];
$answer = $this->_args['answer'];
@@ -312,7 +312,7 @@
}
- function getResult($page, $i, $j)
+ private function getResult($page, $i, $j)
{
$poll = $page->get("poll");
@$count = $poll['data']['count'][$i][$j];
@@ -321,7 +321,7 @@
return array($percent, $count, $all);
}
- function storeResult($page, $i, $j)
+ private function storeResult($page, $i, $j)
{
$poll = $page->get("poll");
if (!$poll) {
Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php 2013-04-26 13:53:49 UTC (rev 8775)
+++ trunk/lib/plugin/YouTube.php 2013-04-26 14:10:54 UTC (rev 8776)
@@ -190,7 +190,7 @@
return $object;
}
- function Daily_pick()
+ private function Daily_pick()
{
if ($xml = url_get_contents("http://www.youtube.com/categories")) {
if (preg_match('/<div class="heading"><b>Pick of The Day<\/b><\/div>.*?<a href="\/watch\?v=(\w+)">/s', $xml, $m))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-05-16 08:54:01
|
Revision: 8781
http://sourceforge.net/p/phpwiki/code/8781
Author: vargenau
Date: 2013-05-16 08:53:59 +0000 (Thu, 16 May 2013)
Log Message:
-----------
These must be public
Modified Paths:
--------------
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/WikiAdminRename.php
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2013-05-16 08:49:22 UTC (rev 8780)
+++ trunk/lib/plugin/RecentChanges.php 2013-05-16 08:53:59 UTC (rev 8781)
@@ -28,7 +28,7 @@
var $_absurls = false;
var $action = "RecentChanges";
- private function _RecentChanges_Formatter($rc_args)
+ function _RecentChanges_Formatter($rc_args)
{
$this->_args = $rc_args;
$this->_diffargs = array('action' => 'diff');
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2013-05-16 08:49:22 UTC (rev 8780)
+++ trunk/lib/plugin/WikiAdminRename.php 2013-05-16 08:53:59 UTC (rev 8781)
@@ -55,7 +55,7 @@
));
}
- private function renameHelper($name, $from, $to, $options = false)
+ public function renameHelper($name, $from, $to, $options = false)
{
if (isset($options['regex'])) {
return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-06-18 13:42:46
|
Revision: 8816
http://sourceforge.net/p/phpwiki/code/8816
Author: vargenau
Date: 2013-06-18 13:42:44 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
private --> protected
Modified Paths:
--------------
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/EditMetaData.php
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 13:39:29 UTC (rev 8815)
+++ trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 13:42:44 UTC (rev 8816)
@@ -103,7 +103,7 @@
* Really should have a _fixupPagedata and _fixupVersiondata, but this works.
* also used in plugin/EditMetaData
*/
- private function _fixupData(&$data, $prefix = '')
+ protected function _fixupData(&$data, $prefix = '')
{
if (!is_array($data)) return;
@@ -162,7 +162,7 @@
}
/* also used in plugin/EditMetaData */
- private function _showhash($heading, $hash, $prefix = '')
+ protected function _showhash($heading, $hash, $prefix = '')
{
$rows = array();
if ($heading)
@@ -189,7 +189,7 @@
}
/* also used in plugin/EditMetaData */
- private function _showvalue($key, $val, $prefix = '')
+ protected function _showvalue($key, $val, $prefix = '')
{
return $val ? $val : HTML::raw(' ');
}
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2013-06-18 13:39:29 UTC (rev 8815)
+++ trunk/lib/plugin/EditMetaData.php 2013-06-18 13:42:44 UTC (rev 8816)
@@ -158,7 +158,7 @@
return $html;
}
- private function _showvalue($key, $val, $prefix = '')
+ protected function _showvalue($key, $val, $prefix = '')
{
if (is_array($val) or is_object($val)) return $val;
if (in_array($key, $this->hidden_pagemeta)) return '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-06-18 16:31:57
|
Revision: 8818
http://sourceforge.net/p/phpwiki/code/8818
Author: vargenau
Date: 2013-06-18 16:31:53 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/WikiForum.php
Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -291,7 +291,7 @@
// otherwise the headers will not be ready
$tbody = $this->getQueryResults($query, $dbi);
- return HTML::table(array('border' => 1),
+ return HTML::table(array('class' => 'bordered'),
HTML::caption($this->getCaption($args)),
HTML::thead($this->_theadrow),
$tbody);
Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/DebugAuthInfo.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -57,7 +57,7 @@
}
$html = HTML(HTML::h3(fmt("General Auth Settings")));
- $table = HTML::table(array('border' => 1));
+ $table = HTML::table(array('class' => 'bordered'));
$table->pushContent($this->show_hash("AUTH DEFINES",
$this->buildConstHash(
array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
@@ -93,7 +93,7 @@
if (!$user) {
$html->pushContent(HTML::p(fmt("No userid")));
} else {
- $table = HTML::table(array('border' => 1));
+ $table = HTML::table(array('class' => 'bordered'));
//$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
$userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
if (isa($user, "_FilePassUser")) {
@@ -130,10 +130,10 @@
if ($max_depth > 35) return $heading;
if ($heading)
- $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
- 'style' => 'color:#000000'),
+ $rows[] = HTML::tr(array(
+ 'style' => 'color:#000;background-color:#ffcccc'),
HTML::td(array('colspan' => 2,
- 'style' => 'color:#000000'),
+ 'style' => 'color:#000'),
$heading));
if (is_object($hash))
$hash = obj2hash($hash);
@@ -145,7 +145,7 @@
if ($depth > 3) $val = $heading;
elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
//if (empty($seen[$heading])) $seen[$heading] = 1;
- $val = HTML::table(array('border' => 1),
+ $val = HTML::table(array('class' => 'bordered'),
$this->show_hash($heading, obj2hash($val), $depth + 1));
} else {
$val = $heading;
@@ -155,20 +155,18 @@
if ($depth > 3) $val = $heading;
elseif (!isset($seen[$heading])) {
//if (empty($seen[$heading])) $seen[$heading] = 1;
- $val = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0),
+ $val = HTML::table(array('class' => 'bordered'),
$this->show_hash($heading, $val, $depth + 1));
} else {
$val = $heading;
}
}
$rows[] = HTML::tr(HTML::td(array('align' => 'right',
- 'bgcolor' => '#cccccc',
+ 'bgcolor' => '#ccc',
'style' => 'color:#000000'),
HTML(HTML::raw(' '), $key,
HTML::raw(' '))),
- HTML::td(array('bgcolor' => '#ffffff',
+ HTML::td(array('bgcolor' => '#fff',
'style' => 'color:#000000'),
$val ? $val : HTML::raw(' '))
);
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -52,7 +52,7 @@
$html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
$page)));
- $table = HTML::table(array('border' => 1));
+ $table = HTML::table(array('class' => 'bordered'));
$pagedata = $backend->get_pagedata($page);
if (!$pagedata) {
// FIXME: invalid HTML
@@ -127,12 +127,12 @@
// how to indent this table?
$val = unserialize($val);
$this->_fixupData($val, $fullkey);
- $data[$key] = HTML::table(array('border' => 1),
+ $data[$key] = HTML::table(array('class' => 'bordered'),
$this->_showhash(false, $val, $fullkey));
} elseif (is_array($val)) {
// how to indent this table?
$this->_fixupData($val, $fullkey);
- $data[$key] = HTML::table(array('border' => 1),
+ $data[$key] = HTML::table(array('class' => 'bordered'),
$this->_showhash(false, $val, $fullkey));
} elseif (is_object($val)) {
// how to indent this table?
@@ -140,7 +140,7 @@
print_r($val);
$val = HTML::pre(ob_get_contents());
ob_end_clean();
- $data[$key] = HTML::table(array('border' => 1),
+ $data[$key] = HTML::table(array('class' => 'bordered'),
$this->_showhash(false, $val, $fullkey));
} elseif ($key and $key == '%content') {
if ($val === true)
@@ -158,22 +158,21 @@
{
$rows = array();
if ($heading)
- $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
- 'style' => 'color:#000000'),
+ $rows[] = HTML::tr(array(
+ 'style' => 'color:#000;background-color:#ffcccc'),
HTML::td(array('colspan' => 2,
- 'style' => 'color:#000000'),
+ 'style' => 'color:#000'),
$heading));
if (!is_array($hash)) return array();
ksort($hash);
foreach ($hash as $key => $val) {
if ($this->chunk_split and is_string($val)) $val = chunk_split($val);
- $rows[] = HTML::tr(HTML::td(array('align' => 'right',
- 'bgcolor' => '#cccccc',
- 'style' => 'color:#000000'),
+ $rows[] = HTML::tr(HTML::td(array('class' => 'align-right',
+ 'style' => 'color:#000;background-color:#ccc'),
HTML(HTML::raw(' '), $key,
HTML::raw(' '))),
- HTML::td(array('bgcolor' => '#ffffff',
- 'style' => 'color:#000000'),
+ HTML::td(array(
+ 'style' => 'color:#000;background-color:#fff'),
$this->_showvalue($key, $val, $prefix))
);
}
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/EditMetaData.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -125,7 +125,7 @@
$html->pushContent(HTML::p(fmt("No metadata for %s", $page)));
$table = HTML();
} else {
- $table = HTML::table(array('border' => 1));
+ $table = HTML::table(array('class' => 'bordered'));
$this->_fixupData($pagemeta);
$table->pushContent($this->_showhash("MetaData('$page')", $pagemeta));
}
Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/LdapSearch.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -196,7 +196,7 @@
}
$html->pushContent($row);
}
- return HTML::table(array('border' => 1), $html);
+ return HTML::table(array('class' => 'bordered'), $html);
}
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/ModeratedPage.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -374,7 +374,7 @@
$loader = new WikiPluginLoader();
$BackendInfo = $loader->getPlugin("DebugBackendInfo");
- $table = HTML::table(array('border' => 1));
+ $table = HTML::table(array('class' => 'bordered'));
$content = $table;
$diff = '';
if ($moderation['args']['action'] == 'edit') {
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/PreferenceApp.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -179,12 +179,12 @@
$table = HTML::table();
$tr = HTML::tr();
- $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+ $td = HTML::td(array('style' => 'background-color:#fff'));
$td->pushContent(" ");
$tr->pushContent($td);
foreach ($people as $person) {
- $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+ $td = HTML::td(array('style' => 'background-color:#fff'));
$td->pushContent(HTML::a(array('href' => WikiURL($person),
'class' => 'wiki'
),
@@ -192,10 +192,10 @@
//$td->pushContent(WikiLink(" $person "));
$tr->pushContent($td);
}
- $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+ $td = HTML::td(array('style' => 'background-color:#fff'));
$td->pushContent(_("Total Units"));
$tr->pushContent($td);
- $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+ $td = HTML::td(array('style' => 'background-color:#fff'));
$td->pushContent(_("Total Voters"));
$tr->pushContent($td);
$table->pushContent($tr);
@@ -229,7 +229,7 @@
}
for ($i = 0; $i < count($pageids); $i++) {
$tr = HTML::tr();
- $td = HTML::td(array('align' => 'left', 'bgcolor' => '#f7f7f7'));
+ $td = HTML::td(array('style' => 'text-align:left;background-color:#f7f7f7'));
$td->pushContent(HTML::a(array('href' => WikiURL($pageids[$i]),
'class' => 'wiki'
),
@@ -238,7 +238,7 @@
$total_cans = 0;
$total_voters = 0;
for ($j = 0; $j < count($people); $j++) {
- $td = HTML::td(array('align' => 'right', 'bgcolor' => '#f7f7f7'));
+ $td = HTML::td(array('style' => 'text-align:right;background-color:#f7f7f7'));
$output = $outputArray[$people[$j]][$pageids[$i]];
$total_cans = $total_cans + $output;
if ($output == "") {
@@ -286,15 +286,15 @@
$td->pushContent(HTML::strong($cans));
$tr->pushContent($td);
}
- $td = HTML::td(array('align' => 'right'));
+ $td = HTML::td(array('class' => 'align-right'));
$td->pushContent(HTML::strong($cans_total));
$tr->pushContent($td);
- $td = HTML::td(array('align' => 'right'));
+ $td = HTML::td(array('class' => 'align-right'));
$td->pushContent(HTML::strong($total_voters));
$tr->pushContent($td);
$table->pushContent($tr);
- $table2 = HTML::table(array('bgcolor' => '#dedfdf'));
+ $table2 = HTML::table(array('style' => 'background-color:#dedfdf'));
$table2->pushContent(HTML::tr(HTML::td($table)));
$html->pushContent($table2);
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/SemanticSearch.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -141,8 +141,7 @@
$reldef,
$hiddenfield, HiddenInputs(array('attribute' => '')),
$instructions, HTML::br(),
- HTML::table
- (array('border' => 0, 'cellspacing' => 2),
+ HTML::table(
HTML::colgroup(array('span' => 6)),
HTML::thead
(HTML::tr(
Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php 2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/WikiForum.php 2013-06-18 16:31:53 UTC (rev 8818)
@@ -112,7 +112,7 @@
$dbi = $request->getDbh();
$topics = $this->findBlogs($dbi, $args['pagename'], 'wikiforum');
- $html = HTML::table(array('border' => 0));
+ $html = HTML::table();
$row = HTML::tr(HTML::th('title'),
HTML::th('last post'),
HTML::th('author'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-11 16:20:19
|
Revision: 8889
http://sourceforge.net/p/phpwiki/code/8889
Author: vargenau
Date: 2014-06-11 16:20:15 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
Remove unused argument
Modified Paths:
--------------
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/SyncWiki.php
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2014-06-11 16:04:26 UTC (rev 8888)
+++ trunk/lib/plugin/ExternalSearch.php 2014-06-11 16:20:15 UTC (rev 8889)
@@ -42,7 +42,7 @@
//fixme: better description
}
- private function getInterWikiUrl(&$request)
+ private function getInterWikiUrl()
{
$intermap = getInterwikiMap();
$map = $intermap->_map;
@@ -83,7 +83,7 @@
if (in_array('url', array_keys($posted))) {
$s = $posted['s'];
$this->_url = $posted['url'];
- $this->getInterWikiUrl($request);
+ $this->getInterWikiUrl();
if (strstr($this->_url, '%s')) {
$this->_url = sprintf($this->_url, $s);
} else
@@ -99,7 +99,7 @@
if ($formsize < 1)
$formsize = 30;
$this->_url = $url;
- $this->getInterWikiUrl($request);
+ $this->getInterWikiUrl();
$form = HTML::form(array('action' => $request->getPostURL(),
'method' => 'post',
//'class' => 'class', //fixme
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2014-06-11 16:04:26 UTC (rev 8888)
+++ trunk/lib/plugin/SyncWiki.php 2014-06-11 16:20:15 UTC (rev 8889)
@@ -116,7 +116,6 @@
//$ol = HTML::ol();
$done = array();
foreach ($pagelist as $ext) {
- $reaction = _("<unknown>");
// compare existance and dates with local page
$extdate = iso8601_decode($ext['lastModified']->scalar, 1);
// TODO: urldecode ???
@@ -130,7 +129,7 @@
// check date of latest revision if there's one, and > mergepoint
if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) {
// our was deleted after sync, and changed after last sync.
- $this->_addConflict('delete', $args, $our, $extdate);
+ $this->_addConflict('delete', $args, $our);
$reaction = (_(" skipped") . " (" . "locally deleted or moved" . ")");
} else {
$reaction = $this->_import($args, $our, $extdate);
@@ -143,14 +142,14 @@
} elseif ($extdate > $ourdate and $ourdate >= $merge_point) {
$rel = '>';
// our is older then external but newer than last sync
- $reaction = $this->_addConflict('import', $args, $our, $extdate);
+ $reaction = $this->_addConflict('import', $args, $our);
} elseif ($extdate < $ourdate and $extdate < $merge_point) {
$rel = '>';
$reaction = $this->_export($args, $our);
} elseif ($extdate < $ourdate and $extdate >= $merge_point) {
$rel = '>';
// our is newer and external is also newer
- $reaction = $this->_addConflict('export', $args, $our, $extdate);
+ $reaction = $this->_addConflict('export', $args, $our);
} else {
$rel = '==';
$reaction = _("same date");
@@ -193,7 +192,7 @@
$reaction = $this->_export($args, $our);
} elseif ($extdate < $ourdate and $extdate >= $merge_point) {
// our newer and external newer
- $reaction = $this->_addConflict($args, $our, $extdate);
+ $reaction = $this->_addConflict('', $args, $our);
}
} else {
$reaction = 'xmlrpc error';
@@ -260,7 +259,7 @@
closedir($dh);
}
- private function _addConflict($what, $args, $our, $extdate = null)
+ private function _addConflict($what, $args, $our)
{
$pagename = $our->getName();
$meb = Button(array('action' => $args['action'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-11 16:21:09
|
Revision: 8890
http://sourceforge.net/p/phpwiki/code/8890
Author: vargenau
Date: 2014-06-11 16:21:02 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
Update PHP Doc
Modified Paths:
--------------
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/RateIt.php
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2014-06-11 16:20:15 UTC (rev 8889)
+++ trunk/lib/plugin/FoafViewer.php 2014-06-11 16:21:02 UTC (rev 8890)
@@ -188,8 +188,8 @@
/**
* Renders array elements as HTML. May be used recursively.
*
- * @param $array Source array
- * @param $index Element Index to use.
+ * @param array $array Source array
+ * @param int $index Element Index to use.
* @param null $dc
* @return \RawXml
* @todo Make sure it can look more than 1 layer deep
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2014-06-11 16:20:15 UTC (rev 8889)
+++ trunk/lib/plugin/RateIt.php 2014-06-11 16:21:02 UTC (rev 8890)
@@ -309,13 +309,13 @@
*
* This needs to be put in the <body> section of the page.
*
- * @param $pagename Name of the page to rate
- * @param $version Version of the page to rate (may be "" for current)
- * @param $imgPrefix Prefix of the names of the images that display the rating
+ * @param string $pagename Name of the page to rate
+ * @param int $version Version of the page to rate (may be "" for current)
+ * @param string $imgPrefix Prefix of the names of the images that display the rating
* You can have two widgets for the same page displayed at
* once iff the imgPrefix-s are different.
- * @param $dimension Id of the dimension to rate
- * @param $small Makes a smaller ratings widget if non-false
+ * @param int $dimension Id of the dimension to rate
+ * @param bool $small Makes a smaller ratings widget if non-false
*
* Limitations: Currently this can only print the current users ratings.
* And only the widget, but no value (for buddies) also.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-13 15:15:45
|
Revision: 8912
http://sourceforge.net/p/phpwiki/code/8912
Author: vargenau
Date: 2014-06-13 15:15:35 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiPoll.php
Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/DebugAuthInfo.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -161,7 +161,7 @@
$val = $heading;
}
}
- $rows[] = HTML::tr(HTML::td(array('align' => 'right',
+ $rows[] = HTML::tr(HTML::td(array('class' => 'align-right',
'bgcolor' => '#ccc',
'style' => 'color:#000000'),
HTML(HTML::raw(' '), $key,
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/NewPagesPerUser.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -96,7 +96,8 @@
$pages[$monthnum]['author'][$author]['pages'][] = $pagename;
}
$iter->free();
- $html = HTML::table(HTML::col(array('span' => 2, 'align' => 'left')));
+ $html = HTML::table(HTML::col(array('span' => 2,
+ 'class' => 'align-left')));
$nbsp = HTML::raw(' ');
krsort($pages);
foreach ($pages as $monthname => $parr) {
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/OldStyleTable.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -131,11 +131,11 @@
$attr['rowspan'] = strlen($m[2]) + 1;
if ($m[3] == '^')
- $attr['align'] = 'center';
+ $attr['class'] = 'align-center';
else if ($m[3] == '>')
- $attr['align'] = 'right';
+ $attr['class'] = 'align-right';
else
- $attr['align'] = 'left';
+ $attr['class'] = 'align-left';
$content = TransformInline($m[4], $basepage);
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/PreferenceApp.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -203,7 +203,7 @@
for ($i = 0; $i < count($pageids); $i++) {
$total_cans = 0;
for ($j = 0; $j < count($people); $j++) {
- $td = HTML::td(array('align' => 'right'));
+ $td = HTML::td(array('class' => 'align-right'));
$cans_per_soda = $peopleTotals[$people[$j]][$pageids[$i]];
$total_cans = $total_cans + $cans_per_soda;
$outputArray[$people[$j]][$pageids[$i]] = $cans_per_soda;
@@ -255,23 +255,23 @@
if ($total_voters == "") {
$total_voters = "-";
}
- $td = HTML::td(array('align' => 'right'));
+ $td = HTML::td(array('class' => 'align-right'));
$td->pushContent($total_cans);
$tr->pushContent($td);
- $td = HTML::td(array('align' => 'right'));
+ $td = HTML::td(array('class' => 'align-right'));
$td->pushContent($total_voters);
$tr->pushContent($td);
$table->pushContent($tr);
}
$tr = HTML::tr();
- $td = HTML::td(array('align' => 'left'));
+ $td = HTML::td(array('class' => 'align-left'));
$td->pushContent(HTML::strong(_("Total Budget")));
$tr->pushContent($td);
$cans_total = 0;
$total_voters = 0;
for ($i = 0; $i < count($people); $i++) {
- $td = HTML::td(array('align' => 'right'));
+ $td = HTML::td(array('class' => 'align-right'));
$cans_for_soda = 0;
foreach ($pageids as $page) {
$cans_for_soda = $cans_for_soda + $outputArray[$people[$i]][$page];
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/RecentChanges.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -663,7 +663,7 @@
//logo click opens the HomePage in the main browser frame
global $WikiTheme;
$img = HTML::img(array('src' => $WikiTheme->getImageURL('logo'),
- 'align' => 'right',
+ 'class' => 'align-right',
'style' => 'height:2.5ex'
));
$linkurl = WikiLink(HOME_PAGE, false, $img);
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -115,12 +115,12 @@
$instructions, HTML::br(),
HTML::table(array('class' => 'fullwidth'),
HTML::tr(HTML::td(_("Page Name")._(': '), $pagefilter),
- HTML::td(array('align' => 'right'),
+ HTML::td(array('class' => 'align-right'),
$help)),
HTML::tr(HTML::td(array('colspan' => 2),
$querybox))),
HTML::br(),
- HTML::div(array('align' => 'center'), $submit));
+ HTML::div(array('class' => 'align-center'), $submit));
return $form;
}
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/TeX2png.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -203,7 +203,7 @@
$html = HTML::img(array('class' => 'tex',
'src' => $url,
'alt' => $text));
- $html = HTML::div(array('align' => 'center'), $html);
+ $html = HTML::div(array('class' => 'align-center'), $html);
break;
default:
break;
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/WantedPagesOld.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -120,7 +120,7 @@
// Enclose any FullTextSearch keys containing a space
// with quotes in oder to request a defnitive search.
$searchkey = (strstr($key, ' ') === false) ? $key : "\"$key\"";
- $row = HTML::tr(HTML::td(array('align' => 'right'),
+ $row = HTML::tr(HTML::td(array('class' => 'align-right'),
Button(array('s' => $searchkey),
$val, _("FullTextSearch")),
// Alternatively, get BackLinks
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/WikiAdminUtils.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -134,7 +134,7 @@
// FIXME: this should be moved into WikiDB::normalize() or something...
$dbi = $request->getDbh();
$count = 0;
- $list = HTML::ol(array('align' => 'left'));
+ $list = HTML::ol(array('class' => 'align-left'));
$pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
while (($page = $pages->next())) {
$pagename = $page->getName();
@@ -150,7 +150,7 @@
return _("No pages with bad names had to be deleted.");
else {
return HTML(fmt("Deleted %d pages with invalid names:", $count),
- HTML::div(array('align' => 'left'), $list));
+ HTML::div(array('class' => 'align-left'), $list));
}
}
@@ -162,7 +162,7 @@
$dbi = $request->getDbh();
$count = 0;
$notpurgable = 0;
- $list = HTML::ol(array('align' => 'left'));
+ $list = HTML::ol(array('class' => 'align-left'));
$pages = $dbi->getAllPages('include_empty');
while (($page = $pages->next())) {
if (!$page->exists()
@@ -185,7 +185,7 @@
return _("No empty, unreferenced pages were found.");
else
return HTML(fmt("Deleted %d unreferenced pages:", $count),
- HTML::div(array('align' => 'left'), $list),
+ HTML::div(array('class' => 'align-left'), $list),
($notpurgable ?
fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
$notpurgable)
@@ -205,7 +205,7 @@
return _("No old _cached_html pagedata found.");
else {
return HTML(fmt("Converted successfully %d pages", $count),
- HTML::div(array('align' => 'left'), $list));
+ HTML::div(array('class' => 'align-left'), $list));
}
}
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/WikiPoll.php 2014-06-13 15:15:35 UTC (rev 8912)
@@ -272,13 +272,13 @@
else
list($percent, $count, $all) = $this->getResult($page, $i, 1);
$print = sprintf(_(" %d%% (%d/%d)"), $percent, $count, $all);
- $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'align' => 'left'), $q)));
+ $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'class' => 'align-left'), $q)));
$html->pushContent(HTML::tr(HTML::td($checkbox),
HTML::td($a),
HTML::td($this->bar($percent)),
HTML::td($print)));
} else {
- $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'align' => 'left'), $q)));
+ $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'class' => 'align-left'), $q)));
$row = HTML();
if (!$readonly)
$this->storeResult($page, $i, $answers[$i]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-13 15:48:26
|
Revision: 8914
http://sourceforge.net/p/phpwiki/code/8914
Author: vargenau
Date: 2014-06-13 15:48:23 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/WantedPagesOld.php
Modified: trunk/lib/plugin/RecentReferrers.php
===================================================================
--- trunk/lib/plugin/RecentReferrers.php 2014-06-13 15:31:36 UTC (rev 8913)
+++ trunk/lib/plugin/RecentReferrers.php 2014-06-13 15:48:23 UTC (rev 8914)
@@ -53,7 +53,7 @@
$args = $this->getArgs($argstr, $request);
$table = HTML::table(array('class' => 'pagelist'));
if (!$args['noheader'] and !empty($args['caption']))
- $table->pushContent(HTML::caption(array('align' => 'top'), $args['caption']));
+ $table->pushContent(HTML::caption(array('style' => 'caption-side:top'), $args['caption']));
$limit = $args['limit'];
$accesslog =& $request->_accesslog;
if ($logiter = $accesslog->get_referer($limit, "external_only")
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2014-06-13 15:31:36 UTC (rev 8913)
+++ trunk/lib/plugin/WantedPagesOld.php 2014-06-13 15:48:23 UTC (rev 8914)
@@ -153,7 +153,7 @@
if (count($this->pagelist) > 0) {
$table = HTML::table(array('class' => 'pagelist'));
if ($caption)
- $table->pushContent(HTML::caption(array('align' => 'top'),
+ $table->pushContent(HTML::caption(array('style' => 'caption-side:top'),
$caption));
$row = HTML::tr();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X