Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2010-05-19 12:57:56
|
Revision: 7417
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7417&view=rev
Author: vargenau
Date: 2010-05-19 12:57:42 +0000 (Wed, 19 May 2010)
Log Message:
-----------
rcs_id no longer makes sense with Subversion global version number
Modified Paths:
--------------
trunk/index.php
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/GForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/japanese.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/pdf.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/PEAR.php
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AsciiSVG.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.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/HtmlConverter.php
trunk/lib/plugin/Imdb.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MediawikiTable.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/PopularTags.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/Processing.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RichTable.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/SystemInfo.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/UpLoad.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/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.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/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/WikicreoleTable.php
trunk/lib/plugin/YouTube.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_GroupInfo.php
trunk/lib/plugin/_PreferencesInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/_WikiTranslation.php
trunk/lib/plugin/text2png.php
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/wikilens/Buddy.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
trunk/lib/ziplib.php
trunk/tests/unit/lib/HtmlParserTest.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/XmlRpcTest.php
trunk/tests/unit_test_backend_cvs.php
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/Crao/templates/body.tmpl
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/Crao/templates/browse.tmpl
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Crao/templates/htmldump.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/Crao/templates/top.tmpl
trunk/themes/Crao/templates/wikiblog.tmpl
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/body.tmpl
trunk/themes/MonoBook/templates/browse-footer.tmpl
trunk/themes/MonoBook/templates/browse.tmpl
trunk/themes/MonoBook/templates/editpage.tmpl
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/MonoBook/templates/logo.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/MonoBook/templates/signin.tmpl
trunk/themes/MonoBook/templates/tags.tmpl
trunk/themes/MonoBook/templates/top.tmpl
trunk/themes/MonoBook/templates/viewsource.tmpl
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/templates/actionbar.tmpl
trunk/themes/Portland/templates/body.tmpl
trunk/themes/Portland/templates/browse.tmpl
trunk/themes/Portland/templates/debug.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Portland/templates/navbar.tmpl
trunk/themes/Portland/templates/viewsource.tmpl
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/clock.php
trunk/themes/Sidebar/hyperapplet.php
trunk/themes/Sidebar/hyperwiki.php
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Sidebar/templates/browse.tmpl
trunk/themes/Sidebar/templates/calendar.tmpl
trunk/themes/Sidebar/templates/content.tmpl
trunk/themes/Sidebar/templates/debug.tmpl
trunk/themes/Sidebar/templates/dump-footer.tmpl
trunk/themes/Sidebar/templates/frame-left.tmpl
trunk/themes/Sidebar/templates/frameset.tmpl
trunk/themes/Sidebar/templates/html.tmpl
trunk/themes/Sidebar/templates/htmldump.tmpl
trunk/themes/Sidebar/templates/logo.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/ratings.tmpl
trunk/themes/Sidebar/templates/rc.tmpl
trunk/themes/Sidebar/templates/search.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Sidebar/templates/tags.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/Wordpress/templates/body.tmpl
trunk/themes/Wordpress/templates/browse.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/Wordpress/templates/navbar.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/Wordpress/templates/viewsource.tmpl
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/lib/RecentChanges.php
trunk/themes/blog/templates/actionbar.tmpl
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/blog/templates/body.tmpl
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/blog/templates/browse-footer.tmpl
trunk/themes/blog/templates/browse.tmpl
trunk/themes/blog/templates/debug.tmpl
trunk/themes/blog/templates/info.tmpl
trunk/themes/blog/templates/navbar.tmpl
trunk/themes/blog/templates/sidebar.tmpl
trunk/themes/blog/templates/top.tmpl
trunk/themes/blog/templates/viewsource.tmpl
trunk/themes/blog/templates/wikiblog.tmpl
trunk/themes/blog/themeinfo.php
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/addcomment.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/body.tmpl
trunk/themes/default/templates/bottom.tmpl
trunk/themes/default/templates/browse-footer.tmpl
trunk/themes/default/templates/browse.tmpl
trunk/themes/default/templates/categorypage.tmpl
trunk/themes/default/templates/comment.tmpl
trunk/themes/default/templates/content.tmpl
trunk/themes/default/templates/debug.tmpl
trunk/themes/default/templates/dialog.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/default/templates/forumadd.tmpl
trunk/themes/default/templates/frameset.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/homepage.tmpl
trunk/themes/default/templates/html.tmpl
trunk/themes/default/templates/htmldump.tmpl
trunk/themes/default/templates/info.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/default/templates/nochanges.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/pagelink.tmpl
trunk/themes/default/templates/redirect.tmpl
trunk/themes/default/templates/savepage.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/default/templates/top.tmpl
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/default/templates/viewsource.tmpl
trunk/themes/default/templates/wikiblog.tmpl
trunk/themes/default/templates/wikiforum.tmpl
trunk/themes/default/themeinfo.php
trunk/themes/gforge/templates/actionbar.tmpl
trunk/themes/gforge/templates/blogform.tmpl
trunk/themes/gforge/templates/body.tmpl
trunk/themes/gforge/templates/bottom.tmpl
trunk/themes/gforge/templates/browse-footer.tmpl
trunk/themes/gforge/templates/browse.tmpl
trunk/themes/gforge/templates/debug.tmpl
trunk/themes/gforge/templates/editpage.tmpl
trunk/themes/gforge/templates/html.tmpl
trunk/themes/gforge/templates/login.tmpl
trunk/themes/gforge/templates/navbar.tmpl
trunk/themes/gforge/templates/pagelink.tmpl
trunk/themes/gforge/templates/ratings.tmpl
trunk/themes/gforge/templates/userprefs.tmpl
trunk/themes/gforge/themeinfo.php
trunk/themes/shamino_com/templates/actionbar.tmpl
trunk/themes/shamino_com/templates/browse-footer.tmpl
trunk/themes/shamino_com/templates/debug.tmpl
trunk/themes/shamino_com/templates/info.tmpl
trunk/themes/shamino_com/templates/signin.tmpl
trunk/themes/shamino_com/templates/top.tmpl
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/templates/actionbar.tmpl
trunk/themes/smaller/templates/info.tmpl
trunk/themes/smaller/templates/navbar.tmpl
trunk/themes/smaller/templates/signin.tmpl
trunk/themes/smaller/themeinfo.php
trunk/themes/wikilens/templates/body.tmpl
trunk/themes/wikilens/templates/categorypage.tmpl
trunk/themes/wikilens/templates/head.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
trunk/themes/wikilens/templates/ratings.tmpl
trunk/themes/wikilens/templates/top.tmpl
trunk/themes/wikilens/themeinfo.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/index.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -30,7 +30,7 @@
*/
require_once (dirname(__FILE__).'/lib/prepend.php');
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once(dirname(__FILE__).'/lib/IniConfig.php');
if (!defined('GFORGE') or !GFORGE) {
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/AccessLog.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
* Copyright 2005, 2007 Reini Urban
*
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/ArchiveCleaner.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
*
* This file is part of PhpWiki.
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/BlockParser.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004,2005 Reini Urban
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/CachedMarkup.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2008 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/Captcha.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Session Captcha v1.0
* by Gavin M. Roy <gm...@bt...>
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbSession/ADODB.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/*
Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbSession/PDO.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
* Db sessions for PDO, based on pear DB Sessions.
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbSession/SQL.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
* DB sessions for pear DB
Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbSession/dba.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/** DBA Sessions
* session:
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbSession.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
* Store sessions data in Pear DB / ADODB / dba / PDO, ....
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbaDatabase.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
require_once('lib/ErrorManager.php');
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbaListSet.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
class DbaListSet
{
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/DbaPartition.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
class DbaPartition
{
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/EditToolbar.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/ErrorManager.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
if (isset($GLOBALS['ErrorManager'])) return;
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/ExternalReferrer.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Detect external referrers
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/FileFinder.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
require_once(dirname(__FILE__).'/stdlib.php');
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/HtmlElement.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/HtmlParser.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* HtmlParser Class: Conversion HTML => wikimarkup
* Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/HttpClient.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/IniConfig.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* A configurator intended to read its config from a PHP-style INI file,
* instead of a PHP file.
@@ -77,7 +77,7 @@
$ignore["HTTP_".$key."_VARS"]++;
$ignore["_".$key]++;
}
- foreach (array("HTTP_POST_FILES","GLOBALS","RUNTIMER","ErrorManager",'RCS_IDS','LANG',
+ foreach (array("HTTP_POST_FILES","GLOBALS","RUNTIMER","ErrorManager",'LANG',
'HOME_PAGE','request','SCRIPT_NAME','VIRTUAL_PATH','SCRIPT_FILENAME') as $key)
$ignore[$key]++;
$fp = fopen($file, "wb");
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/InlineParser.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2009 Reini Urban
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/MailNotify.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2006-2007,2009 Reini Urban
* Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/PageList.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004-2009 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/PagePerm.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
* Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/PageType.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/RSSWriter091.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -21,7 +21,7 @@
// for outputting RecentChanges in RSS 0.91 format
// ----------------------------------------------------------------------
-rcs_id('$Id$');
+// rcs_id('$Id$');
include_once("lib/RssWriter.php");
class RSSWriter091 extends RSSWriter
@@ -98,7 +98,6 @@
global $request;
$request->discardOutput();
$rss->finish();
- printf("\n<!-- Generated by PhpWiki:\n%s-->\n", $GLOBALS['RCS_IDS']);
$request->finish(); // NORETURN!!!!
}
@@ -145,4 +144,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/Request.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
* Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/RssParser.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Simple RSSParser Class
* Based on Duncan Gough RSSParser class
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/RssWriter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/*
* Code for creating RSS 1.0.
*/
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/RssWriter2.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/*
* Code for creating RSS 2.0
* Author: Reini Urban for PhpWiki
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/SemanticWeb.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
* What to do on ?format=rdf What to do on ?format=owl
*
Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/SpamBlocklist.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2005 Reini Urban
*
* This file is part of PhpWiki.
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/Template.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once("lib/ErrorManager.php");
@@ -137,7 +137,7 @@
if (!isset($revision))
$revision = false;
- global $WikiTheme, $RCS_IDS, $charset;
+ global $WikiTheme, $charset;
//$this->_dump_template();
$SEP = $WikiTheme->getButtonSeparator();
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/TextSearchQuery.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
* A text search query, converting queries to PCRE and SQL matchers.
*
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/Units.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/**
*
* Interface to man units(1), /usr/share/units.dat
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiCallback.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* A callback
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/ADODB.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB.php');
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/PDO.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB.php');
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/SQL.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
require_once('lib/WikiDB.php');
//require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/ADODB.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* MS SQL extensions for the ADODB DB backend.
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend/ADODB.php');
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Oracle extensions for the ADODB DB backend.
Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend/ADODB.php');
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend/ADODB.php');
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PDO.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PearDB.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend.php');
//require_once('lib/FileFinder.php');
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
* Copyright (C) 2001-2009 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Oracle extensions for the Pear DB backend.
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/ErrorManager.php');
require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -8,7 +8,7 @@
* sqlite -init /tmp/phpwiki-sqlite.db
* sqlite /tmp/phpwiki-sqlite.db < schemas/sqlite.sql
*/
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/cvs.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Backend for handling CVS repository.
*
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dba.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
require_once('lib/WikiDB/backend/dbaBase.php');
require_once('lib/DbaDatabase.php');
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dbaBase.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* An iterator which returns all revisions of page.
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Copyright 2007 Reini Urban
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
class WikiDB_backend_dumb_TextSearchIter
extends WikiDB_backend_iterator
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
//require_once('lib/WikiDB/backend.php');
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/file.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend/flatfile.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
Copyright 1999,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/backend.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
Pagedata
Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/cvs.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,6 +1,6 @@
<?php
-rcs_id( '$Id$' );
+// rcs_id( '$Id$' );
require_once( 'lib/WikiDB.php' );
require_once( 'lib/WikiDB/backend/cvs.php' );
Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/dba.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
require_once('lib/WikiDB.php');
require_once('lib/WikiDB/backend/dba.php');
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/file.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,6 +1,6 @@
<?php
-rcs_id( '$Id$' );
+// rcs_id( '$Id$' );
/**
Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB/flatfile.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,6 +1,6 @@
<?php
-rcs_id( '$Id$' );
+// rcs_id( '$Id$' );
/**
Copyright 1999, 2005 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiDB.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
require_once('lib/PageType.php');
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiGroup.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/*
* Copyright (C) 2003, 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiPlugin.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
class WikiPlugin
{
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiPluginCached.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/*
* Copyright (C) 2002 Johannes Große
* Copyright (C) 2004,2007 Reini Urban
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiTheme.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id$');
+<?php // rcs_id('$Id$');
/* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
*
* This file is part of PhpWiki.
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/AdoDb.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/BogoLogin.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/Db.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/EMailConfirm.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2006 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/Facebook.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2009 Reini Urban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/File.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/Forbidden.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/GForge.php
===================================================================
--- trunk/lib/WikiUser/GForge.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/GForge.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2006 Alain Peyrat
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/HttpAuth.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004,2007 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/IMAP.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/LDAP.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004,2007 $ThePhpWikiProgrammingTeam
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/LdapUpper.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2007,2009 Reini Urban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/OpenID.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2007,2009 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/POP3.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/PdoDb.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004, 2005 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/PearDb.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/PersonalPage.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser/Session.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*/
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUser.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
// It is anticipated that when userid support is added to phpwiki,
// this object will hold much more information (e-mail,
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WikiUserNew.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id$');
+// rcs_id('$Id$');
/* Copyright (C) 2004,2005,2006,2007,2009 $ThePhpWikiProgrammingTeam
* Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
* Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
Modified: trunk/lib/WysiwygEdit/FCKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/FCKeditor.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WysiwygEdit/FCKeditor.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* FCKeditor is compatible with most internet browsers which
* include: IE 5.5+ (Windows), Firefox 1.0+, Mozilla 1.3+
Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* Wikiwyg is compatible with most internet browsers which
* include: IE 5.5+ (Windows), Firefox 1.0+, Mozilla 1.3+
Modified: trunk/lib/WysiwygEdit/htmlarea2.php
===================================================================
--- trunk/lib/WysiwygEdit/htmlarea2.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WysiwygEdit/htmlarea2.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* requires installation into themes/default/htmlarea2/
* Output the javascript function to check for MS Internet Explorer >= 5.5 on Windows
Modified: trunk/lib/WysiwygEdit/htmlarea3.php
===================================================================
--- trunk/lib/WysiwygEdit/htmlarea3.php 2010-05-19 09:41:19 UTC (rev 7416)
+++ trunk/lib/WysiwygEdit/htmlarea3.php 2010-05-19 12:57:42 UTC (rev 7417)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id$');
+// rcs_id('$Id$');
/**
* requires installation into themes/default/htmlarea3/
* MSIE => 5.5, Mozilla >= 1.3
Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php 2010-05-19 09:41:19...
[truncated message content] |
|
From: <var...@us...> - 2010-05-19 15:19:04
|
Revision: 7418
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7418&view=rev
Author: vargenau
Date: 2010-05-19 15:18:51 +0000 (Wed, 19 May 2010)
Log Message:
-----------
Remove useless pages
Removed Paths:
-------------
trunk/locale/de/pgsrc/SeitenGruppenTest
trunk/locale/de/pgsrc/SeitenGruppenTest%2FDrei
trunk/locale/de/pgsrc/SeitenGruppenTest%2FEins
trunk/locale/de/pgsrc/SeitenGruppenTest%2FVier
trunk/locale/de/pgsrc/SeitenGruppenTest%2FZwei
trunk/locale/fr/pgsrc/Aide%2FPageTestAnciennesMarques
trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques
trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages
trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FDeux
trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FTrois
trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FUn
trunk/locale/zh/pgsrc/OldMarkupTestPage
trunk/locale/zh/pgsrc/PageGroupTest
trunk/locale/zh/pgsrc/PageGroupTestFour
trunk/locale/zh/pgsrc/PageGroupTestOne
trunk/locale/zh/pgsrc/PageGroupTestThree
trunk/locale/zh/pgsrc/PageGroupTestTwo
trunk/pgsrc/Help%2FNewMarkupTestPage
trunk/pgsrc/Help%2FOldMarkupTestPage
trunk/pgsrc/Help%2FPageGroupTest
trunk/pgsrc/Help%2FPageGroupTestFour
trunk/pgsrc/Help%2FPageGroupTestOne
trunk/pgsrc/Help%2FPageGroupTestThree
trunk/pgsrc/Help%2FPageGroupTestTwo
trunk/pgsrc/LisaNova
trunk/pgsrc/PgsrcTranslation
trunk/pgsrc/PgsrcTranslation%2Fde
trunk/pgsrc/PgsrcTranslation%2Fes
trunk/pgsrc/PgsrcTranslation%2Ffr
trunk/pgsrc/PgsrcTranslation%2Fit
trunk/pgsrc/PgsrcTranslation%2Fja
trunk/pgsrc/PgsrcTranslation%2Fnl
trunk/pgsrc/PgsrcTranslation%2Fsv
trunk/pgsrc/PgsrcTranslation%2Fzh
Deleted: trunk/locale/de/pgsrc/SeitenGruppenTest
===================================================================
--- trunk/locale/de/pgsrc/SeitenGruppenTest 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/de/pgsrc/SeitenGruppenTest 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,33 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=SeitenGruppenTest;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-SeitenGruppenTest ist ein Test für das ~PageGroup Zusatzprogramm.
-
-Click the first page to start the tour of this experimental plugin. Die weiteren Gruppenseiten müssen keine Unterseiten wie hier sein, es können beliebige Seiten sein.
-
-==== Inhaltsverzeichnis
-# [SeitenGruppenTest/Eins]
-# [SeitenGruppenTest/Zwei]
-# [SeitenGruppenTest/Drei]
-# [SeitenGruppenTest/Vier]
-
-==== TODO
-
-* Support ~[ name | page ~] links
-* Support Previous, Next ... image buttons
-
-%%% %%% %%% %%%
-
-----
-
-For reference, here are all the pages that link to SeitenGruppenTest
-(note that one is missing):
-
-<<BackLinks page=SeitenGruppenTest >>
Deleted: trunk/locale/de/pgsrc/SeitenGruppenTest%2FDrei
===================================================================
--- trunk/locale/de/pgsrc/SeitenGruppenTest%2FDrei 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/de/pgsrc/SeitenGruppenTest%2FDrei 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,25 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=SeitenGruppenTest%2FDrei;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-You're almost there!
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Weiter!"
- parent=SeitenGruppenTest
- section="Inhaltsverzeichnis"
->>
-
-Note that the navigation bar can be anywhere, it doesn't have to be at
-the bottom or even consistent from page to page. The label can also
-vary--not sure if this is a good thing. Click Next.
Deleted: trunk/locale/de/pgsrc/SeitenGruppenTest%2FEins
===================================================================
--- trunk/locale/de/pgsrc/SeitenGruppenTest%2FEins 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/de/pgsrc/SeitenGruppenTest%2FEins 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,33 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=SeitenGruppenTest%2FEins;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-Ok, this is page one in this page group.
-
-There is a bug. When looping is true (and it is, but only for this
-first page--another possible flaw) and if the Contents title is not
-the first item on the Table of Contents page, and if there are other
-things on the TOC page after the actual list, then things get screwed
-up. Note that the __Previous:__ link below should point to the last
-page. Click Next.
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Other pages in this group"
- loop=1
- parent=SeitenGruppenTest
- section="Inhaltsverzeichnis"
->>
-
-----
-
-SeitenGruppenTest
Deleted: trunk/locale/de/pgsrc/SeitenGruppenTest%2FVier
===================================================================
--- trunk/locale/de/pgsrc/SeitenGruppenTest%2FVier 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/de/pgsrc/SeitenGruppenTest%2FVier 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,29 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=SeitenGruppenTest%2FVier;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-Das ist also die letzte Seite in dieser Gruppe.
-
-Note that looping of off on this page, so __Next:__ shouldn't show up
-here but it does because of the bug described in [/Eins].
-
-%%% %%% %%% %%% %%% %%% %%%
-----
-
-<<PageGroup
- parent=SeitenGruppenTest
- section="Inhaltsverzeichnis"
- loop=false
->>
-
-----
-
-SeitenGruppenTest
Deleted: trunk/locale/de/pgsrc/SeitenGruppenTest%2FZwei
===================================================================
--- trunk/locale/de/pgsrc/SeitenGruppenTest%2FZwei 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/de/pgsrc/SeitenGruppenTest%2FZwei 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,28 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=SeitenGruppenTest%2FZwei;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-<<PageGroup
- parent=SeitenGruppenTest
- section="Inhaltsverzeichnis"
->>
-
-----
-
-%%% %%% %%% %%% %%% %%% %%%
-
-Welcome to page two.
-
-It would be nice if this plugin would work together with BackLinks, so
-that it's presence on a page would be detected by the backlink plugin
-without having to actually add a link to the parent: SeitenGruppenTest.
-
-Click Next.
Deleted: trunk/locale/fr/pgsrc/Aide%2FPageTestAnciennesMarques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPageTestAnciennesMarques 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/fr/pgsrc/Aide%2FPageTestAnciennesMarques 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,144 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FPageTestAnciennesMarques;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
- Nouvelles listes : astérisques, dièses et ";text:def"
-* gros point
-* l1
-** l2
-** l2
-*** l3
-# un
-#deux
-#trois
-;Terme1:définition1.1
-;:définition1.2
-;Terme2:définition2
-;; Terme3:définition3
-;;;Terme4: définition4
-;;; : définition4.2
-;;; Terme5 : définition5
-
-Mixte :
-*ul1
-*#ul1-ol1
-*#ul1-ol2
-*#*ul1-ol2-ul1
-*#*ul1-ol2-ul2
-*#**ul1-ol2-ul2-ul1
-*#**ul1-ol2-ul2-ul2
-
-*l1
- texte pré-formaté
-** l2
-----
- anciennnes listes
- * level 1
- * l1
- *l2
- *l2
- *l3
- *l3
- *l4
- *l3
- *l5
- *l3
- #un
- #deux
- #un
- #deux
- *l1
- #trois
- #four
- *l1
- *l2
- # un
- # deux
-
- texte pré-formaté
- texte supplémentaire
-
- *l1
- *l2
- # numéro
- # numéro
-C'est un paragraphe simple
- * gros point
-C'est toujours un paragraphe simple
- # numéro
-----
-__Tests de liens__
-# normal : PageAccueil
-# avec crochets : [PageAccueil] -- nommé : [la page d'accueil|PageAccueil]
-# lien avec crochets : [http://phpwiki.sourceforge.net/]
-# lien sans crochets : http://phpwiki.sourceforge.net/
-# lien avec un mot Wiki : http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
-# deux lien sconsécutifs: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
-# [PhpWiki à Sourceforge | http://phpwiki.sourceforge.net/]
-# [URL avec un mot Wiki | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
-# Javascript: [boo! | javascript:alert('oops') ] (c'est désormais un lien nommé interne)
-# un [[Lien] produit un [Lien]
-# un [Lien] ressemble à ceci : [[Lien]
-# [%%%] est un lien vers un changement de ligne
-# aussi cette page [[n'est pas liée à], et celle-ci est !PasLiéeÀ et celle-là !http://not.linked.to/ non plus.
-#* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
-#* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
-#* WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
-#* !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
-
-----
-Tests de marques :
-
-__underscores pour le gras__
-
-'''apostrophes pour le gras'''
-
-''apostrophes pour l'italique''
-
-__''underscores pour l'italique gras''__
-
-'''''cinq apostrophes pour l'italique gras'''''
-
-''''''six apostrophes''''''
-
-'''''italique gras''' et italique'' (à éviter)
-
-'''gras et ''italique gras''''' (à éviter)
-
-!!! h1
-
-!! h2
-
-! h3
-
-c'est un texte simple avec <br>%%%
-une nouvelle ligne
-
-Aller voir <a href="http://phpwiki.sourceforge.net/">les marques</a>
-
-Vous ne pouvez pas utiliser &, < ou >
-
-----
-Usage en texte pré-formaté :
-
- __underscores pour le gras__
- '''apostrophes pour le gras'''
- ''apostrophes pour l'italique''
- __''underscores pour l'italique gras''__
- '''''cinq apostrophes pour l'italique gras'''''
- ''''''six apostrophes''''''
- '''''italique gras''' et italique'' (à éviter)
- '''gras et ''italique gras''''' (à éviter)
- !!! h1
- !! h2
- ! h3
- c'est un texte simple avec <br>%%%
- une nouvelle ligne
- Aller voir <a href="http://phpwiki.sourceforge.net/">les marques</a>
- vous ne pouvez pas utiliser &, < ou >
Deleted: trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,157 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FPageTestNouvellesMarques;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-Nouvelles listes : astérisques, dièses et ";text:def"
-* gros point
-* l1
- * l2
- * l2
- * l3
- # un
- #deux
- #trois
-Terme1:
- définition1.1
-
- définition1.2
-Terme2 :
- définition2
-
- Terme3:
- définition3
- Terme4:
- définition4
-
- définition4.2
- Terme5 :
- définition5
-
-Mixte -
- * ul1
- # ul1-ol1
- # ul1-ol2
- * ul1-ol2-ul1
- * ul1-ol2-ul2
- * ul1-ol2-ul2-ul1
- * ul1-ol2-ul2-ul2
-
-* l1
- <pre>
- texte pré-formaté
- </pre>
- * l2
-----
- anciennnes listes, chose curieuse, s'affiche bien
- * level 1
- * l1
- *l2
- *l2
- *l3
- *l3
- *l4
- *l3
- *l5
- *l3
- #un
- #deux
- #un
- #deux
- *l1
- #trois
- #four
- *l1
- *l2
- # un
- # deux
-
-<pre>
- texte pré-formaté
- texte supplémentaire
-</pre>
-
- *l1
- *l2
- # numéro
- # numéro
-C'est un paragraphe simple
- * gros point
-C'est toujours un paragraphe simple
- # numéro
-----
-__Tests de liens__
-# normal : PageAccueil
-# avec crochets : [PageAccueil] -- nommé : [la page d'accueil|PageAccueil]
-# lien avec crochets : [http://phpwiki.sourceforge.net/]
-# lien sans crochets : http://phpwiki.sourceforge.net/
-# lien avec un mot Wiki : http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
-# deux lien sconsécutifs: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
-# [PhpWiki à Sourceforge | http://phpwiki.sourceforge.net/]
-# [URL avec un mot Wiki | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
-# Javascript: [boo! | javascript:alert('oops') ] (c'est désormais un lien nommé interne)
-# un [[Lien] produit un [Lien]
-# un [Lien] ressemble à ceci : [[Lien]
-# [%%%] est un lien vers un changement de ligne
-# aussi cette page [[n'est pas liée], celle-ci n'est !PasLiée et celle-là !http://not.linked.to/ non plus.
- * WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
- * !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
- * WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
- * !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
-
-----
-Tests de marques :
-
-__underscores pour le gras__
-
-'''apostrophes pour le gras'''
-
-''apostrophes pour l'italique''
-
-__''underscores pour l'italique gras''__
-
-'''''cinq apostrophes pour l'italique gras'''''
-
-''''''six apostrophes''''''
-
-'''''italique gras''' et italique'' (à éviter)
-
-'''gras et ''italique gras''''' (à éviter)
-
-!!! h1
-
-!! h2
-
-! h3
-
-c'est un texte simple avec <br>%%%
-une nouvelle ligne
-
-Aller voir <a href="http://phpwiki.sourceforge.net/">les marques</a>
-
-vous ne pouvez pas utiliser &, < ou >
-
-----
-Usage en texte pré-formaté :
-<pre>
-__underscores pour le gras__
-'''apostrophes pour le gras'''
-''apostrophes pour l'italique''
-__''underscores pour l'italique gras''__
-'''''cinq apostrophes pour l'italique gras'''''
-''''''six apostrophes''''''
-'''''italique gras''' et italique'' (à éviter)
-'''gras et ''italique gras''''' (à éviter)
-!!! h1
-!! h2
-! h3
-c'est un texte simple avec <br>%%%
-une nouvelle ligne
-Aller voir <a href="http://phpwiki.sourceforge.net/">les marques</a>
-vous ne pouvez pas utiliser &, < ou >
-</pre>
Deleted: trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,34 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FTestGroupeDePages;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-TestGroupeDePages est un test pour le plugin ~PageGroup
-
-Cliquez sur la première page pour lancer la visite de ce plugin
-expérimental.
-
-==== Table des matières
-# [TestGroupeDePages/Un]
-# [TestGroupeDePages/Deux]
-# [TestGroupeDePages/Trois]
-# [TestGroupeDePages/Quatre]
-
-==== À faire
-
-* Accepter les liens ~[ nom | page ~]
-* Accepter Précédent, Suivant... et les boutons images.
-
-%%% %%% %%% %%%
-
-----
-
-Pour référence, voici toutes les pages qui sont liées à TestGroupeDePages
-(notez qu'une seule est absente) :
-
-<<BackLinks page=TestGroupeDePages>>
Deleted: trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FDeux
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FDeux 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FDeux 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,28 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FTestGroupeDePages%2FDeux;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-<<PageGroup
- parent=TestGroupeDePages
- section="Table des matières"
->>
-
-----
-
-%%% %%% %%% %%% %%% %%% %%%
-
-Bienvenu sur la deuxième page.
-
-Ce serait bien si ce plugin pouvait fonctionner avec RétroLiens, de
-telle sorte que sa présence sur une page serait détectée par le plugin
-des rétro-liens sans avoir à ajouter comme maintenant un lien vers le
-parent : TestGroupeDePages.
-
-Cliquez sur la page suivante.
-
Deleted: trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FTrois
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FTrois 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FTrois 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,25 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FTestGroupeDePages%2FTrois;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-Vous êtes presque arrivé !
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Allons-y !"
- parent=TestGroupeDePages
- section="Table des matières"
->>
-
-Remarquez que la barre de navigation peut être partout et pas
-nécessairement en haut ou au même endroit sur chaque page.
-L'étiquette peut également varier (pas sûr que ce soit une bonne chose).
-
-Cliquez sur la page suivante.
Deleted: trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FUn
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FUn 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/fr/pgsrc/Aide%2FTestGroupeDePages%2FUn 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,31 +0,0 @@
-Date: Thu, 15 Apr 2010 16:34:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FTestGroupeDePages%2FUn;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-Ok, c'est la première page du groupe
-
-Il y a un bug. Quand la boucle est activée (et c'est la cas seulement pour
-cette première page -- un autre défaut possible) et si le titre du sommaire
-n'est pas le premier item dans la page de la table des matières et s'il y a
-autre chose dans la table des matières après la liste actuelle alors les
-choses tournent mal. Notez que le lien __Précédent :__ ci-dessous pointe vers
-la dernière page. Cliquez sur le suivant.
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Autres pages du groupe"
- loop=1
- parent=TestGroupeDePages
- section="Table des matières"
->>
-
-----
-TestGroupeDePages
-
Deleted: trunk/locale/zh/pgsrc/OldMarkupTestPage
===================================================================
--- trunk/locale/zh/pgsrc/OldMarkupTestPage 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/zh/pgsrc/OldMarkupTestPage 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,142 +0,0 @@
-Date: Thu, 15 Apr 2010 16:35:00 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=OldMarkupTestPage;
- flags=PAGE_LOCKED;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
- New lists: asterisks, hash marks, and ";text:def"
-* bullet
-* l1
-** l2
-** l2
-*** l3
-# one
-#two
-#three
-;Term1:definition1.1
-;: defintion1.2
-;Term2 :defintion2
-;; Term3:defintion3
-;;;Term4: definition4
-;;; : defintion4.2
-;;; Term5 : defintion5
-
-Mixed:
-*ul1
-*#ul1-ol1
-*#ul1-ol2
-*#*ul1-ol2-ul1
-*#*ul1-ol2-ul2
-*#**ul1-ol2-ul2-ul1
-*#**ul1-ol2-ul2-ul1
-
-*l1
- preformatted text
-** l2
-----
- old lists
- * level 1
- * l1
- *l2
- *l2
- *l3
- *l3
- *l4
- *l3
- *l5
- *l3
- #one
- #two
- #one
- #two
- *l1
- #three
- #four
- *l1
- *l2
- # one
- # two
-
- preformatted text
- some more text
-
- *l1
- *l4
- # number
- # number
-this is a plain paragraph
- * bullet
-this is a plain paragraph again
- # number
-----
-__Link tests__
-# normal: HomePage
-# in brackets: [HomePage] -- named: [the front page|HomePage]
-# Link in brackets: [http://phpwiki.sourceforge.net/]
-# Link outside brackets: http://phpwiki.sourceforge.net/
-# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
-# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
-# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
-# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
-# Javascript: [boo! | javascript:alert('oops') ] (is now: named internal link)
-# A [[Link] produces a [Link]
-# A [Link] looks like this: [[Link]
-# This is a [%%%] line break link
-# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
-#* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
-#* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
-#* WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
-#* !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
-
-----
-Markup tests:
-
-__underscores for bold__
-
-'''quotes for bold'''
-
-''quotes for italic''
-
-__''underscores bold italic''__
-
-'''''five quotes bold italic'''''
-
-''''''six quotes''''''
-
-'''''Bold italic''' and italic'' (buggy)
-
-'''Bold and ''bold-italic''''' (also buggy)
-
-!!! h1
-
-!! h2
-
-! h3
-
-this is plain text with <br>%%%
-a line break
-
-look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
-
-you cannot use &, < or >
-
-----
-Usage in preformatted text:
-
- __underscores for bold__
- '''quotes for bold'''
- ''quotes for italic''
- __''underscores bold italic''__
- '''''five quotes bold italic'''''
- ''''''six quotes''''''
- !!! h1
- !! h2
- ! h3
- this is plain text with <br>%%%
- a line break
- look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
- you cannot use &, < or >
-
Deleted: trunk/locale/zh/pgsrc/PageGroupTest
===================================================================
--- trunk/locale/zh/pgsrc/PageGroupTest 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/zh/pgsrc/PageGroupTest 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,35 +0,0 @@
-Date: Thu, 15 Apr 2010 16:35:00 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PageGroupTest;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-PageGroupTest 是 !PageGroup plugin 的測試.
-
-點擊第一頁以起始這個實驗性 plugin 的旅程.
-
-==== Table of Contents
-PageGroupTestOne
-PageGroupTestTwo
-PageGroupTestThree
-PageGroupTestFour
-
-==== TODO
-
-Page names currently must be listed one per line. An ordered or
-unordered list would be better.
-
-%%% %%% %%% %%% %%% %%% %%%
-
-----
-
-For reference, here are all the pages that link to PageGroupTest (note
-that one is missing):
-
-<<BackLinks page=PageGroupTest >>
Deleted: trunk/locale/zh/pgsrc/PageGroupTestFour
===================================================================
--- trunk/locale/zh/pgsrc/PageGroupTestFour 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/zh/pgsrc/PageGroupTestFour 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,29 +0,0 @@
-Date: Thu, 15 Apr 2010 16:35:00 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PageGroupTestFour;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-所以,這是這個頁面群組的最後一頁.
-
-Note that looping of off on this page, so __Next:__ shouldn't show up
-here but it does because of the bug described in PageGroupTestOne.
-
-%%% %%% %%% %%% %%% %%% %%%
-----
-
-<<PageGroup
- parent=PageGroupTest
- section="Table of Contents"
- loop=false
->>
-
-----
-
-PageGroupTest
Deleted: trunk/locale/zh/pgsrc/PageGroupTestOne
===================================================================
--- trunk/locale/zh/pgsrc/PageGroupTestOne 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/zh/pgsrc/PageGroupTestOne 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,33 +0,0 @@
-Date: Thu, 15 Apr 2010 16:35:00 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PageGroupTestOne;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-Ok, 這是這個頁面群組的第一頁.
-
-There is a bug. When looping is true (and it is, but only for this
-first page--another possible flaw) and if the Contents title is not
-the first item on the Table of Contents page, and if there are other
-things on the TOC page after the actual list, then things get screwed
-up. Note that the __Previous:__ link below should point to the last
-page. Click Next.
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Other pages in this group"
- loop=1
- parent=PageGroupTest
- section="Table of Contents"
->>
-
-----
-
-PageGroupTest
Deleted: trunk/locale/zh/pgsrc/PageGroupTestThree
===================================================================
--- trunk/locale/zh/pgsrc/PageGroupTestThree 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/zh/pgsrc/PageGroupTestThree 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,25 +0,0 @@
-Date: Thu, 15 Apr 2010 16:35:00 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PageGroupTestThree;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-你快到了!
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Go!"
- parent=PageGroupTest
- section="Table of Contents"
->>
-
-Note that the navigation bar can be anywhere, it doesn't have to be at
-the bottom or even consistent from page to page. The label can also
-vary--not sure if this is a good thing. Click Next.
Deleted: trunk/locale/zh/pgsrc/PageGroupTestTwo
===================================================================
--- trunk/locale/zh/pgsrc/PageGroupTestTwo 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/locale/zh/pgsrc/PageGroupTestTwo 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,28 +0,0 @@
-Date: Thu, 15 Apr 2010 16:35:00 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PageGroupTestTwo;
- flags="";
- author=CarstenKlapp;
- author_id=CarstenKlapp;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-<<PageGroup
- parent=PageGroupTest
- section="Table of Contents"
->>
-
-----
-
-%%% %%% %%% %%% %%% %%% %%%
-
-歡迎來到第二頁.
-
-It would be nice if this plugin would work together with BackLinks, so
-that it's presence on a page would be detected by the backlink plugin
-without having to actually add a link to the parent: PageGroupTest.
-
-Click Next.
Deleted: trunk/pgsrc/Help%2FNewMarkupTestPage
===================================================================
--- trunk/pgsrc/Help%2FNewMarkupTestPage 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FNewMarkupTestPage 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,155 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FNewMarkupTestPage;
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-New lists: asterisks, hash marks, and ";text:def" (wrong...)
-* bullet
-* l1
- * l2
- * l2
- * l3
- # one
- #two
- #three
-Term1:
- definition1.1
-
- definition1.2
-Term2 :
- definition2
-
- Term3:
- definition3
- Term4:
- definition4
-
- definition4.2
- Term5 :
- definition5
-
-Mixed -
- * ul1
- # ul1-ol1
- # ul1-ol2
- * ul1-ol2-ul1
- * ul1-ol2-ul2
- * ul1-ol2-ul2-ul1
- * ul1-ol2-ul2-ul2
-
-* l1
- <pre>
- preformatted text
- </pre>
- * l2
-----
- old lists, oddly enough, work fine
- * level 1
- * l1
- *l2
- *l2
- *l3
- *l3
- *l4
- *l3
- *l5
- *l3
- #one
- #two
- #one
- #two
- *l1
- #three
- #four
- *l1
- *l2
- # one
- # two
-
-<pre>
- preformatted text
- some more text
-</pre>
-
- *l1
- *l2
- # number
- # number
-this is a plain paragraph
- * bullet
-this is a plain paragraph again
- # number
-----
-__Link tests__
-# normal: HomePage
-# in brackets: [HomePage] -- named: [the front page|HomePage]
-# Link in brackets: [http://phpwiki.sourceforge.net/]
-# Link outside brackets: http://phpwiki.sourceforge.net/
-# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
-# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
-# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
-# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
-# Javascript: [boo! | javascript:alert('oops') ] (is now: named internal link)
-# A [[Link] produces a [Link]
-# A [Link] looks like this: [[Link]
-# This is a [%%%] line break link
-# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
- * WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
- * !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
- * WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
- * !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
-
-----
-Markup tests:
-
-__underscores for bold__
-
-'''quotes for bold'''
-
-''quotes for italic''
-
-__''underscores bold italic''__
-
-'''''five quotes bold italic'''''
-
-''''''six quotes''''''
-
-'''''Bold italic''' and italic'' (buggy)
-
-'''Bold and ''bold-italic''''' (also buggy)
-
-!!! h1
-
-!! h2
-
-! h3
-
-this is plain text with <br>%%%
-a line break
-
-look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
-
-you cannot use &, < or >
-
-----
-Usage in preformatted text:
-<pre>
- __underscores for bold__
- '''quotes for bold'''
- ''quotes for italic''
- __''underscores bold italic''__
- '''''five quotes bold italic'''''
- ''''''six quotes''''''
- !!! h1
- !! h2
- ! h3
- this is plain text with <br>%%%
- a line break
- look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
- you cannot use &, < or >
-</pre>
Deleted: trunk/pgsrc/Help%2FOldMarkupTestPage
===================================================================
--- trunk/pgsrc/Help%2FOldMarkupTestPage 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FOldMarkupTestPage 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,142 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FOldMarkupTestPage;
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
- New lists: asterisks, hash marks, and ";text:def"
-* bullet
-* l1
-** l2
-** l2
-*** l3
-# one
-#two
-#three
-;Term1:definition1.1
-;: defintion1.2
-;Term2 :defintion2
-;; Term3:defintion3
-;;;Term4: definition4
-;;; : defintion4.2
-;;; Term5 : defintion5
-
-Mixed:
-*ul1
-*#ul1-ol1
-*#ul1-ol2
-*#*ul1-ol2-ul1
-*#*ul1-ol2-ul2
-*#**ul1-ol2-ul2-ul1
-*#**ul1-ol2-ul2-ul1
-
-*l1
- preformatted text
-** l2
-----
- old lists
- * level 1
- * l1
- *l2
- *l2
- *l3
- *l3
- *l4
- *l3
- *l5
- *l3
- #one
- #two
- #one
- #two
- *l1
- #three
- #four
- *l1
- *l2
- # one
- # two
-
- preformatted text
- some more text
-
- *l1
- *l4
- # number
- # number
-this is a plain paragraph
- * bullet
-this is a plain paragraph again
- # number
-----
-__Link tests__
-# normal: HomePage
-# in brackets: [HomePage] -- named: [the front page|HomePage]
-# Link in brackets: [http://phpwiki.sourceforge.net/]
-# Link outside brackets: http://phpwiki.sourceforge.net/
-# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
-# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
-# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
-# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
-# Javascript: [boo! | javascript:alert('oops') ] (is now: named internal link)
-# A [[Link] produces a [Link]
-# A [Link] looks like this: [[Link]
-# This is a [%%%] line break link
-# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
-#* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
-#* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
-#* WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
-#* !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
-
-----
-Markup tests:
-
-__underscores for bold__
-
-'''quotes for bold'''
-
-''quotes for italic''
-
-__''underscores bold italic''__
-
-'''''five quotes bold italic'''''
-
-''''''six quotes''''''
-
-'''''Bold italic''' and italic'' (buggy)
-
-'''Bold and ''bold-italic''''' (also buggy)
-
-!!! h1
-
-!! h2
-
-! h3
-
-this is plain text with <br>%%%
-a line break
-
-look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
-
-you cannot use &, < or >
-
-----
-Usage in preformatted text:
-
- __underscores for bold__
- '''quotes for bold'''
- ''quotes for italic''
- __''underscores bold italic''__
- '''''five quotes bold italic'''''
- ''''''six quotes''''''
- !!! h1
- !! h2
- ! h3
- this is plain text with <br>%%%
- a line break
- look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
- you cannot use &, < or >
-
Deleted: trunk/pgsrc/Help%2FPageGroupTest
===================================================================
--- trunk/pgsrc/Help%2FPageGroupTest 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FPageGroupTest 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,33 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FPageGroupTest;
- flags=PAGE_LOCKED;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-Help:PageGroupTest is a test of the ~PageGroup plugin.
-
-Click the first page to start the tour of this experimental plugin.
-
-!Table of Contents
-# [Help:PageGroupTestOne]
-# [Help:PageGroupTestTwo]
-# [Help:PageGroupTestThree]
-# [Help:PageGroupTestFour]
-
-! TODO
-
-* Support ~[ name | page ~] links
-* Support Previous, Next ... image buttons
-
-%%% %%% %%% %%%
-
-----
-
-For reference, here are all the pages that link to [Help:PageGroupTest]
-(note that one is missing):
-
-<<BackLinks page=Help:PageGroupTest>>
Deleted: trunk/pgsrc/Help%2FPageGroupTestFour
===================================================================
--- trunk/pgsrc/Help%2FPageGroupTestFour 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FPageGroupTestFour 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,27 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FPageGroupTestFour;
- flags=PAGE_LOCKED;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-So, this is the last page in this page group.
-
-Note that looping of off on this page, so __Next:__ shouldn't show up
-here but it does because of the bug described in Help:PageGroupTestOne.
-
-%%% %%% %%% %%% %%% %%% %%%
-----
-
-<<PageGroup
- parent=Help:PageGroupTest
- section="Table of Contents"
- loop=false
->>
-
-----
-
-Help:PageGroupTest
Deleted: trunk/pgsrc/Help%2FPageGroupTestOne
===================================================================
--- trunk/pgsrc/Help%2FPageGroupTestOne 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FPageGroupTestOne 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,31 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FPageGroupTestOne;
- flags=PAGE_LOCKED;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-Ok, this is page one in this page group.
-
-There is a bug. When looping is true (and it is, but only for this
-first page--another possible flaw) and if the Contents title is not
-the first item on the Table of Contents page, and if there are other
-things on the TOC page after the actual list, then things get screwed
-up. Note that the __Previous:__ link below should point to the last
-page. Click Next.
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Other pages in this group"
- loop=1
- parent=Help:PageGroupTest
- section="Table of Contents"
->>
-
-----
-
-Help:PageGroupTest
Deleted: trunk/pgsrc/Help%2FPageGroupTestThree
===================================================================
--- trunk/pgsrc/Help%2FPageGroupTestThree 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FPageGroupTestThree 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,23 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FPageGroupTestThree;
- flags=PAGE_LOCKED;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-You're almost there!
-
-%%% %%% %%% %%% %%% %%% %%%
-
-<<PageGroup
- label="Go!"
- parent=Help:PageGroupTest
- section="Table of Contents"
->>
-
-Note that the navigation bar can be anywhere, it doesn't have to be at
-the bottom or even consistent from page to page. The label can also
-vary--not sure if this is a good thing. Click Next.
Deleted: trunk/pgsrc/Help%2FPageGroupTestTwo
===================================================================
--- trunk/pgsrc/Help%2FPageGroupTestTwo 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/Help%2FPageGroupTestTwo 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=Help%2FPageGroupTestTwo;
- flags=PAGE_LOCKED;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-<<PageGroup
- parent=Help:PageGroupTest
- section="Table of Contents"
->>
-
-----
-
-%%% %%% %%% %%% %%% %%% %%%
-
-Welcome to page two.
-
-It would be nice if this plugin would work together with BackLinks, so
-that it's presence on a page would be detected by the backlink plugin
-without having to actually add a link to the parent: Help:PageGroupTest.
-
-Click Next.
Deleted: trunk/pgsrc/LisaNova
===================================================================
--- trunk/pgsrc/LisaNova 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/LisaNova 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,66 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-X-Rcs-Id: $Id$
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-Content-Type: application/x-phpwiki;
- pagename=LisaNova;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-! A [ YouTube | http://www.youtube.com/ ] star
-
-! [LisaNova's Profile | http://www.youtube.com/profile?user=LisaNova]
-! Videos (49)
-# Daxflame interviews LisaNova! <br><<YouTube style=link v=ySR9LKV76hU>> _by Daxflame_
-# Word of Mouth <br><<YouTube style=link v=Ajr5AesC5QM>>
-# LisaNova does YOUTUBE!!!! <br><<YouTube style=link v=W13Wj34Lpto>>
-# LisaNova does George Bush! <br><<YouTube style=link v=QfdQkyc4omk>>
-# Trying Too Hard? <br><<YouTube style=link v=Cw5-k4OwsOw>>
-# The Big Debate <br><<YouTube style=link v=8Y2N9FueKak>>
-# Affirmation Girl - My Body is A Temple <br><<YouTube style=link v=e19NrkUcFEQ>>
-# Keira and Johnny - Johnny is Dead! Behind Scenes Pirates! <br><<YouTube style=link v=t2fMTA3UWOQ>>
-# Affirmation Girl <br><<YouTube style=link v=0DK4rKVIo48>>
-# Hey Dax, Short Shorts=for girls only <br><<YouTube style=link v=i5QOvO2s5J0>>
-# Keira and Johnny! Behind the Scenes-Pirates of the Caribbean <br><<YouTube style=link v=IdynbD7cNMo>>
-# LisaNova does Lindsay Lohan! <br> <<YouTube style=link v=qNd7djrQoi0>>
-# ROBOT LOVE!!! Daxflame & ~GreenTeaGirlie! !! <br> <<YouTube style=link v=rZgtzEyOieg>>
-# Hillary vs Obama <br> <<YouTube style=link v=YqOHquOkpaU>>
-# LisaNova Exposed- Outtakes #1 <br> <<YouTube style=link v=K6jtAyvCizE>>
-# LisaNova's Eternal Flame <br> <<YouTube style=link v=hXMi0nKff_U>>
-# LisaNova does 300! <br> <<YouTube style=link v=k9G2-bN1Br4>>
-# LISANOVA does MR. SAFETY and the AS ONE Gatherers <br> <<YouTube style=link v=AMUwjdn7Dyg>>
-# Trying Too Hard? <br> <<YouTube style=link v=6IPN30Lzv7w>>
-# The Professional Rapper <br> <<YouTube style=link v=qGypWfQjqy0>>
-# LisaNova does Mad TV...Thanks ~YouTube! <br> <<YouTube style=link v=CmWIY_C7XUw>>
-# VALENTINE'S DAY DON'TS <br> <<YouTube style=link v=KK-dUnqHei8>>
-# Passionate About The Lips <br> <<YouTube style=link v=KlRLYR3Di4M>>
-# LisaNova does Keira Knightley <br> <<YouTube style=link v=b7Q7YkxvJwo>>
-# Magical Holiday From LisaNova <br> <<YouTube style=link v=Q8rJA-xB2Gg>>
-# LisaNova's Life is About To Change & So Can Yours!!! <br> <<YouTube style=link v=4k9vl_Y_U3o>>
-# LisaNova does Rush Limbaugh <br> <<YouTube style=link v=_iHk5Iz_Q6c>>
-# LisaNova is a B!%@H!!! <br> <<YouTube style=link v=4BItuo9YfeA>>
-# LisaNova Does P. Diddy <br> <<YouTube style=link v=ES6kSKGv7dA>>
-# My New Addiction? <br> <<YouTube style=link v=sYomUXk2RXg>>
-# The Sopranos- Adriana Returns!!! <br> <<YouTube style=link v=c1v13vEIJ9U>>
-# LisaNova Does Lonelygirl15 <br> <<YouTube style=link v=6XCQTSI4djM>>
-# Giving up the Nuts!!!!! <br> <<YouTube style=link v=pZDILuqCMlc>>
-# Teenie Weenie Raw Flesh <br> <<YouTube style=link v=uE-F1yMv8nY>>
-# Pedro Says: Don't Flag LisaNova! <br> <<YouTube style=link v=_C4pW4vTVKY>>
-# Don't Be A Douche Bag <br> <<YouTube style=link v=9TTkWfPUIrc>>
-# Breaking News!!!!!!!!!!! !! <br> <<YouTube style=link v=orKIbllSVqY>>
-# It was a long Hot ride so I took a Dip!!! <br> <<YouTube style=link v=ja300SmkjPU>>
-# Silly Girl Interviews "Celebrities" <br> <<YouTube style=link v=mV9wZ7Tt3zU>>
-# Teenie Weenie RAW & UNCENSORED!!! <br> <<YouTube style=link v=ggKvDl6AtRc>>
-# LisaNova on Competition <br> <<YouTube style=link v=ot5Xv1C8k-k>>
-# This Summer is Going to be HOT & I'm EXCITED <br> <<YouTube style=link v=4pWZHnqjwNY>>
-# LisaNova Celebrates the 4th with Daniel Decorum <br> <<YouTube style=link v=wPMGqYPF3iY>>
-# LisaNova's Lonely Teardrops <br> <<YouTube style=link v=sCpfDGs-Mfo>>
-# LL apologizes to LisaNova <br> <<YouTube style=link v=fZa9fT-2XVM>>
-# LisaNova takes the Bus <br> <<YouTube style=link v=b4xaZis4YPE>>
-# LisaNova does LL <br> <<YouTube style=link v=Z5Rw63ZtN9U>>
-# Roses For Lisa Nova <br> <<YouTube style=link v=fuRVquMbBTA>>
-# Introducing LisaNova <br> <<YouTube style=link v=JgMZpHF64K8>>
-
-----
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation
===================================================================
--- trunk/pgsrc/PgsrcTranslation 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,146 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki and what languages they have been translated
-to. If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<ListSubpages>>
-
-=== More important translations (static)
-
-''Automatically generated pages'' |
- English (en) |
- Deutsch (de) |
- Español (es) |
- Français (fr) |
- Italiano (it) |
- Japanese (ja) |
- Nederlands (nl) |
- Svenska (sv)
- Diff: |
- Vergleich: |
- Diferencia de: |
- Diff : |
- Differenza di: |
- 差分: |
- Diff van: |
- Diff av:
- Edit: |
- Bearbeite: |
- Editar: |
- Éditer : |
- Modifica: |
- 編集: |
- Verander: |
- Redigera:
- Remove Page |
- Seite Löschen |
- Borrar Página |
- Supprimer la Page |
- Rimuovi la Pagina |
- ページ削除 |
- Verwijder Pagina |
- Ta bort Sida
- Sign In |
- Anmelden |
- _ |
- S'inscrire |
- _ |
- サインイン |
- _ |
- _
- View Source: |
- Quell Text: |
- _ |
- Afficher la Source : |
- _ |
- ソースを見る: |
- _ |
- Bron Tekst:
-
-Translator's page |
- English (en) |
- Deutsch (de) |
- Español (es) |
- Français (fr) |
- Italiano (it) |
- Japanese (ja) |
- Nederlands (nl) |
- Svenska (sv)
- n/a |
- [Reini Urban|PhpWiki:ReiniUrban] |
- [K Brown|PhpWiki:KBrown] |
- [Roland Trique|PhpWiki:RolandTrique] |
- [Marco Milanesi|PhpWiki:MarcoMilanesi] |
- [Tadashi Jokagi|PhpWiki:TadashiJokagi] |
- [Jan Nieuwenhuizen|PhpWiki:JanNieuwenhuizen] |
- [Jon Åslund|PhpWiki:Jon%C3%85slund]
-
-Obsolete Pages |
- English (en) |
- Deutsch (de) |
- Español (es) |
- Français (fr) |
- Italiano (it) |
- Japanese (ja) |
- Nederlands (nl) |
- Svenska (sv)
- ConvertTabsToSpaces |
- KonvertiereLeerzeichenZuTabs |
- ConvierteEspaciosEnTabs |
- ConvertirTabEnEspaces |
- ConvertiGliSpaziInTab |
- _ |
- VertaalSpatiesNaarTabs |
- KonverteraMellanslagTillTabbar
-
-=== Notes
-==== These pages do not automatically link as ~WikiWords:
-es:
- [KBrown]
-en:
- [MagicPhpWikiURLs]
-fr:
- [BacASable]
- [URLMagiquesPhpWiki]
-it:
- [MagicPhpWikiURLs]
-nl:
- [ToverPhpWikiURLs]
-
-==== These pages have single word titles so ~[square brackets] are required to link.
-
-fr:
- [Accueil]
-sv:
- [Framsida]
- [Gästboken]
- [Sandlådan]
- [Textformateringsregler]
-
-==== Problematic Single-Word Action Pages
-
-These action pages have single word titles, and must be renamed using two words before they will work in ~PhpWiki 1.3.5:
-
-fr:
- [Historique]
- [Info]
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]], PhpWikiDemo:de/PhpWikiDokumentation, PhpWikiDemo:fr/DocumentationDePhpWiki
Deleted: trunk/pgsrc/PgsrcTranslation%2Fde
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fde 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fde 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fde;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,de>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]], PhpWikiDemo:de/PhpWikiDokumentation
Deleted: trunk/pgsrc/PgsrcTranslation%2Fes
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fes 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fes 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fes;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,es>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation%2Ffr
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Ffr 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Ffr 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Ffr;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,fr>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation%2Fit
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fit 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fit 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fit;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,it>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation%2Fja
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fja 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fja 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fja;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:ja/PgsrcTranslation], where the
-page names actually link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,ja>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation%2Fnl
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fnl 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fnl 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fnl;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,nl>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation%2Fsv
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fsv 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fsv 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fsv;
- flags="";
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
-link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,sv>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
Deleted: trunk/pgsrc/PgsrcTranslation%2Fzh
===================================================================
--- trunk/pgsrc/PgsrcTranslation%2Fzh 2010-05-19 12:57:42 UTC (rev 7417)
+++ trunk/pgsrc/PgsrcTranslation%2Fzh 2010-05-19 15:18:51 UTC (rev 7418)
@@ -1,26 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=PgsrcTranslation%2Fzh;
- flags="";
- markup=2;
- charset=utf-8
-Content-Transfer-Encoding: binary
-
-__Note:__ This page is much more impressive on the
-[demo server|PhpWikiDemo:zh/PgsrcTranslation], where the
-page names actually link.
-
-__What you are looking at:__ This table shows all the default pages
-that ship with ~PhpWiki translated into this special language.
-If you click on a "T" you can contribute a missing translation.
-
-=== Translated Page Name Matrix (dynamic)
-
-<<_WikiTranslation languages=en,zh>>
-
-----
-
-See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
-[[PhpWikiDocumentation]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-05-31 12:38:29
|
Revision: 7449
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7449&view=rev
Author: vargenau
Date: 2010-05-31 12:38:21 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Let's assume PHP >= 4.2
Modified Paths:
--------------
trunk/lib/AccessLog.php
trunk/lib/DbSession.php
trunk/lib/IniConfig.php
trunk/lib/Request.php
trunk/lib/config.php
trunk/lib/loadsave.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/prepend.php
trunk/themes/default/templates/login.tmpl
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/AccessLog.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -357,10 +357,7 @@
//$log_tbl =& $this->_accesslog->logtable;
if ($request->get('REQUEST_METHOD') == "POST") {
// strangely HTTP_POST_VARS doesn't contain all posted vars.
- if (check_php_version(4,2))
- $args = $_POST; // copy not ref. clone not needed on hashes
- else
- $args = $GLOBALS['HTTP_POST_VARS'];
+ $args = $_POST; // copy not ref. clone not needed on hashes
// garble passwords
if (!empty($args['auth']['passwd'])) $args['auth']['passwd'] = '<not displayed>';
if (!empty($args['dbadmin']['passwd'])) $args['dbadmin']['passwd'] = '<not displayed>';
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/DbSession.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -28,15 +28,6 @@
// Check for existing DbSession handler
$db_type = $dbh->getParam('dbtype');
if (isa($dbh, 'WikiDB')) {
- // will fail with php4 and case-sensitive filesystem
- //$db_type = substr(get_class($dbh),7);
-
- // < 4.1.2 crash on dba sessions at session_write_close().
- // (Tested with 4.1.1 and 4.1.2)
- // Didn't try postgres sessions.
- if (!check_php_version(4,1,2) and $db_type == 'dba')
- return false;
-
@include_once("lib/DbSession/".$db_type.".php");
$class = "DbSession_".$db_type;
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/IniConfig.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -337,12 +337,8 @@
// USE_DB_SESSION default logic:
if (!defined('USE_DB_SESSION')) {
if ($DBParams['db_session_table']
- and in_array($DBParams['dbtype'], array('SQL','ADODB','PDO'))) {
+ and in_array($DBParams['dbtype'], array('SQL','ADODB','PDO','dba'))) {
define('USE_DB_SESSION', true);
- } elseif ($DBParams['dbtype'] == 'dba' and check_php_version(4,1,2)) {
- define('USE_DB_SESSION', true); // Depends on db handler as well.
- // BerkeleyDB on older php has problems
- // with multiple db handles.
} else {
define('USE_DB_SESSION', false);
}
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/Request.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -331,8 +331,6 @@
if (!COMPRESS_OUTPUT)
$compress = false;
}
- elseif (!check_php_version(4,2,3))
- $compress = false;
elseif (isCGI()) // necessary?
$compress = false;
@@ -443,17 +441,6 @@
}
if (!empty($this->_is_buffering_output)) {
- /* This cannot work because it might destroy xml markup */
- /*
- if (0 and $GLOBALS['SearchHighLightQuery'] and check_php_version(4,2)) {
- $html = str_replace($GLOBALS['SearchHighLightQuery'],
- '<span class="search-term">'.$GLOBALS['SearchHighLightQuery'].'</span>',
- ob_get_contents());
- ob_clean();
- header(sprintf("Content-Length: %d", strlen($html)));
- echo $html;
- } else {
- */
// if _is_compressing_output then ob_get_length() returns
// the uncompressed length, not the gzip'ed as required.
if (!headers_sent() and !$this->_is_compressing_output) {
@@ -1137,10 +1124,7 @@
//$log_tbl =& $this->_accesslog->logtable;
if ($request->get('REQUEST_METHOD') == "POST") {
// strangely HTTP_POST_VARS doesn't contain all posted vars.
- if (check_php_version(4,2))
- $args = $_POST; // copy not ref. clone not needed on hashes
- else
- $args = $GLOBALS['HTTP_POST_VARS'];
+ $args = $_POST; // copy not ref. clone not needed on hashes
// garble passwords
if (!empty($args['auth']['passwd'])) $args['auth']['passwd'] = '<not displayed>';
if (!empty($args['dbadmin']['passwd'])) $args['dbadmin']['passwd'] = '<not displayed>';
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/config.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -7,14 +7,8 @@
*/
if (!defined("LC_ALL")) {
- // Backward compatibility (for PHP < 4.0.5)
- if (!check_php_version(4,0,5)) {
- define("LC_ALL", "LC_ALL");
- define("LC_CTYPE", "LC_CTYPE");
- } else {
- define("LC_ALL", 0);
- define("LC_CTYPE", 2);
- }
+ define("LC_ALL", 0);
+ define("LC_CTYPE", 2);
}
// debug flags:
define ('_DEBUG_VERBOSE', 1); // verbose msgs and add validator links on footer
@@ -524,69 +518,8 @@
}
}
-/**
- * wordwrap() might crash between 4.1.2 and php-4.3.0RC2, fixed in 4.3.0
- * See http://bugs.php.net/bug.php?id=20927 and
- * http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2002-1396
- * Improved version of wordwrap2() in the comments at http://www.php.net/wordwrap
- */
function safe_wordwrap($str, $width=80, $break="\n", $cut=false) {
- if (check_php_version(4,3))
- return wordwrap($str, $width, $break, $cut);
- elseif (!check_php_version(4,1,2))
- return wordwrap($str, $width, $break, $cut);
- else {
- $len = strlen($str);
- $tag = 0; $result = ''; $wordlen = 0;
- for ($i = 0; $i < $len; $i++) {
- $chr = $str[$i];
- // don't break inside xml tags
- if ($chr == '<') {
- $tag++;
- } elseif ($chr == '>') {
- $tag--;
- } elseif (!$tag) {
- if (!function_exists('ctype_space')) {
- if (preg_match('/^\s$/', $chr))
- $wordlen = 0;
- else
- $wordlen++;
- }
- elseif (ctype_space($chr)) {
- $wordlen = 0;
- } else {
- $wordlen++;
- }
- }
- if ((!$tag) && ($wordlen) && (!($wordlen % $width))) {
- $chr .= $break;
- }
- $result .= $chr;
- }
- return $result;
- /*
- if (isset($str) && isset($width)) {
- $ex = explode(" ", $str); // wrong: must use preg_split \s+
- $rp = array();
- for ($i=0; $i<count($ex); $i++) {
- // $word_array = preg_split('//', $ex[$i], -1, PREG_SPLIT_NO_EMPTY);
- // delete #&& !is_numeric($ex[$i])# if you want force it anyway
- if (strlen($ex[$i]) > $width && !is_numeric($ex[$i])) {
- $where = 0;
- $rp[$i] = "";
- for($b=0; $b < (ceil(strlen($ex[$i]) / $width)); $b++) {
- $rp[$i] .= substr($ex[$i], $where, $width).$break;
- $where += $width;
- }
- } else {
- $rp[$i] = $ex[$i];
- }
- }
- return implode(" ",$rp);
- }
- return $text;
- */
- }
+ return wordwrap($str, $width, $break, $cut);
}
function getUploadFilePath() {
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/loadsave.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -225,6 +225,7 @@
*/
function MakeWikiZip (&$request)
{
+ global $ErrorManager;
if ($request->getArg('include') == 'all') {
$zipname = WIKI_NAME . _("FullDump") . date('Ymd-Hi') . '.zip';
$include_archive = true;
@@ -241,10 +242,7 @@
$zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname);
/* ignore fatals in plugins */
- if (check_php_version(4,1)) {
- global $ErrorManager;
- $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
- }
+ $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
$dbi =& $request->_dbi;
$thispage = $request->getArg('pagename'); // for "Return to ..."
@@ -293,10 +291,8 @@
$content, $attrib);
}
$zip->finish();
- if (check_php_version(4,1)) {
- global $ErrorManager;
- $ErrorManager->popErrorHandler();
- }
+
+ $ErrorManager->popErrorHandler();
}
function DumpToDir (&$request)
@@ -518,7 +514,7 @@
*/
function _DumpHtmlToDir ($target, $page_iter, $exclude = false)
{
- global $WikiTheme, $request;
+ global $WikiTheme, $request, $ErrorManager;
$silent = true; $zip = false; $directory = false;
if ($WikiTheme->DUMP_MODE == 'HTML') {
$directory = $target;
@@ -549,10 +545,7 @@
$_bodyAttr = @$WikiTheme->_MoreAttr['body'];
unset($WikiTheme->_MoreAttr['body']);
- if (check_php_version(4,1)) {
- global $ErrorManager;
- $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
- }
+ $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
// check if the dumped file will be accessible from outside
$doc_root = $request->get("DOCUMENT_ROOT");
@@ -862,10 +855,7 @@
}
}
- if (check_php_version(4,1)) {
- global $ErrorManager;
- $ErrorManager->popErrorHandler();
- }
+ $ErrorManager->popErrorHandler();
$WikiTheme->HTML_DUMP_SUFFIX = '';
$WikiTheme->DUMP_MODE = false;
Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/plugin/PhpHighlight.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -95,14 +95,7 @@
array('<?php', '?>'), $source);
}
- if (!check_php_version(4,2,0)) {
- ob_start();
- highlight_string($source);
- $str = ob_get_contents();
- ob_end_clean();
- } else {
- $str = highlight_string($source, true);
- }
+ $str = highlight_string($source, true);
if ($wrap)
/* Remove "<?php\n" and "\n?>" again: */
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/prepend.php 2010-05-31 12:38:21 UTC (rev 7449)
@@ -10,7 +10,7 @@
/**
* Returns true if current php version is at mimimum a.b.c
- * Called: check_php_version(4,1)
+ * Called: check_php_version(5,2)
*/
function check_php_version ($a = '0', $b = '0', $c = '0') {
static $PHP_VERSION;
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl 2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/themes/default/templates/login.tmpl 2010-05-31 12:38:21 UTC (rev 7449)
@@ -41,12 +41,7 @@
if (ALLOW_BOGO_LOGIN && $require_level <= WIKIAUTH_BOGO) {
require_once("lib/BlockParser.php");
// This iso-8859-1 sample covers French, Spanish, Italian, German, and probably others
- if (check_php_version(4,3))
- $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
- elseif (check_php_version(4,0,3))
- $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES);
- else
- $examplechars = htmlentities("ÀñíçéàÖãæôßøü");
+ $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
// Japanese login requires utf-8 and ALLOW_NONWIKIWORD_LOGINS
if (($charset == 'utf-8') && defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
//sample Japanese login name in unicode
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-07 08:12:35
|
Revision: 7466
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7466&view=rev
Author: rurban
Date: 2010-06-07 08:12:29 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
- Atom Parser and Feed Plugin
with unit tests by S?\195?\169bastien Le Callonnec
patches ID 3012033
- HtmlElement5.php split up for php-5.3
Modified Paths:
--------------
trunk/lib/HtmlElement.php
trunk/lib/IniConfig.php
trunk/lib/XmlParser.php
trunk/tests/unit/test.php
Added Paths:
-----------
trunk/lib/AtomParser.php
trunk/lib/HtmlElement5.php
trunk/lib/plugin/AtomFeed.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/lib/plugin/atom-example.xml
Added: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php (rev 0)
+++ trunk/lib/AtomParser.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,257 @@
+<?php // -*-php-*-
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+/**
+ * This class is a poor-man Atom parser, it does no validation of the feed.
+ * The content of an entry ("payload") is not parsed but rather returned "as-is",
+ * as its format can be text, html or xhtml.
+ *
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/XmlParser.php');
+
+class AtomParser
+extends XmlParser
+{
+ // Feed
+ var $feed = array();
+ var $feed_title = '';
+ var $feed_links = array();
+ var $feed_subtitle = '';
+ var $feed_id = '';
+ var $feed_updated = '';
+ var $feed_authors = array();
+ var $feed_contributors = array();
+ var $generator = '';
+ var $icon = '';
+ var $rights = '';
+ var $logo = '';
+
+ var $categories = array();
+
+ var $authors = array();
+ var $contributors = array();
+
+ // Author, Contributor
+ var $name = '';
+ var $email = '';
+ var $uri = '';
+
+ // Entries
+ var $entries = array();
+ var $inside_entry = false;
+ var $title = '';
+ var $updated = '';
+ var $published = '';
+ var $id = '';
+ var $links = array();
+ var $summary = '';
+
+ var $inside_content = false;
+ var $content = '';
+
+ function tag_open($parser, $name, $attrs='') {
+ global $current_tag, $current_attrs;
+
+ $current_tag = $name;
+ $current_attrs = $attrs;
+
+ if ($name == "ENTRY") {
+ $this->inside_entry = true;
+ } elseif ($this->inside_content) {
+ $this->content .= $this->serialize_tag(strtolower($name), $attrs);
+ } elseif ($name == "CONTENT") {
+ $this->inside_content = true;
+ }
+ }
+
+ function tag_close($parser, $name, $attrs='') {
+ if ($name == "AUTHOR") {
+ $an_author = $this->trim_data(array(
+ "name" => $this->name,
+ "email" => $this->email,
+ "uri" => $this->uri
+ ));
+ if ($this->inside_entry) {
+ $this->authors[] = $an_author;
+ } else {
+ $this->feed_authors[] = $an_author;
+ }
+ $this->name = '';
+ $this->email = '';
+ $this->uri = '';
+ } elseif ($name == "FEED") {
+ $this->feed[] = $this->trim_data(array(
+ "id" => $this->feed_id,
+ "title" => $this->feed_title,
+ "links" => $this->feed_links,
+ "subtitle" => $this->feed_subtitle,
+ "updated" => $this->feed_updated,
+ "generator" => $this->generator,
+ "icon" => $this->icon,
+ "rights" => $this->rights,
+ "logo" => $this->logo,
+ "authors" => $this->feed_authors,
+ "contributors" => $this->feed_contributors
+ ));
+ $this->feed_title = '';
+ $this->feed_id = '';
+ $this->feed_links = array();
+ $this->feed_subtitle = '';
+ $this->feed_updated = '';
+ $this->feed_authors = array();
+ $this->feed_contributors = array();
+ $this->generator = '';
+ $this->icon = '';
+ $this->rights = '';
+ $this->logo = '';
+ } elseif ($name == "ENTRY") {
+ $this->entries[] = $this->trim_data(array(
+ "id" => $this->id,
+ "title" => $this->title,
+ "updated" => $this->updated,
+ "links" => $this->links,
+ "published" => $this->published,
+ "content" => $this->content,
+ "summary" => $this->summary,
+ "authors" => $this->authors,
+ "contributors" => $this->contributors
+ ));
+ $this->id = '';
+ $this->title = '';
+ $this->updated = '';
+ $this->links = '';
+ $this->published = '';
+ $this->content = '';
+ $this->authors = array();
+ $this->contributors = array();
+ $this->inside_entry = false;
+ } elseif ($name == "CONTENT") {
+ $this->inside_content = false;
+ } elseif ($name == "CONTRIBUTOR") {
+ $a_contributor = $this->trim_data(array(
+ "name" => $this->name,
+ "email" => $this->email
+ ));
+ if ($this->inside_entry) {
+ $this->contributors[] = $a_contributor;
+ } else {
+ $this->feed_contributors[] = $a_contributor;
+ }
+ $this->name = '';
+ $this->email = '';
+ } elseif ($this->inside_content) {
+ $this->content .= "</" . strtolower($name) . ">";
+ }
+ }
+
+ function cdata($parser, $data) {
+ global $current_tag, $current_attrs;
+
+ if ($this->inside_content) {
+ $this->content .= $data;
+ } else {
+ switch ($current_tag) {
+ case "ID":
+ if ($this->inside_entry)
+ $this->id .= $data;
+ else
+ $this->feed_id .= $data;
+ break;
+ case "LINK":
+ $a_link = array();
+ foreach ($current_attrs as $k => $v) {
+ $a_link[strtolower($k)] = $v;
+ }
+ if ($this->inside_entry) {
+ $this->links[] = $a_link;
+ } else {
+ $this->feed_links[] = $a_link;
+ }
+ break;
+ case "NAME":
+ $this->name .= $data;
+ break;
+ case "EMAIL":
+ $this->email .= $data;
+ break;
+ case "TITLE" :
+ if ($this->inside_entry)
+ $this->title .= $data;
+ else
+ $this->feed_title .= $data;
+ break;
+ case "UPDATED":
+ if ($this->inside_entry)
+ $this->updated .= $data;
+ else
+ $this->feed_updated .= $data;
+ break;
+ case "SUBTITLE":
+ $this->feed_subtitle .= $data;
+ break;
+ case "PUBLISHED":
+ $this->published .= $data;
+ break;
+ case "SUMMARY":
+ $this->summary .= $data;
+ break;
+ case "URI":
+ $this->uri .= $data;
+ break;
+ case "GENERATOR":
+ $this->generator .= $data;
+ break;
+ case "ICON":
+ $this->icon .= $data;
+ break;
+ case "LOGO":
+ $this->logo .= $data;
+ break;
+ case "RIGHTS":
+ $this->rights .= $data;
+ break;
+ }
+ }
+ }
+
+ private function trim_data($array) {
+ return array_map(array("self", "trim_element"), $array);
+ }
+
+ private function trim_element($element) {
+ if (is_array($element)) {
+ return $this->trim_data($element);
+ } elseif (is_string($element)) {
+ return trim($element);
+ }
+ }
+
+ private function serialize_tag($tag_name, $attributes) {
+ $tag = "<" . $tag_name;
+ foreach ($attributes as $k => $v) {
+ $tag .= " " . strtolower($k). "=\"$v\"";
+ }
+ $tag .= ">";
+ return $tag;
+ }
+}
+?>
Property changes on: trunk/lib/AtomParser.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/lib/HtmlElement.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -87,12 +87,17 @@
if (!empty($this->_attr['title'])) {
if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
{
- $this->_attr['title'] = preg_replace("/\[(alt-)?(.)\]$/", "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]", $this->_attr['title']);
+ $this->_attr['title'] = preg_replace
+ ("/\[(alt-)?(.)\]$/",
+ "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
+ $this->_attr['title']);
} else {
- $this->_attr['title'] .= " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
+ $this->_attr['title'] .=
+ " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
}
} else {
- $this->_attr['title'] = "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
+ $this->_attr['title'] =
+ "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
}
}
@@ -142,39 +147,43 @@
//
// Shell script to generate the following static methods:
- //
- // #!/bin/sh
- // function mkfuncs () {
- // for tag in "$@"
- // do
- // echo " function $tag (/*...*/) {"
- // echo " \$el = new HtmlElement('$tag');"
- // echo " return \$el->_init2(func_get_args());"
- // echo " }"
- // done
- // }
- // d='
- // /****************************************/'
- // mkfuncs link meta style script noscript
- // echo "$d"
- // mkfuncs a img br span
- // echo "$d"
- // mkfuncs h1 h2 h3 h4 h5 h6
- // echo "$d"
- // mkfuncs hr div p pre blockquote
- // echo "$d"
- // mkfuncs em strong small
- // echo "$d"
- // mkfuncs tt u sup sub
- // echo "$d"
- // mkfuncs ul ol dl li dt dd
- // echo "$d"
- // mkfuncs table caption thead tbody tfoot tr td th colgroup col
- // echo "$d"
- // mkfuncs form input option select textarea
- // echo "$d"
- // mkfuncs area map frame frameset iframe nobody
+/*
+#!/bin/sh
+mkfuncs () {
+ for tag in "$@"
+ do
+ echo " public static function $tag (/*...*/) {"
+ echo " \$el = new HtmlElement('$tag');"
+ echo " return \$el->_init2(func_get_args());"
+ echo " }"
+ done
+}
+d='
+ /****************************************/'
+mkfuncs link meta style script noscript
+echo "$d"
+mkfuncs a img br span
+echo "$d"
+mkfuncs h1 h2 h3 h4 h5 h6
+echo "$d"
+mkfuncs hr div p pre blockquote
+echo "$d"
+mkfuncs em strong small
+echo "$d"
+mkfuncs tt u sup sub
+echo "$d"
+mkfuncs ul ol dl li dt dd
+echo "$d"
+mkfuncs table caption thead tbody tfoot tr td th colgroup col
+echo "$d"
+mkfuncs form input option select textarea label fieldset legend
+echo "$d"
+mkfuncs area map frame frameset iframe nobody object embed param
+echo "$d"
+mkfuncs video
+*/
+
function link (/*...*/) {
$el = new HtmlElement('link');
return $el->_init2(func_get_args());
Added: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php (rev 0)
+++ trunk/lib/HtmlElement5.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,593 @@
+<?php // rcs_id('$Id$');
+/**
+ * Code for writing the HTML subset of XML.
+ * @author: Jeff Dairiki
+ *
+ * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
+ * Specialized for php-5.3: added public static 2010-06-07 09:51:37 rurban
+ *
+ * Todo: Add support for a JavaScript backend, a php2js compiler.
+ * HTML::div(array('onclick' => 'HTML::div(...)'))
+ */
+if (!class_exists("XmlElement"))
+ require_once(dirname(__FILE__)."/XmlElement.php");
+if (class_exists("HtmlElement"))
+ return;
+
+/**
+ * An XML element.
+ */
+//apd_set_session_trace(35);
+
+class HtmlElement extends XmlElement
+{
+ function __construct ($tagname /* , $attr_or_content , ...*/) {
+ $this->_init(func_get_args());
+ $this->_properties = HTML::getTagProperties($tagname);
+ }
+
+ function _init ($args) {
+ if (!is_array($args))
+ $args = func_get_args();
+
+ assert(count($args) >= 1);
+ assert(is_string($args[0]));
+ $this->_tag = array_shift($args);
+
+ if ($args && is_array($args[0]))
+ $this->_attr = array_shift($args);
+ else {
+ $this->_attr = array();
+ if ($args && $args[0] === false)
+ array_shift($args);
+ }
+ $this->setContent($args);
+ $this->_properties = HTML::getTagProperties($this->_tag);
+ }
+
+ /**
+ * @access protected
+ * This is used by the static factory methods is class HTML.
+ */
+ function _init2 ($args) {
+ if ($args) {
+ if (is_array($args[0]))
+ $this->_attr = array_shift($args);
+ elseif ($args[0] === false)
+ array_shift($args);
+ }
+
+ if (count($args) == 1 && is_array($args[0]))
+ $args = $args[0];
+ $this->_content = $args;
+ return $this;
+ }
+
+ /** Add a "tooltip" to an element.
+ *
+ * @param $tooltip_text string The tooltip text.
+ */
+ function addTooltip ($tooltip_text, $accesskey = null) {
+ $this->setAttr('title', $tooltip_text);
+ if ($accesskey) $this->setAccesskey($accesskey);
+
+ // FIXME: this should be initialized from title by an onLoad() function.
+ // (though, that may not be possible.)
+ $qtooltip = str_replace("'", "\\'", $tooltip_text);
+ $this->setAttr('onmouseover',
+ sprintf('window.status="%s"; return true;',
+ addslashes($tooltip_text)));
+ $this->setAttr('onmouseout', "window.status='';return true;");
+ }
+
+ function setAccesskey ($key) {
+ global $WikiTheme;
+ if (strlen($key) != 1) return;
+ $this->setAttr("accesskey", $key);
+
+ if (!empty($this->_attr['title'])) {
+ if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
+ {
+ $this->_attr['title'] = preg_replace
+ ("/\[(alt-)?(.)\]$/",
+ "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
+ $this->_attr['title']);
+ } else {
+ $this->_attr['title'] .=
+ " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
+ }
+ } else {
+ $this->_attr['title'] =
+ "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
+ }
+ }
+
+ function emptyTag () {
+ if (($this->_properties & HTMLTAG_EMPTY) == 0)
+ return $this->startTag() . "</$this->_tag>";
+
+ return substr($this->startTag(), 0, -1) . " />";
+ }
+
+ function hasInlineContent () {
+ return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
+ }
+
+ function isInlineElement () {
+ return ($this->_properties & HTMLTAG_INLINE) != 0;
+ }
+};
+
+function HTML (/* $content, ... */) {
+ return new XmlContent(func_get_args());
+}
+
+class HTML extends HtmlElement {
+ public static function raw ($html_text) {
+ return new RawXml($html_text);
+ }
+
+ function getTagProperties($tag) {
+ $props = &$GLOBALS['HTML_TagProperties'];
+ return isset($props[$tag]) ? $props[$tag] : 0;
+ }
+
+ function _setTagProperty($prop_flag, $tags) {
+ $props = &$GLOBALS['HTML_TagProperties'];
+ if (is_string($tags))
+ $tags = preg_split('/\s+/', $tags);
+ foreach ($tags as $tag) {
+ $tag = trim($tag);
+ if ($tag)
+ if (isset($props[$tag]))
+ $props[$tag] |= $prop_flag;
+ else
+ $props[$tag] = $prop_flag;
+ }
+ }
+
+ //
+ // Shell script to generate the following static methods:
+/*
+
+#!/bin/sh
+mkfuncs () {
+ for tag in "$@"
+ do
+ echo " public static function $tag (/*...*/) {"
+ echo " \$el = new HtmlElement('$tag');"
+ echo " return \$el->_init2(func_get_args());"
+ echo " }"
+ done
+}
+d='
+ /****************************************/'
+mkfuncs link meta style script noscript
+echo "$d"
+mkfuncs a img br span
+echo "$d"
+mkfuncs h1 h2 h3 h4 h5 h6
+echo "$d"
+mkfuncs hr div p pre blockquote
+echo "$d"
+mkfuncs em strong small
+echo "$d"
+mkfuncs tt u sup sub
+echo "$d"
+mkfuncs ul ol dl li dt dd
+echo "$d"
+mkfuncs table caption thead tbody tfoot tr td th colgroup col
+echo "$d"
+mkfuncs form input option select textarea label fieldset legend
+echo "$d"
+mkfuncs area map frame frameset iframe nobody object embed param
+echo "$d"
+mkfuncs video
+*/
+
+ public static function link (/*...*/) {
+ $el = new HtmlElement('link');
+ return $el->_init2(func_get_args());
+ }
+ public static function meta (/*...*/) {
+ $el = new HtmlElement('meta');
+ return $el->_init2(func_get_args());
+ }
+ public static function style (/*...*/) {
+ $el = new HtmlElement('style');
+ return $el->_init2(func_get_args());
+ }
+ public static function script (/*...*/) {
+ $el = new HtmlElement('script');
+ return $el->_init2(func_get_args());
+ }
+ public static function noscript (/*...*/) {
+ $el = new HtmlElement('noscript');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function a (/*...*/) {
+ $el = new HtmlElement('a');
+ return $el->_init2(func_get_args());
+ }
+ public static function img (/*...*/) {
+ $el = new HtmlElement('img');
+ return $el->_init2(func_get_args());
+ }
+ public static function br (/*...*/) {
+ $el = new HtmlElement('br');
+ return $el->_init2(func_get_args());
+ }
+ public static function span (/*...*/) {
+ $el = new HtmlElement('span');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function h1 (/*...*/) {
+ $el = new HtmlElement('h1');
+ return $el->_init2(func_get_args());
+ }
+ public static function h2 (/*...*/) {
+ $el = new HtmlElement('h2');
+ return $el->_init2(func_get_args());
+ }
+ public static function h3 (/*...*/) {
+ $el = new HtmlElement('h3');
+ return $el->_init2(func_get_args());
+ }
+ public static function h4 (/*...*/) {
+ $el = new HtmlElement('h4');
+ return $el->_init2(func_get_args());
+ }
+ public static function h5 (/*...*/) {
+ $el = new HtmlElement('h5');
+ return $el->_init2(func_get_args());
+ }
+ public static function h6 (/*...*/) {
+ $el = new HtmlElement('h6');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function hr (/*...*/) {
+ $el = new HtmlElement('hr');
+ return $el->_init2(func_get_args());
+ }
+ public static function div (/*...*/) {
+ $el = new HtmlElement('div');
+ return $el->_init2(func_get_args());
+ }
+ public static function p (/*...*/) {
+ $el = new HtmlElement('p');
+ return $el->_init2(func_get_args());
+ }
+ public static function pre (/*...*/) {
+ $el = new HtmlElement('pre');
+ return $el->_init2(func_get_args());
+ }
+ public static function blockquote (/*...*/) {
+ $el = new HtmlElement('blockquote');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function em (/*...*/) {
+ $el = new HtmlElement('em');
+ return $el->_init2(func_get_args());
+ }
+ public static function strong (/*...*/) {
+ $el = new HtmlElement('strong');
+ return $el->_init2(func_get_args());
+ }
+ public static function small (/*...*/) {
+ $el = new HtmlElement('small');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function tt (/*...*/) {
+ $el = new HtmlElement('tt');
+ return $el->_init2(func_get_args());
+ }
+ public static function u (/*...*/) {
+ $el = new HtmlElement('u');
+ return $el->_init2(func_get_args());
+ }
+ public static function sup (/*...*/) {
+ $el = new HtmlElement('sup');
+ return $el->_init2(func_get_args());
+ }
+ public static function sub (/*...*/) {
+ $el = new HtmlElement('sub');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function ul (/*...*/) {
+ $el = new HtmlElement('ul');
+ return $el->_init2(func_get_args());
+ }
+ public static function ol (/*...*/) {
+ $el = new HtmlElement('ol');
+ return $el->_init2(func_get_args());
+ }
+ public static function dl (/*...*/) {
+ $el = new HtmlElement('dl');
+ return $el->_init2(func_get_args());
+ }
+ public static function li (/*...*/) {
+ $el = new HtmlElement('li');
+ return $el->_init2(func_get_args());
+ }
+ public static function dt (/*...*/) {
+ $el = new HtmlElement('dt');
+ return $el->_init2(func_get_args());
+ }
+ public static function dd (/*...*/) {
+ $el = new HtmlElement('dd');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function table (/*...*/) {
+ $el = new HtmlElement('table');
+ return $el->_init2(func_get_args());
+ }
+ public static function caption (/*...*/) {
+ $el = new HtmlElement('caption');
+ return $el->_init2(func_get_args());
+ }
+ public static function thead (/*...*/) {
+ $el = new HtmlElement('thead');
+ return $el->_init2(func_get_args());
+ }
+ public static function tbody (/*...*/) {
+ $el = new HtmlElement('tbody');
+ return $el->_init2(func_get_args());
+ }
+ public static function tfoot (/*...*/) {
+ $el = new HtmlElement('tfoot');
+ return $el->_init2(func_get_args());
+ }
+ public static function tr (/*...*/) {
+ $el = new HtmlElement('tr');
+ return $el->_init2(func_get_args());
+ }
+ public static function td (/*...*/) {
+ $el = new HtmlElement('td');
+ return $el->_init2(func_get_args());
+ }
+ public static function th (/*...*/) {
+ $el = new HtmlElement('th');
+ return $el->_init2(func_get_args());
+ }
+ public static function colgroup (/*...*/) {
+ $el = new HtmlElement('colgroup');
+ return $el->_init2(func_get_args());
+ }
+ public static function col (/*...*/) {
+ $el = new HtmlElement('col');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function form (/*...*/) {
+ $el = new HtmlElement('form');
+ return $el->_init2(func_get_args());
+ }
+ public static function input (/*...*/) {
+ $el = new HtmlElement('input');
+ return $el->_init2(func_get_args());
+ }
+ public static function button (/*...*/) {
+ $el = new HtmlElement('button');
+ return $el->_init2(func_get_args());
+ }
+ public static function option (/*...*/) {
+ $el = new HtmlElement('option');
+ return $el->_init2(func_get_args());
+ }
+ public static function select (/*...*/) {
+ $el = new HtmlElement('select');
+ return $el->_init2(func_get_args());
+ }
+ public static function textarea (/*...*/) {
+ $el = new HtmlElement('textarea');
+ return $el->_init2(func_get_args());
+ }
+ public static function label (/*...*/) {
+ $el = new HtmlElement('label');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function area (/*...*/) {
+ $el = new HtmlElement('area');
+ return $el->_init2(func_get_args());
+ }
+ public static function map (/*...*/) {
+ $el = new HtmlElement('map');
+ return $el->_init2(func_get_args());
+ }
+ public static function frame (/*...*/) {
+ $el = new HtmlElement('frame');
+ return $el->_init2(func_get_args());
+ }
+ public static function frameset (/*...*/) {
+ $el = new HtmlElement('frameset');
+ return $el->_init2(func_get_args());
+ }
+ public static function iframe (/*...*/) {
+ $el = new HtmlElement('iframe');
+ return $el->_init2(func_get_args());
+ }
+ public static function nobody (/*...*/) {
+ $el = new HtmlElement('nobody');
+ return $el->_init2(func_get_args());
+ }
+ public static function object (/*...*/) {
+ $el = new HtmlElement('object');
+ return $el->_init2(func_get_args());
+ }
+ public static function embed (/*...*/) {
+ $el = new HtmlElement('embed');
+ return $el->_init2(func_get_args());
+ }
+ public static function param (/*...*/) {
+ $el = new HtmlElement('param');
+ return $el->_init2(func_get_args());
+ }
+ public static function fieldset (/*...*/) {
+ $el = new HtmlElement('fieldset');
+ return $el->_init2(func_get_args());
+ }
+ public static function legend (/*...*/) {
+ $el = new HtmlElement('legend');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function video (/*...*/) {
+ $el = new HtmlElement('video');
+ return $el->_init2(func_get_args());
+ }
+}
+
+define('HTMLTAG_EMPTY', 1);
+define('HTMLTAG_INLINE', 2);
+define('HTMLTAG_ACCEPTS_INLINE', 4);
+
+
+HTML::_setTagProperty(HTMLTAG_EMPTY,
+ 'area base basefont br col frame hr img input isindex link meta param');
+HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
+ // %inline elements:
+ 'b big i small tt ' // %fontstyle
+ . 's strike u ' // (deprecated)
+ . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
+ . 'a img object embed br script map q sub sup span bdo '//%special
+ . 'button input label option select textarea label ' //%formctl
+
+ // %block elements which contain inline content
+ . 'address h1 h2 h3 h4 h5 h6 p pre '
+ // %block elements which contain either block or inline content
+ . 'div fieldset frameset'
+
+ // other with inline content
+ . 'caption dt label legend video '
+ // other with either inline or block
+ . 'dd del ins li td th colgroup');
+
+HTML::_setTagProperty(HTMLTAG_INLINE,
+ // %inline elements:
+ 'b big i small tt ' // %fontstyle
+ . 's strike u ' // (deprecated)
+ . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
+ . 'a img object br script map q sub sup span bdo '//%special
+ . 'button input label option select textarea ' //%formctl
+ . 'nobody iframe'
+ );
+
+/**
+ * Generate hidden form input fields.
+ *
+ * @param $query_args hash A hash mapping names to values for the hidden inputs.
+ * Values in the hash can themselves be hashes. The will result in hidden inputs
+ * which will reconstruct the nested structure in the resulting query args as
+ * processed by PHP.
+ *
+ * Example:
+ *
+ * $args = array('x' => '2',
+ * 'y' => array('a' => 'aval', 'b' => 'bval'));
+ * $inputs = HiddenInputs($args);
+ *
+ * Will result in:
+ *
+ * <input type="hidden" name="x" value = "2" />
+ * <input type="hidden" name="y[a]" value = "aval" />
+ * <input type="hidden" name="y[b]" value = "bval" />
+ *
+ * @return object An XmlContent object containing the inputs.
+ */
+function HiddenInputs ($query_args, $pfx = false, $exclude = array()) {
+ $inputs = HTML();
+
+ foreach ($query_args as $key => $val) {
+ if (in_array($key, $exclude)) continue;
+ $name = $pfx ? $pfx . "[$key]" : $key;
+ if (is_array($val))
+ $inputs->pushContent(HiddenInputs($val, $name));
+ else
+ $inputs->pushContent(HTML::input(array('type' => 'hidden',
+ 'name' => $name,
+ 'value' => $val)));
+ }
+ return $inputs;
+}
+
+
+/** Generate a <script> tag containing javascript.
+ *
+ * @param string $js The javascript.
+ * @param string $script_args (optional) hash of script tags options
+ * e.g. to provide another version or the defer attr
+ * @return HtmlElement A <script> element.
+ */
+function JavaScript ($js, $script_args = false) {
+ $default_script_args = array(//'version' => 'JavaScript', // not xhtml conformant
+ 'type' => 'text/javascript');
+ $script_args = $script_args ? array_merge($default_script_args, $script_args)
+ : $default_script_args;
+ if (empty($js))
+ return HTML(HTML::script($script_args),"\n");
+ else
+ // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
+ return HTML(HTML::script($script_args,
+ new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
+ . "\n".trim($js)."\n"
+ . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))),"\n");
+}
+
+/** Conditionally display content based of whether javascript is supported.
+ *
+ * This conditionally (on the client side) displays one of two alternate
+ * contents depending on whether the client supports javascript.
+ *
+ * NOTE:
+ * The content you pass as arguments to this function must be block-level.
+ * (This is because the <noscript> tag is block-level.)
+ *
+ * @param mixed $if_content Content to display if the browser supports
+ * javascript.
+ *
+ * @param mixed $else_content Content to display if the browser does
+ * not support javascript.
+ *
+ * @return XmlContent
+ */
+function IfJavaScript($if_content = false, $else_content = false) {
+ $html = array();
+ if ($if_content) {
+ $xml = AsXML($if_content);
+ $js = sprintf('document.write("%s");',
+ addcslashes($xml, "\0..\37!@\\\177..\377"));
+ $html[] = JavaScript($js);
+ }
+ if ($else_content) {
+ $html[] = HTML::noscript(false, $else_content);
+ }
+ return HTML($html);
+}
+
+// (c-file-style: "gnu")
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
Property changes on: trunk/lib/HtmlElement5.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/lib/IniConfig.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -154,7 +154,7 @@
'PLUGIN_CACHED_DATABASE', 'PLUGIN_CACHED_FILENAME_PREFIX',
'PLUGIN_CACHED_HIGHWATER', 'PLUGIN_CACHED_LOWWATER', 'PLUGIN_CACHED_MAXLIFETIME',
'PLUGIN_CACHED_MAXARGLEN', 'PLUGIN_CACHED_IMGTYPES',
- 'WYSIWYG_BACKEND',
+ 'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
// extra logic:
'SERVER_NAME','SERVER_PORT','SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
@@ -196,7 +196,8 @@
'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML',
- 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR',
+ 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
+ 'ENABLE_MARKUP_MEDIAWIKI_TABLE',
'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS',
'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
@@ -418,6 +419,18 @@
in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0);
}
+ global $PLUGIN_MARKUP_MAP;
+ $PLUGIN_MARKUP_MAP = array();
+ if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
+ $_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
+ foreach ($_map as $v) {
+ list($xml,$plugin) = split(':', $v);
+ if (!empty($xml) and !empty($plugin))
+ $PLUGIN_MARKUP_MAP[$xml] = $plugin;
+ }
+ unset($_map); unset($xml); unset($plugin); unset($v);
+ }
+
if (empty($rs['TEMP_DIR'])) {
$rs['TEMP_DIR'] = "/tmp";
if (getenv("TEMP"))
@@ -633,6 +646,7 @@
$AllAllowedPlugins = $ActionPages;
// Add plugins that have no corresponding action page
$AllAllowedPlugins[] = 'AsciiSVG';
+ $AllAllowedPlugins[] = 'AtomFeed';
$AllAllowedPlugins[] = 'BoxRight';
$AllAllowedPlugins[] = 'CalendarList';
$AllAllowedPlugins[] = 'Calendar';
Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php 2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/lib/XmlParser.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -56,8 +56,10 @@
$this->_parser = xml_parser_create($encoding);
else
$this->_parser = xml_parser_create();
- xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['charset']);
- //xml_set_object($this->_parser, &$this);
+
+ if (isset($GLOBALS['charset']))
+ xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['charset']);
+
xml_set_element_handler($this->_parser,
array(&$this, 'tag_open'),
array(&$this, 'tag_close' ));
Added: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php (rev 0)
+++ trunk/lib/plugin/AtomFeed.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,85 @@
+<?php // -*-php-*-
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+/**
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/WikiPlugin.php');
+require_once('lib/AtomParser.php');
+
+class WikiPlugin_AtomFeed
+extends WikiPlugin
+{
+ function getName() {
+ return _('AtomFeed');
+ }
+
+ function getDescription() {
+ return _('Atom Aggregator Plugin');
+ }
+
+ function getDefaultArguments() {
+ return array(
+ 'feed' => "",
+ 'description' => "",
+ 'url' => "",
+ 'maxitem' => 0,
+ 'titleonly' => false
+ );
+ }
+
+ function run($dbi, $argstr, &$request, $basepage) {
+ extract($this->getArgs($argstr, $request));
+ $parser = new AtomParser();
+
+ assert(!empty($url));
+ $parser->parse_url($url);
+
+ $html = '';
+
+ $items = HTML::dl();
+ foreach ($parser->feed as $feed) {
+ $title = HTML::h3(HTML::a(array('href' => $feed["links"]["0"]["href"]), $feed["title"]));
+ $counter = 1;
+ foreach($parser->entries as $entry) {
+ $item = HTML::dt(HTML::a(array('href' => $entry["links"]["0"]["href"]), $entry["title"]));
+ $items->pushContent($item);
+
+ if (!$titleonly) {
+ $description = HTML::dd(HTML::raw(html_entity_decode($entry["content"])));
+ } else {
+ $description = HTML::dd();
+ }
+ $items->pushContent($description);
+
+ if ($maxitem > 0 && $counter >= $maxitem) {
+ break;
+ }
+ $counter++;
+ }
+ $html = HTML::div(array('class'=> 'rss'), $title);
+ $html->pushContent($items);
+ }
+
+ return $html;
+ }
+}
+?>
\ No newline at end of file
Property changes on: trunk/lib/plugin/AtomFeed.php
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/tests/unit/lib/AtomParserTest.php
===================================================================
--- trunk/tests/unit/lib/AtomParserTest.php (rev 0)
+++ trunk/tests/unit/lib/AtomParserTest.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,220 @@
+<?php
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+/**
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/AtomParser.php');
+require_once('PHPUnit/Framework.php');
+
+class AtomParserTest
+extends phpwiki_TestCase
+{
+ function testSimpleAtomFileParsing() {
+ $fake_atom_file = <<<ATOM
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+ xmlns:georss="http://www.georss.org/georss" >
+ <link href="http://www.phpwiki.org/fakeurl" rel="self" type="application/atom+xml" />
+ <title>This is a fake feed</title>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <id>http://www.phpwiki.org/fakeurl</id>
+ <subtitle>Cool feed</subtitle>
+ <author>
+ <name>Sébastien Le Callonnec</name>
+ <email>sl...@ya...</email>
+ </author>
+
+ <entry>
+ <title>Foobar Éire</title>
+ <link href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8"/>
+ <content type="xhtml">
+ <div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+ </content>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <published>2010-05-15T01:00:00Z</published>
+ <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+ <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223621</id>
+ </entry>
+
+</feed>
+ATOM;
+ $parser = new AtomParser();
+ $parser->parse($fake_atom_file);
+
+ $this->assertFalse(count($parser->feed) == 0);
+
+ $current_feed = $parser->feed[0];
+ $this->assertEquals("This is a fake feed", $current_feed["title"]);
+
+ $this->assertFalse(count($current_feed["links"]) == 0);
+ $this->assertEquals("http://www.phpwiki.org/fakeurl", $current_feed["links"][0]["href"]);
+ $this->assertEquals("Cool feed", $current_feed["subtitle"]);
+ $this->assertEquals("2010-05-15T01:00:00Z", $current_feed["updated"]);
+
+ $this->assertFalse(count($current_feed["authors"]) == 0);
+
+ $current_author = $current_feed["authors"][0];
+ $this->assertEquals("Sébastien Le Callonnec", $current_author["name"]);
+ $this->assertEquals("sl...@ya...", $current_author["email"]);
+
+ $this->assertFalse(count($parser->entries) == 0);
+
+ $current_entry = $parser->entries[0];
+ $this->assertEquals("Foobar Éire", $current_entry["title"]);
+ $this->assertEquals("http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8", $current_entry["links"][0]["href"]);
+ $this->assertEquals("2010-05-15T01:00:00Z", $current_entry["updated"]);
+ $this->assertEquals("2010-05-15T01:00:00Z", $current_entry["published"]);
+ $this->assertEquals("tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223621", $current_entry["id"]);
+
+ $payload =<<<CONTENT
+<div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+CONTENT;
+ $this->assertEquals($payload, $current_entry["content"]);
+ }
+
+ function testExtensiveAtomExampleFromRFC4287() {
+ $fake_atom_file = <<<ATOM
+<?xml version="1.0" encoding="utf-8"?>
+
+<feed xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">dive into mark</title>
+ <subtitle type="html">
+ A <em>lot</em> of effort
+ went into making this effortless
+ </subtitle>
+
+ <updated>2005-07-31T12:29:29Z</updated>
+ <id>tag:example.org,2003:3</id>
+ <link rel="alternate" type="text/html"
+ hreflang="en" href="http://example.org/"/>
+ <link rel="self" type="application/atom+xml"
+ href="http://example.org/feed.atom"/>
+ <rights>Copyright (c) 2003, Mark Pilgrim</rights>
+
+ <generator uri="http://www.example.com/" version="1.0">
+ Example Toolkit
+ </generator>
+ <entry>
+ <title>Atom draft-07 snapshot</title>
+ <link rel="alternate" type="text/html"
+ href="http://example.org/2005/04/02/atom"/>
+
+ <link rel="enclosure" type="audio/mpeg" length="1337"
+ href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+ <id>tag:example.org,2003:3.2397</id>
+ <updated>2005-07-31T12:29:29Z</updated>
+ <published>2003-12-13T08:29:29-04:00</published>
+
+ <author>
+ <name>Mark Pilgrim</name>
+ <uri>http://example.org/</uri>
+ <email>f8...@ex...</email>
+
+ </author>
+ <contributor>
+ <name>Sam Ruby</name>
+ </contributor>
+ <contributor>
+
+ <name>Joe Gregorio</name>
+ </contributor>
+ <content type="xhtml" xml:lang="en"
+ xml:base="http://diveintomark.org/">
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ <p><i>[Update: The Atom draft is finished.]</i></p>
+
+ </div>
+ </content>
+ </entry>
+</feed>
+ATOM;
+ $parser = new AtomParser();
+ $parser->parse($fake_atom_file);
+
+ $this->assertFalse(count($parser->feed) == 0);
+
+ $current_feed = $parser->feed[0];
+ $this->assertEquals("dive into mark", $current_feed["title"]);
+ $this->assertEquals("Copyright (c) 2003, Mark Pilgrim", $current_feed["rights"]);
+ $this->assertEquals("A <em>lot</em> of effort\n went into making this effortless", $current_feed["subtitle"]);
+ $this->assertEquals("2005-07-31T12:29:29Z", $current_feed["updated"]);
+ $this->assertEquals("tag:example.org,2003:3", $current_feed["id"]);
+ $this->assertEquals("Example Toolkit", $current_feed["generator"]);
+
+ $this->assertTrue(count($current_feed["authors"]) == 0);
+ $this->assertTrue(count($current_feed["contributors"]) == 0);
+
+
+ $this->assertFalse(count($parser->entries) == 0);
+
+ $current_entry = $parser->entries[0];
+ $this->assertEquals("Atom draft-07 snapshot", $current_entry["title"]);
+ $this->assertEquals("2005-07-31T12:29:29Z", $current_entry["updated"]);
+ $this->assertEquals("2003-12-13T08:29:29-04:00", $current_entry["published"]);
+ $this->assertEquals("tag:example.org,2003:3.2397", $current_entry["id"]);
+ $this->assertEquals(2, count($current_entry["links"]));
+
+ $this->assertTrue(count($current_entry["authors"]) == 1);
+ $this->assertTrue(count($current_entry["contributors"]) == 2);
+
+ $current_author = $current_entry["authors"][0];
+ $this->assertEquals("Mark Pilgrim", $current_author["name"]);
+ $this->assertEquals("f8...@ex...", $current_author["email"]);
+
+ $first_contributor = $current_entry["contributors"][0];
+ $second_contributor = $current_entry["contributors"][1];
+
+ $this->assertEquals("Sam Ruby", $first_contributor["name"]);
+ $this->assertEquals("Joe Gregorio", $second_contributor["name"]);
+
+ $first_link = $current_entry["links"][0];
+ $this->assertEquals("alternate", $first_link["rel"]);
+ $this->assertEquals("text/html", $first_link["type"]);
+ $this->assertEquals("http://example.org/2005/04/02/atom", $first_link["href"]);
+
+ $second_link = $current_entry["links"][1];
+ $this->assertEquals("enclosure", $second_link["rel"]);
+ $this->assertEquals("audio/mpeg", $second_link["type"]);
+ $this->assertEquals("1337", $second_link["length"]);
+ $this->assertEquals("http://example.org/audio/ph34r_my_podcast.mp3", $second_link["href"]);
+
+ $payload = <<<CONTENT
+<div xmlns="http://www.w3.org/1999/xhtml">
+ <p><i>[Update: The Atom draft is finished.]</i></p>
+
+ </div>
+CONTENT;
+
+ $this->assertEquals($payload, $current_entry["content"]);
+ }
+}
+?>
\ No newline at end of file
Property changes on: trunk/tests/unit/lib/AtomParserTest.php
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/tests/unit/lib/plugin/AtomFeedTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AtomFeedTest.php (rev 0)
+++ trunk/tests/unit/lib/plugin/AtomFeedTest.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,80 @@
+<?php
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+/**
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/plugin/AtomFeed.php');
+require_once('lib/AtomParser.php');
+require_once('lib/HtmlElement.php');
+
+class AtomFeedTest
+extends phpwiki_TestCase
+{
+ var $atom_feed_plugin;
+
+ public function setUp() {
+ parent::setUp();
+ $this->atom_feed_plugin = new WikiPlugin_AtomFeed();
+ }
+
+ public function testRunMaxItem() {
+ global $request;
+ $expected_html = <<<EXPECTED
+<div class="rss"><h3><a href="http://www.phpwiki.org/fakeurl">This is a fake feed</a></h3>
+<dl>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire</a></dt>
+<dd><div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div></dd>
+</dl>
+</div>
+EXPECTED;
+ $html = $this->atom_feed_plugin->run(null, 'url=file://' . dirname(__FILE__) . '/atom-example.xml maxitem=1', $request, '.');
+ $this->assertEquals($expected_html, trim(html_entity_decode($html->asXML())));
+ }
+
+ public function testRunTitleOnly() {
+ global $request;
+ $expected_html = <<<EXPECTED
+<div class="rss"><h3><a href="http://www.phpwiki.org/fakeurl">This is a fake feed</a></h3>
+<dl>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 2</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 3</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 4</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 5</a></dt>
+<dd></dd>
+</dl>
+</div>
+EXPECTED;
+ $html = $this->atom_feed_plugin->run(null, 'url=file://' . dirname(__FILE__) . '/atom-example.xml titleonly=true', $request, '.');
+ $this->assertEquals($expected_html, trim(html_entity_decode($html->asXML())));
+ }
+}
+?>
\ No newline at end of file
Property changes on: trunk/tests/unit/lib/plugin/AtomFeedTest.php
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/tests/unit/lib/plugin/atom-example.xml
===================================================================
--- trunk/tests/unit/lib/plugin/atom-example.xml (rev 0)
+++ trunk/tests/unit/lib/plugin/atom-example.xml 2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+ xmlns:georss="http://www.georss.org/georss" >
+ <link href="http://www.phpwiki.org/fakeurl" rel="self" type="application/atom+xml" />
+ <title>This is a fake feed</title>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <id>http://www.phpwiki.org/fakeurl</id>
+ <subtitle>Cool feed</subtitle>
+ <author>
+ <name>Sébastien Le Callonnec</name>
+ <email>sl...@ya...</email>
+ </author>
+
+ <entry>
+ <title>Foobar Éire</title>
+ <link href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8"/>
+ <content type="xhtml">
+ <div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+ </content>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <published>2010-05-15T01:00:00Z</published>
+ <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+ <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223621</id>
+ </entry>
+ <entry>
+ <title>Foobar Éire 2</title>
+ <link href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8"/>
+ <content type="xhtml">
+ <div xmlns="http://www.w3.org/1999/xhtml">Again Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+ </content>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <published>2010-05-15T01:00:00Z</published>
+ <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+ <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223622</id>
+ </entry>
+ <entry>
+ <title>Foobar Éire 3</title>
+ <link href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8"/>
+ <content type="xhtml">
+ <div xmlns="http://www.w3.org/1999/xhtml">Still Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+ </content>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <published>2010-05-15T01:00:00Z</published>
+ <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+ <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223623</id>
+ </entry>
+ <entry>
+ <title>Foobar Éire 4</title>
+ <link href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8"/>
+ <content type="xhtml">
+ <div xmlns="http://www.w3.org/1999/xhtml">Yet Again Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+ </content>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <published>2010-05-15T01:00:00Z</published>
+ <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+ <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223624</id>
+ </entry>
+ <entry>
+ <title>Foobar Éire 5</title>
+ <link href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8"/>
+ <content type="xhtml">
+ <div xmlns="http://www.w3.org/1999/xhtml">Yes, yes Millenium Spire, Dublin
+ <div class="geo">Geo coordinates:
+ <abbr class="latitude" title="53.349441">53.349441</abbr>
+ <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+ </div>
+ </div>
+ </content>
+ <updated>2010-05-15T01:00:00Z</updated>
+ <published>2010-05-15T01:00:00Z</published>
+ <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+ <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223625</id>
+ </entry>
+</feed>
\ No newline at end of file
Property changes on: trunk/tests/unit/lib/plugin/atom-example.xml
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php 2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/tests/unit/test.php 2010-06-07 08:12:29 UTC (rev 7466)
@@ -400,6 +400,7 @@
/* valid tests only with clean virgin setup */
'AllPagesTest','AllUsersTest','OrphanedPagesTest',
'WantedPagesTest','TextSearchTest','IncludePageTest',
+ 'AtomParserTest','AtomFeedTest',
/* final tests which require all valid pages and consumes > 32MB */
'DumpHtml');
// support db=file db=dba test=SetupWiki test=DumpHtml debug=num -dconstant=value
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-07 09:11:35
|
Revision: 7468
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7468&view=rev
Author: rurban
Date: 2010-06-07 09:11:29 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
Move helper script away
Modified Paths:
--------------
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
Added Paths:
-----------
trunk/admin/mkfuncs
Added: trunk/admin/mkfuncs
===================================================================
--- trunk/admin/mkfuncs (rev 0)
+++ trunk/admin/mkfuncs 2010-06-07 09:11:29 UTC (rev 7468)
@@ -0,0 +1,45 @@
+#!/bin/sh
+mkfuncs4() {
+ for tag in "$@"
+ do
+ echo " function $tag (/*...*/) {"
+ echo " \$el = new HtmlElement('$tag');"
+ echo " return \$el->_init2(func_get_args());"
+ echo " }"
+ done
+}
+mkfuncs5 () {
+ for tag in "$@"
+ do
+ echo " public static function $tag (/*...*/) {"
+ echo " \$el = new HtmlElement('$tag');"
+ echo " return \$el->_init2(func_get_args());"
+ echo " }"
+ done
+}
+alias mkfuncs=mkfuncs4
+#alias mkfuncs=mkfuncs5
+
+d='
+ /****************************************/'
+mkfuncs link meta style script noscript
+echo "$d"
+mkfuncs a img br span
+echo "$d"
+mkfuncs h1 h2 h3 h4 h5 h6
+echo "$d"
+mkfuncs hr div p pre blockquote
+echo "$d"
+mkfuncs em strong small
+echo "$d"
+mkfuncs tt u sup sub
+echo "$d"
+mkfuncs ul ol dl li dt dd
+echo "$d"
+mkfuncs table caption thead tbody tfoot tr td th colgroup col
+echo "$d"
+mkfuncs form input option select textarea label fieldset legend
+echo "$d"
+mkfuncs area map frame frameset iframe nobody object embed param
+echo "$d"
+mkfuncs video
Property changes on: trunk/admin/mkfuncs
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2010-06-07 08:15:50 UTC (rev 7467)
+++ trunk/lib/HtmlElement.php 2010-06-07 09:11:29 UTC (rev 7468)
@@ -145,45 +145,8 @@
}
}
- //
- // Shell script to generate the following static methods:
-/*
+ // See admin/mkfuncs shell script to generate the following static methods
-#!/bin/sh
-mkfuncs () {
- for tag in "$@"
- do
- echo " public static function $tag (/*...*/) {"
- echo " \$el = new HtmlElement('$tag');"
- echo " return \$el->_init2(func_get_args());"
- echo " }"
- done
-}
-d='
- /****************************************/'
-mkfuncs link meta style script noscript
-echo "$d"
-mkfuncs a img br span
-echo "$d"
-mkfuncs h1 h2 h3 h4 h5 h6
-echo "$d"
-mkfuncs hr div p pre blockquote
-echo "$d"
-mkfuncs em strong small
-echo "$d"
-mkfuncs tt u sup sub
-echo "$d"
-mkfuncs ul ol dl li dt dd
-echo "$d"
-mkfuncs table caption thead tbody tfoot tr td th colgroup col
-echo "$d"
-mkfuncs form input option select textarea label fieldset legend
-echo "$d"
-mkfuncs area map frame frameset iframe nobody object embed param
-echo "$d"
-mkfuncs video
-*/
-
function link (/*...*/) {
$el = new HtmlElement('link');
return $el->_init2(func_get_args());
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2010-06-07 08:15:50 UTC (rev 7467)
+++ trunk/lib/HtmlElement5.php 2010-06-07 09:11:29 UTC (rev 7468)
@@ -146,45 +146,8 @@
}
}
- //
- // Shell script to generate the following static methods:
-/*
+ // See admin/mkfuncs shell script to generate the following static methods
-#!/bin/sh
-mkfuncs () {
- for tag in "$@"
- do
- echo " public static function $tag (/*...*/) {"
- echo " \$el = new HtmlElement('$tag');"
- echo " return \$el->_init2(func_get_args());"
- echo " }"
- done
-}
-d='
- /****************************************/'
-mkfuncs link meta style script noscript
-echo "$d"
-mkfuncs a img br span
-echo "$d"
-mkfuncs h1 h2 h3 h4 h5 h6
-echo "$d"
-mkfuncs hr div p pre blockquote
-echo "$d"
-mkfuncs em strong small
-echo "$d"
-mkfuncs tt u sup sub
-echo "$d"
-mkfuncs ul ol dl li dt dd
-echo "$d"
-mkfuncs table caption thead tbody tfoot tr td th colgroup col
-echo "$d"
-mkfuncs form input option select textarea label fieldset legend
-echo "$d"
-mkfuncs area map frame frameset iframe nobody object embed param
-echo "$d"
-mkfuncs video
-*/
-
public static function link (/*...*/) {
$el = new HtmlElement('link');
return $el->_init2(func_get_args());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-07 14:05:39
|
Revision: 7485
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7485&view=rev
Author: rurban
Date: 2010-06-07 14:05:29 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
Add mssqlnative support by chrisdpucci, patch 2910309
This patch adds native support for MS SQL Server 2005+ to phpWiki 1.3.14 using the Native SQL Server Driver for PHP.
More information regarding the Native SQL Server Driver for PHP can be found here:
http://www.microsoft.com/downloads/details.aspx?FamilyId=61BF87E0-D031-466B-B09A-6597C21A2E2A&displaylang=en
whitespace reformatted
Modified Paths:
--------------
trunk/configurator.php
Added Paths:
-----------
trunk/doc/INSTALL.mssqlnative
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/schemas/sqlsrv-destroy.sql
trunk/schemas/sqlsrv-initialize.sql
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2010-06-07 13:50:12 UTC (rev 7484)
+++ trunk/configurator.php 2010-06-07 14:05:29 UTC (rev 7485)
@@ -1,6 +1,6 @@
<?php // -*-php-*- $Id$
/*
- * Copyright 2002,2003,2005 $ThePhpWikiProgrammingTeam
+ * Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam
* Copyright 2002 Martin Geisler <gim...@gi...>
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
@@ -173,7 +173,7 @@
pre { font-size: 120%; }
td { border: thin solid black }
tr { border: none }
-div.hint { background-color: #eeeeee; }
+div.hint { border: thin solid red, background-color: #eeeeee; }
tr.hidden { border: none; display: none; }
td.part { background-color: #eeeeee; color: inherit; }
td.instructions { background-color: #ffffee; width: <?php echo $tdwidth ?>px; color: inherit; }
@@ -634,12 +634,14 @@
array('mysql' => "MySQL",
'pgsql' => "PostgreSQL",
'mssql' => "Microsoft SQL Server",
+ 'mssqlnative' => "Microsoft SQL Server (native)",
'oci8' => "Oracle 8",
'mysqli' => "mysqli (only ADODB)",
'mysqlt' => "mysqlt (only ADODB)",
'ODBC' => "ODBC (only ADODB or PDO)",
'firebird' => "Firebird (only PDO)",
- 'oracle' => "Oracle (only PDO)"), "
+ 'oracle' => "Oracle (only PDO)",
+), "
SQL DB types. The DSN hosttype.");
$properties["SQL User"] =
@@ -2233,6 +2235,29 @@
}
}
+/*
+class _ini_set
+extends _variable {
+ function value() {
+ global $HTTP_POST_VARS;
+ if ($v = $HTTP_POST_VARS[$this->config_item_name])
+ return $v;
+ else {
+ return ini_get($this->get_config_item_name);
+ }
+ }
+ function _config_format($value) {
+ return sprintf("ini_set('%s', '%s');", $this->get_config_item_name(), $value);
+ }
+ function _get_config_line($posted_value) {
+ if ($posted_value && ! $posted_value == $this->default_value)
+ return "\n" . $this->_config_format($posted_value);
+ else
+ return "\n;" . $this->_config_format($this->default_value);
+ }
+}
+*/
+
class boolean_define
extends _define {
@@ -2487,7 +2512,7 @@
}
if ($fp) {
- fputs($fp, utf8_encode($config));
+ fputs($fp, $config);
fclose($fp);
echo "<p>The configuration was written to <code><b>$config_file</b></code>.</p>\n";
if ($new_filename) {
Added: trunk/doc/INSTALL.mssqlnative
===================================================================
--- trunk/doc/INSTALL.mssqlnative (rev 0)
+++ trunk/doc/INSTALL.mssqlnative 2010-06-07 14:05:29 UTC (rev 7485)
@@ -0,0 +1,50 @@
+Installing phpwiki with MS SQL Server Native Driver for ADOdb
+-----------------------------------------------------------
+
+Microsoft has been working hard to get support for their products
+into Open Source projects. The MS SQL Server 2005 Driver for ADOdb
+is one step in that direction. The following is instructions on how
+to get and install the new mssql php driver for ADOdb as well as
+how to get the new driver to work with phpWiki.
+
+As of the writing of this walkthrough, the latest version of the PHP
+driver for SQL Server 2005 is the May 2008 Community Technical Preview.
+If you don't already have a copy of the SQL Server 2005 for PHP
+driver installed on your server, you can get a copy at:
+http://www.microsoft.com/sql/technologies/php/default.mspx
+
+This assumes that you have PHP 5 installed as well as a working copy of
+any edition of SQL Server 2005 or SQL Server 2000 (including Express
+Edition). If you do not have a copy of the free SQL Server 2005 Express
+Edition you can download it from:
+http://go.microsoft.com/fwlink/?LinkId=64064
+
+1. If you do not have a database created already, create one using
+ the SQL Server Management tool. You can get the free Express version at:
+ http://www.microsoft.com/downloads/details.aspx?FamilyId=C243A5AE-4BD1-
+ 4E3D-94B8-5A0F62BF7796&displaylang=en
+
+2. If necessary create a user for that database which has the rights
+ to select, insert, update, delete. For more information on how to use
+ SQL Server 2005 you can download SQL Server 2005 Books Online at:
+ http://www.microsoft.com/downloads/details.aspx?FamilyId=BE6A2C5D-00DF-
+ 4220-B133-29C1E0B6585F&displaylang=en
+
+3. Create the tables and functions inside your database by running the SQL
+ file included with the phpWiki project located at:
+ schemas/sqlsrv-initialize.sql
+
+4. Edit the DATABASE settings in config/config.ini to reflect your settings.
+
+ a) DATABASE_TYPE should be set to 'ADODB' (case sensitive)
+ b) DATABASE_DSN should be set to something like:
+ 'mssqlnative://username:password@pathtosqlserver/databasename'
+ c) Note that if you set DATABASE_PREFIX to a non-empty string, you will
+ have to edit schemas/sqlsrv-initialize.sql before you perform step
+ three (above). You might also edit schemas/sqlsrv-destroy.sql at the
+ same time, so you don't forget.
+ d) USE_SAFE_DBSESSION should be set to 'true'
+
+ Note: DATABASE_DIRECTORY and DATABASE_DBA_HANDLER are ignored for mssql.
+
+That's it. phpWiki should work now.
Added: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php (rev 0)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2010-06-07 14:05:29 UTC (rev 7485)
@@ -0,0 +1,921 @@
+<?php
+/*
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Native mssql driver. Requires mssql client. Works on Windows.
+ http://www.microsoft.com/sql/technologies/php/default.mspx
+ To configure for Unix, see
+ http://phpbuilder.com/columns/alberto20000919.php3
+
+ $stream = sqlsrv_get_field($stmt, $index, SQLSRV_SQLTYPE_STREAM(SQLSRV_ENC_BINARY));
+ stream_filter_append($stream, "convert.iconv.ucs-2/utf-8"); // Voila, UTF-8 can be read directly from $stream
+
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!function_exists('sqlsrv_configure')) {
+ die("mssqlnative extension not installed");
+}
+
+if (!function_exists('sqlsrv_set_error_handling')) {
+ function sqlsrv_set_error_handling($constant) {
+ sqlsrv_configure("WarningsReturnAsErrors", $constant);
+ }
+}
+if (!function_exists('sqlsrv_log_set_severity')) {
+ function sqlsrv_log_set_severity($constant) {
+ sqlsrv_configure("LogSeverity", $constant);
+ }
+}
+if (!function_exists('sqlsrv_log_set_subsystems')) {
+ function sqlsrv_log_set_subsystems($constant) {
+ sqlsrv_configure("LogSubsystems", $constant);
+ }
+}
+
+
+//----------------------------------------------------------------
+// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
+// and this causes tons of problems because localized versions of
+// MSSQL will return the dates in dmy or mdy order; and also the
+// month strings depends on what language has been configured. The
+// following two variables allow you to control the localization
+// settings - Ugh.
+//
+// MORE LOCALIZATION INFO
+// ----------------------
+// To configure datetime, look for and modify sqlcommn.loc,
+// typically found in c:\mssql\install
+// Also read :
+// http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
+// Alternatively use:
+// CONVERT(char(12),datecol,120)
+//
+// Also if your month is showing as month-1,
+// e.g. Jan 13, 2002 is showing as 13/0/2002, then see
+// http://phplens.com/lens/lensforum/msgs.php?id=7048&x=1
+// it's a localisation problem.
+//----------------------------------------------------------------
+
+
+// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
+if (ADODB_PHPVER >= 0x4300) {
+// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
+ ini_set('mssql.datetimeconvert',0);
+} else {
+ global $ADODB_mssql_mths; // array, months must be upper-case
+ $ADODB_mssql_date_order = 'mdy';
+ $ADODB_mssql_mths = array(
+ 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+ 'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+}
+
+//---------------------------------------------------------------------------
+// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
+// just after you connect to the database. Supports mdy and dmy only.
+// Not required for PHP 4.2.0 and above.
+function AutoDetect_MSSQL_Date_Order($conn)
+{
+ global $ADODB_mssql_date_order;
+ $adate = $conn->GetOne('select getdate()');
+ if ($adate) {
+ $anum = (int) $adate;
+ if ($anum > 0) {
+ if ($anum > 31) {
+ //ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
+ } else
+ $ADODB_mssql_date_order = 'dmy';
+ } else
+ $ADODB_mssql_date_order = 'mdy';
+ }
+}
+
+class ADODB_mssqlnative extends ADOConnection {
+ var $databaseType = "mssqlnative";
+ var $dataProvider = "mssqlnative";
+ var $replaceQuote = "''"; // string to use to replace quotes
+ var $fmtDate = "'Y-m-d'";
+ var $fmtTimeStamp = "'Y-m-d H:i:s'";
+ var $hasInsertID = true;
+ var $substr = "substring";
+ var $length = 'len';
+ var $hasAffectedRows = true;
+ var $poorAffectedRows = false;
+ var $metaDatabasesSQL = "select name from sys.sysdatabases where name <> 'master'";
+ var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
+ var $metaColumnsSQL = # xtype==61 is datetime
+ "select c.name,t.name,c.length,
+ (case when c.xusertype=61 then 0 else c.xprec end),
+ (case when c.xusertype=61 then 0 else c.xscale end)
+ from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+ var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE
+ var $hasGenID = true;
+ var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+ var $sysTimeStamp = 'GetDate()';
+ var $maxParameterLen = 4000;
+ var $arrayClass = 'ADORecordSet_array_mssqlnative';
+ var $uniqueSort = true;
+ var $leftOuter = '*=';
+ var $rightOuter = '=*';
+ var $ansiOuter = true; // for mssql7 or later
+ var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
+ var $uniqueOrderBy = true;
+ var $_bindInputArray = true;
+ var $_dropSeqSQL = "drop table %s";
+
+ function ADODB_mssqlnative()
+ {
+ if ($this->debug) {
+ error_log("<pre>");
+ sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
+ sqlsrv_log_set_severity( SQLSRV_LOG_SEVERITY_ALL );
+ sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+ sqlsrv_configure('warnings_return_as_errors', 0);
+ } else {
+ sqlsrv_set_error_handling(0);
+ sqlsrv_log_set_severity(0);
+ sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+ sqlsrv_configure('warnings_return_as_errors', 0);
+ }
+ }
+
+ function ServerInfo()
+ {
+ global $ADODB_FETCH_MODE;
+ if ($this->fetchMode === false) {
+ $savem = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ } else
+ $savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+ $arrServerInfo = sqlsrv_server_info($this->_connectionID);
+ $arr['description'] = $arrServerInfo['SQLServerName'].' connected to '.$arrServerInfo['CurrentDatabase'];
+ $arr['version'] = $arrServerInfo['SQLServerVersion'];//ADOConnection::_findvers($arr['description']);
+ return $arr;
+ }
+
+ function IfNull( $field, $ifNull )
+ {
+ return " ISNULL($field, $ifNull) "; // if MS SQL Server
+ }
+
+ function _insertid()
+ {
+ // SCOPE_IDENTITY()
+ // Returns the last IDENTITY value inserted into an IDENTITY column in
+ // the same scope. A scope is a module -- a stored procedure, trigger,
+ // function, or batch. Thus, two statements are in the same scope if
+ // they are in the same stored procedure, function, or batch.
+ return $this->GetOne($this->identitySQL);
+ }
+
+ function _affectedrows()
+ {
+ return sqlsrv_rows_affected($this->_queryID);
+ }
+
+ function CreateSequence($seq='adodbseq',$start=1)
+ {
+ if($this->debug) error_log("<hr>CreateSequence($seq,$start)");
+ sqlsrv_begin_transaction($this->_connectionID);
+ $start -= 1;
+ $this->Execute("create table $seq (id int)");//was float(53)
+ $ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+ if (!$ok) {
+ if($this->debug) error_log("<hr>Error: ROLLBACK");
+ sqlsrv_rollback($this->_connectionID);
+ return false;
+ }
+ sqlsrv_commit($this->_connectionID);
+ return true;
+ }
+
+ function GenID($seq='adodbseq',$start=1)
+ {
+ if($this->debug) error_log("<hr>GenID($seq,$start)");
+ sqlsrv_begin_transaction($this->_connectionID);
+ $ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+ if (!$ok) {
+ $this->Execute("create table $seq (id int)");
+ $ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+ if (!$ok) {
+ if($this->debug) error_log("<hr>Error: ROLLBACK");
+ sqlsrv_rollback($this->_connectionID);
+ return false;
+ }
+ sqlsrv_commit($this->_connectionID);
+ return $start;
+ }
+ $num = $this->GetOne("select id from $seq");
+ sqlsrv_commit($this->_connectionID);
+ if($this->debug) error_log(" Returning: $num");
+ return $num;
+ }
+
+ // Format date column in sql string given an input format that understands Y M D
+ function SQLDate($fmt, $col=false)
+ {
+ if (!$col) $col = $this->sysTimeStamp;
+ $s = '';
+
+ $len = strlen($fmt);
+ for ($i=0; $i < $len; $i++) {
+ if ($s) $s .= '+';
+ $ch = $fmt[$i];
+ switch($ch) {
+ case 'Y':
+ case 'y':
+ $s .= "datename(yyyy,$col)";
+ break;
+ case 'M':
+ $s .= "convert(char(3),$col,0)";
+ break;
+ case 'm':
+ $s .= "replace(str(month($col),2),' ','0')";
+ break;
+ case 'Q':
+ case 'q':
+ $s .= "datename(quarter,$col)";
+ break;
+ case 'D':
+ case 'd':
+ $s .= "replace(str(day($col),2),' ','0')";
+ break;
+ case 'h':
+ $s .= "substring(convert(char(14),$col,0),13,2)";
+ break;
+
+ case 'H':
+ $s .= "replace(str(datepart(hh,$col),2),' ','0')";
+ break;
+
+ case 'i':
+ $s .= "replace(str(datepart(mi,$col),2),' ','0')";
+ break;
+ case 's':
+ $s .= "replace(str(datepart(ss,$col),2),' ','0')";
+ break;
+ case 'a':
+ case 'A':
+ $s .= "substring(convert(char(19),$col,0),18,2)";
+ break;
+
+ default:
+ if ($ch == '\\') {
+ $i++;
+ $ch = substr($fmt,$i,1);
+ }
+ $s .= $this->qstr($ch);
+ break;
+ }
+ }
+ return $s;
+ }
+
+
+ function BeginTrans()
+ {
+ if ($this->transOff) return true;
+ $this->transCnt += 1;
+ if ($this->debug) error_log('<hr>begin transaction');
+ sqlsrv_begin_transaction($this->_connectionID);
+ return true;
+ }
+
+ function CommitTrans($ok=true)
+ {
+ if ($this->transOff) return true;
+ if ($this->debug) error_log('<hr>commit transaction');
+ if (!$ok) return $this->RollbackTrans();
+ if ($this->transCnt) $this->transCnt -= 1;
+ sqlsrv_commit($this->_connectionID);
+ return true;
+ }
+ function RollbackTrans()
+ {
+ if ($this->transOff) return true;
+ if ($this->debug) error_log('<hr>rollback transaction');
+ if ($this->transCnt) $this->transCnt -= 1;
+ sqlsrv_rollback($this->_connectionID);
+ return true;
+ }
+
+ function SetTransactionMode( $transaction_mode )
+ {
+ $this->_transmode = $transaction_mode;
+ if (empty($transaction_mode)) {
+ $this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+ return;
+ }
+ if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+ $this->Execute("SET TRANSACTION ".$transaction_mode);
+ }
+
+ /*
+ Usage:
+
+ $this->BeginTrans();
+ $this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
+
+ # some operation on both tables table1 and table2
+
+ $this->CommitTrans();
+
+ See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
+ */
+ function RowLock($tables,$where,$col='top 1 null as ignore')
+ {
+ if (!$this->transCnt) $this->BeginTrans();
+ return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
+ }
+
+ function SelectDB($dbName)
+ {
+ $this->database = $dbName;
+ $this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+ if ($this->_connectionID) {
+ $rs = $this->Execute('USE '.$dbName);
+ if($rs) {
+ return true;
+ } else return false;
+ }
+ else return false;
+ }
+
+ function ErrorMsg()
+ {
+ $retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
+ if($retErrors != null) {
+ foreach($retErrors as $arrError) {
+ $this->_errorMsg .= "SQLState: ".$arrError[ 'SQLSTATE']."\n";
+ $this->_errorMsg .= "Error Code: ".$arrError[ 'code']."\n";
+ $this->_errorMsg .= "Message: ".$arrError[ 'message']."\n";
+ }
+ } else {
+ $this->_errorMsg = "No errors found";
+ }
+ return $this->_errorMsg;
+ }
+
+ function ErrorNo()
+ {
+ if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
+ $err = sqlsrv_errors(SQLSRV_ERR_ALL);
+ if($err[0]) return $err[0]['code'];
+ else return -1;
+ }
+
+ // returns true or false
+ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+ {
+ if (!function_exists('sqlsrv_connect')) return null;
+ $connectionInfo = array("Database"=>$argDatabasename,'UID'=>$argUsername,'PWD'=>$argPassword);
+ if ($this->debug) error_log("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
+ //if ($this->debug) error_log("<hr>_connectionID before: ".serialize($this->_connectionID));
+ if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) {
+ if ($this->debug) error_log( "<hr><b>errors</b>: ".print_r( sqlsrv_errors(), true));
+ return false;
+ }
+ //if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
+ //if ($this->debug) error_log("<hr>defined functions: <pre>".var_export(get_defined_functions(),true)."</pre>");
+ return true;
+ }
+
+ // returns true or false
+ function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+ {
+ //return null;//not implemented. NOTE: Persistent connections have no effect if PHP is used as a CGI program. (FastCGI!)
+ return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+ }
+
+ function Prepare($sql)
+ {
+ $stmt = sqlsrv_prepare( $this->_connectionID, $sql);
+ if (!$stmt) return $sql;
+ return array($sql,$stmt);
+ }
+
+ // returns concatenated string
+ // MSSQL requires integers to be cast as strings
+ // automatically cast every datatype to VARCHAR(255)
+ // @author David Rogers (introspectshun)
+ function Concat()
+ {
+ $s = "";
+ $arr = func_get_args();
+
+ // Split single record on commas, if possible
+ if (sizeof($arr) == 1) {
+ foreach ($arr as $arg) {
+ $args = explode(',', $arg);
+ }
+ $arr = $args;
+ }
+
+ array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+ $s = implode('+',$arr);
+ if (sizeof($arr) > 0) return "$s";
+
+ return '';
+ }
+
+ /*
+ Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
+ So all your blobs must be of type "image".
+
+ Remember to set in php.ini the following...
+
+ ; Valid range 0 - 2147483647. Default = 4096.
+ mssql.textlimit = 0 ; zero to pass through
+
+ ; Valid range 0 - 2147483647. Default = 4096.
+ mssql.textsize = 0 ; zero to pass through
+ */
+ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+ {
+
+ if (strtoupper($blobtype) == 'CLOB') {
+ $sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+ return $this->Execute($sql) != false;
+ }
+ $sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
+ return $this->Execute($sql) != false;
+ }
+
+ // returns query ID if successful, otherwise false
+ function _query($sql,$inputarr=false)
+ {
+ $this->_errorMsg = false;
+ if (is_array($inputarr)) {
+ $rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
+ } else if (is_array($sql)) {
+ $rez = sqlsrv_query($this->_connectionID,$sql[1],$inputarr);
+ } else {
+ $rez = sqlsrv_query($this->_connectionID,$sql);
+ }
+ if ($this->debug) error_log("<hr>running query: ".var_export($sql,true)."<hr>input array: ".var_export($inputarr,true)."<hr>result: ".var_export($rez,true));//"<hr>connection: ".serialize($this->_connectionID)
+ //fix for returning true on anything besides select statements
+ if (is_array($sql)) $sql = $sql[1];
+ $sql = ltrim($sql);
+ if(stripos($sql, 'SELECT') !== 0 && $rez !== false) {
+ if ($this->debug) error_log(" isn't a select query, returning boolean true");
+ return true;
+ }
+ //end fix
+ if(!$rez) $rez = false;
+ return $rez;
+ }
+
+ // returns true or false
+ function _close()
+ {
+ if ($this->transCnt) $this->RollbackTrans();
+ $rez = @sqlsrv_close($this->_connectionID);
+ $this->_connectionID = false;
+ return $rez;
+ }
+
+ // mssql uses a default date like Dec 30 2000 12:00AM
+ function UnixDate($v)
+ {
+ return ADORecordSet_array_mssql::UnixDate($v);
+ }
+
+ function UnixTimeStamp($v)
+ {
+ return ADORecordSet_array_mssql::UnixTimeStamp($v);
+ }
+
+ function &MetaIndexes($table,$primary=false)
+ {
+ $table = $this->qstr($table);
+
+ $sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
+ CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+ CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+ FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+ INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
+ INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+ WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
+ ORDER BY O.name, I.Name, K.keyno";
+
+ global $ADODB_FETCH_MODE;
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ if ($this->fetchMode !== FALSE) {
+ $savem = $this->SetFetchMode(FALSE);
+ }
+
+ $rs = $this->Execute($sql);
+ if (isset($savem)) {
+ $this->SetFetchMode($savem);
+ }
+ $ADODB_FETCH_MODE = $save;
+
+ if (!is_object($rs)) {
+ return FALSE;
+ }
+
+ $indexes = array();
+ while ($row = $rs->FetchRow()) {
+ if (!$primary && $row[5]) continue;
+
+ $indexes[$row[0]]['unique'] = $row[6];
+ $indexes[$row[0]]['columns'][] = $row[1];
+ }
+ return $indexes;
+ }
+
+ function MetaForeignKeys($table, $owner=false, $upper=false)
+ {
+ global $ADODB_FETCH_MODE;
+
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ $table = $this->qstr(strtoupper($table));
+
+ $sql =
+ "select object_name(constid) as constraint_name,
+ col_name(fkeyid, fkey) as column_name,
+ object_name(rkeyid) as referenced_table_name,
+ col_name(rkeyid, rkey) as referenced_column_name
+ from sysforeignkeys
+ where upper(object_name(fkeyid)) = $table
+ order by constraint_name, referenced_table_name, keyno";
+
+ $constraints =& $this->GetArray($sql);
+
+ $ADODB_FETCH_MODE = $save;
+
+ $arr = false;
+ foreach($constraints as $constr) {
+ //print_r($constr);
+ $arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
+ }
+ if (!$arr) return false;
+
+ $arr2 = false;
+
+ foreach($arr as $k => $v) {
+ foreach($v as $a => $b) {
+ if ($upper) $a = strtoupper($a);
+ $arr2[$a] = $b;
+ }
+ }
+ return $arr2;
+ }
+
+ //From: Fernando Moreira <FMo...@im...>
+ function MetaDatabases()
+ {
+ $this->SelectDB("master");
+ $rs =& $this->Execute($this->metaDatabasesSQL);
+ $rows = $rs->GetRows();
+ $ret = array();
+ for($i=0;$i<count($rows);$i++) {
+ $ret[] = $rows[$i][0];
+ }
+ $this->SelectDB($this->database);
+ if($ret)
+ return $ret;
+ else
+ return false;
+ }
+
+ // "Stein-Aksel Basma" <ba...@ac...>
+ // tested with MSSQL 2000
+ function &MetaPrimaryKeys($table)
+ {
+ global $ADODB_FETCH_MODE;
+
+ $schema = '';
+ $this->_findschema($table,$schema);
+ if (!$schema) $schema = $this->database;
+ if ($schema) $schema = "and k.table_catalog like '$schema%'";
+
+ $sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
+ information_schema.table_constraints tc
+ where tc.constraint_name = k.constraint_name and tc.constraint_type =
+ 'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
+
+ $savem = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ $a = $this->GetCol($sql);
+ $ADODB_FETCH_MODE = $savem;
+
+ if ($a && sizeof($a)>0) return $a;
+ $false = false;
+ return $false;
+ }
+
+
+ function &MetaTables($ttype=false,$showSchema=false,$mask=false)
+ {
+ if ($mask) {
+ $save = $this->metaTablesSQL;
+ $mask = $this->qstr(($mask));
+ $this->metaTablesSQL .= " AND name like $mask";
+ }
+ $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+
+ if ($mask) {
+ $this->metaTablesSQL = $save;
+ }
+ return $ret;
+ }
+}
+
+/*--------------------------------------------------------------------------------------
+ Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_mssqlnative extends ADORecordSet {
+
+ var $databaseType = "mssqlnative";
+ var $canSeek = false;
+ var $fieldOffset = 0;
+ // _mths works only in non-localised system
+
+ function ADORecordset_mssqlnative($id,$mode=false)
+ {
+ if ($mode === false) {
+ global $ADODB_FETCH_MODE;
+ $mode = $ADODB_FETCH_MODE;
+
+ }
+ $this->fetchMode = $mode;
+ return $this->ADORecordSet($id,$mode);
+ }
+
+
+ function _initrs()
+ {
+ global $ADODB_COUNTRECS;
+ if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+ /*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
+ error_log("rowsaff: ".serialize($retRowsAff));
+ $this->_numOfRows = ($ADODB_COUNTRECS)? $retRowsAff:-1;*/
+ $this->_numOfRows = -1;//not supported
+ $fieldmeta = sqlsrv_field_metadata($this->_queryID);
+ $this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
+ if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+ }
+
+
+ //Contributed by "Sven Axelsson" <sve...@bo...>
+ // get next resultset - requires PHP 4.0.5 or later
+ function NextRecordSet()
+ {
+ if (!sqlsrv_next_result($this->_queryID)) return false;
+ $this->_inited = false;
+ $this->bind = false;
+ $this->_currentRow = -1;
+ $this->Init();
+ return true;
+ }
+
+ /* Use associative array to get fields array */
+ function Fields($colname)
+ {
+ if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
+ if (!$this->bind) {
+ $this->bind = array();
+ for ($i=0; $i < $this->_numOfFields; $i++) {
+ $o = $this->FetchField($i);
+ $this->bind[strtoupper($o->name)] = $i;
+ }
+ }
+
+ return $this->fields[$this->bind[strtoupper($colname)]];
+ }
+
+ /* Returns: an object containing field information.
+ Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+ fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+ fetchField() is retrieved. */
+
+ function &FetchField($fieldOffset = -1)
+ {
+ if ($this->connection->debug) error_log("<hr>fetchfield: $fieldOffset, fetch array: <pre>".print_r($this->fields,true)."</pre> backtrace: ".adodb_backtrace(false));
+ if ($fieldOffset != -1) $this->fieldOffset = $fieldOffset;
+ $arrKeys = array_keys($this->fields);
+ if(array_key_exists($this->fieldOffset,$arrKeys) && !array_key_exists($arrKeys[$this->fieldOffset],$this->fields)) {
+ $f = false;
+ } else {
+ $f = $this->fields[ $arrKeys[$this->fieldOffset] ];
+ if($fieldOffset == -1) $this->fieldOffset++;
+ }
+
+ if (empty($f)) {
+ $f = false;//PHP Notice: Only variable references should be returned by reference
+ }
+ return $f;
+ }
+
+ function _seek($row)
+ {
+ return false;//There is no support for cursors in the driver at this time. All data is returned via forward-only streams.
+ }
+
+ // speedup
+ function MoveNext()
+ {
+ if ($this->connection->debug) error_log("movenext()");
+ //if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
+ if ($this->EOF) return false;
+
+ $this->_currentRow++;
+ if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
+
+ if ($this->_fetch()) return true;
+ $this->EOF = true;
+ //if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
+
+ return false;
+ }
+
+
+ // INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
+ // also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
+ function _fetch($ignore_fields=false)
+ {
+ if ($this->connection->debug) error_log("_fetch()");
+ if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+ if ($this->fetchMode & ADODB_FETCH_NUM) {
+ if ($this->connection->debug) error_log("fetch mode: both");
+ $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
+ } else {
+ if ($this->connection->debug) error_log("fetch mode: assoc");
+ $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
+ }
+
+ if (ADODB_ASSOC_CASE == 0) {
+ foreach($this->fields as $k=>$v) {
+ $this->fields[strtolower($k)] = $v;
+ }
+ } else if (ADODB_ASSOC_CASE == 1) {
+ foreach($this->fields as $k=>$v) {
+ $this->fields[strtoupper($k)] = $v;
+ }
+ }
+ } else {
+ if ($this->connection->debug) error_log("fetch mode: num");
+ $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
+ }
+ if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based
+ $arrFixed = array();
+ foreach($this->fields as $key=>$value) {
+ if(is_numeric($key)) {
+ $arrFixed[$key-1] = $value;
+ } else {
+ $arrFixed[$key] = $value;
+ }
+ }
+ //if($this->connection->debug) error_log("<hr>fixing non 0 based return array, old: ".print_r($this->fields,true)." new: ".print_r($arrFixed,true));
+ $this->fields = $arrFixed;
+ }
+ if(is_array($this->fields)) {
+ foreach($this->fields as $key=>$value) {
+ if (is_object($value) && method_exists($value, 'format')) {//is DateTime object
+ $this->fields[$key] = $value->format("Y-m-d\TH:i:s\Z");
+ }
+ }
+ }
+ if($this->fields === null) $this->fields = false;
+ if ($this->connection->debug) error_log("<hr>after _fetch, fields: <pre>".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
+ return $this->fields;
+ }
+
+ /* close() only needs to be called if you are worried about using too much memory while your script
+ is running. All associated result memory for the specified result identifier will automatically be freed. */
+ function _close()
+ {
+ $rez = sqlsrv_free_stmt($this->_queryID);
+ $this->_queryID = false;
+ return $rez;
+ }
+
+ // mssql uses a default date like Dec 30 2000 12:00AM
+ function UnixDate($v)
+ {
+ return ADORecordSet_array_mssqlnative::UnixDate($v);
+ }
+
+ function UnixTimeStamp($v)
+ {
+ return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
+ }
+}
+
+
+class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
+ function ADORecordSet_array_mssqlnative($id=-1,$mode=false)
+ {
+ $this->ADORecordSet_array($id,$mode);
+ }
+
+ // mssql uses a default date like Dec 30 2000 12:00AM
+ function UnixDate($v)
+ {
+
+ if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+
+ global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+
+ //Dec 30 2000 12:00AM
+ if ($ADODB_mssql_date_order == 'dmy') {
+ if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+ return parent::UnixDate($v);
+ }
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[1];
+ $themth = substr(strtoupper($rr[2]),0,3);
+ } else {
+ if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+ return parent::UnixDate($v);
+ }
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[2];
+ $themth = substr(strtoupper($rr[1]),0,3);
+ }
+ $themth = $ADODB_mssql_mths[$themth];
+ if ($themth <= 0) return false;
+ // h-m-s-MM-DD-YY
+ return mktime(0,0,0,$themth,$theday,$rr[3]);
+ }
+
+ function UnixTimeStamp($v)
+ {
+
+ if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+
+ global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+
+ //Dec 30 2000 12:00AM
+ if ($ADODB_mssql_date_order == 'dmy') {
+ if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+ ,$v, $rr)) return parent::UnixTimeStamp($v);
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[1];
+ $themth = substr(strtoupper($rr[2]),0,3);
+ } else {
+ if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+ ,$v, $rr)) return parent::UnixTimeStamp($v);
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[2];
+ $themth = substr(strtoupper($rr[1]),0,3);
+ }
+
+ $themth = $ADODB_mssql_mths[$themth];
+ if ($themth <= 0) return false;
+
+ switch (strtoupper($rr[6])) {
+ case 'P':
+ if ($rr[4]<12) $rr[4] += 12;
+ break;
+ case 'A':
+ if ($rr[4]==12) $rr[4] = 0;
+ break;
+ default:
+ break;
+ }
+ // h-m-s-MM-DD-YY
+ return mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+ }
+}
+
+/*
+Code Example 1:
+
+select object_name(constid) as constraint_name,
+ object_name(fkeyid) as table_name,
+ col_name(fkeyid, fkey) as column_name,
+ object_name(rkeyid) as referenced_table_name,
+ col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where object_name(fkeyid) = x
+order by constraint_name, table_name, referenced_table_name, keyno
+
+Code Example 2:
+select constraint_name,
+ column_name,
+ ordinal_position
+from information_schema.key_column_usage
+where constraint_catalog = db_name()
+and table_name = x
+order by constraint_name, ordinal_position
+
+http://www.databasejournal.com/scripts/article.php/1440551
+*/
+
+?>
\ No newline at end of file
Added: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php (rev 0)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2010-06-07 14:05:29 UTC (rev 7485)
@@ -0,0 +1,249 @@
+<?php // -*-php-*-
+// rcs_id('$Id: ADODB_mssql.php,v 1.2 2005/10/10 19:42:15 rurban Exp $');
+
+/**
+ * MS SQL extensions for the ADODB DB backend.
+ */
+require_once('lib/WikiDB/backend/ADODB.php');
+
+class WikiDB_backend_ADODB_mssqlnative
+extends WikiDB_backend_ADODB
+{
+ /**
+ * Constructor.
+ */
+ function WikiDB_backend_ADODB_mssqlnative($dbparams) {
+ // Lowercase Assoc arrays
+ define('ADODB_ASSOC_CASE',0);
+
+ // Backend constructor
+ $this->WikiDB_backend_ADODB($dbparams);
+
+ // Empty strings in MSSQL? NULLS?
+ $this->_expressions['notempty'] = "NOT LIKE ''";
+ //doesn't work if content is of the "text" type http://msdn2.microsoft.com/en-us/library/ms188074.aspx
+ $this->_expressions['iscontent'] = "dbo.hasContent({$this->_table_names['version_tbl']}.content)";
+
+ $this->_prefix = isset($dbparams['prefix']) ? $dbparams['prefix'] : '';
+
+ }
+
+ /**
+ * Pack tables.
+ */
+ function optimize() {
+ // Do nothing here -- Leave that for the DB
+ // Cost Based Optimizer tuning vary from version to version
+ return 1;
+ }
+
+ // Search callabcks
+ // Page name
+ function _sql_match_clause($word) {
+ $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);
+ $word = $this->_dbh->qstr("%$word%");
+ return "LOWER(pagename) LIKE $word";
+ }
+
+ // Fulltext -- case sensitive :-\
+ function _fullsearch_sql_match_clause($word) {
+ $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);
+ $wordq = $this->_dbh->qstr("%$word%");
+ return "LOWER(pagename) LIKE $wordq "
+ . "OR CHARINDEX(content, '$word') > 0";
+ }
+
+ /**
+ * Serialize data
+ */
+ function _serialize($data) {
+ if (empty($data))
+ return '';
+ assert(is_array($data));
+ return addslashes(serialize($data));
+ }
+
+ /**
+ * Unserialize data
+ */
+ function _unserialize($data) {
+ return empty($data) ? array() : unserialize(stripslashes($data));
+ }
+
+ /*
+ * Update link table.
+ * on DEBUG: delete old, deleted links from page
+ */
+ function set_links($pagename, $links) {
+ // FIXME: optimize: mysql can do this all in one big INSERT/REPLACE.
+
+ $dbh = &$this->_dbh;
+ extract($this->_table_names);
+
+ $this->lock(array('link'));
+ $pageid = $this->_get_pageid($pagename, true);
+
+ $oldlinks = $dbh->getAssoc("SELECT $link_tbl.linkto as id, page.pagename FROM $link_tbl"
+ ." JOIN page ON ($link_tbl.linkto = page.id)"
+ ." WHERE linkfrom=$pageid");
+ // Delete current links,
+ $dbh->Execute("DELETE FROM $link_tbl WHERE linkfrom=$pageid");
+ // and insert new links. Faster than checking for all single links
+ if ($links) {
+ foreach ($links as $link) {
+ $linkto = $link['linkto'];
+ if ($link['relation'])
+ $relation = $this->_get_pageid($link['relation'], true);
+ else
+ $relation = 0;
+ if ($linkto === "") { // ignore attributes
+ continue;
+ }
+ // avoid duplicates
+ if (isset($linkseen[$linkto]) and !$relation) {
+ continue;
+ }
+ if (!$relation) {
+ $linkseen[$linkto] = true;
+ }
+ $linkid = $this->_get_pageid($linkto, true);
+ assert($linkid);
+ if ($relation) {
+ $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
+ . " VALUES ($pageid, $linkid, $relation)");
+ } else {
+ $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)"
+ . " VALUES ($pageid, $linkid)");
+ }
+ if ($oldlinks and array_key_exists($linkid, $oldlinks)) {
+ // This was also in the previous page
+ unset($oldlinks[$linkid]);
+ }
+ }
+ }
+ // purge page table: delete all non-referenced pages
+ // for all previously linked pages, which have no other linkto links
+ if (DEBUG and $oldlinks) {
+ // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
+ foreach ($oldlinks as $id => $name) {
+ // ...check if the page is empty and has no version
+ if($id != '') {
+ $result = $dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
+ . " LEFT JOIN $nonempty_tbl ON ($nonempty_tbl.id = $page_tbl.id)"//'"id" is not a recognized table hints option'
+ . " LEFT JOIN $version_tbl ON ($version_tbl.id = $page_tbl.id)"//'"id" is not a recognized table hints option'
+ . " WHERE $nonempty_tbl.id is NULL"
+ . " AND $version_tbl.id is NULL"
+ . " AND $page_tbl.id=$id");
+ $linkto = $dbh->getRow("SELECT linkfrom FROM $link_tbl WHERE linkto=$id");
+ if ($result and empty($linkto)) {
+ trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
+ $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
+ $dbh->Execute("DELETE FROM $link_tbl WHERE linkto=$id");
+ $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
+ }
+ }
+ }
+ }
+ $this->unlock(array('link'));
+ return true;
+ }
+
+ /* get all oldlinks in hash => id, relation
+ check for all new links
+ */
+ function set_links1($pagename, $links) {
+
+ $dbh = &$this->_dbh;
+ extract($this->_table_names);
+
+ $this->lock(array('link'));
+ $pageid = $this->_get_pageid($pagename, true);
+
+ $oldlinks = $dbh->getAssoc("SELECT $link_tbl.linkto as linkto, $link_tbl.relation, page.pagename"
+ ." FROM $link_tbl"
+ ." JOIN page ON ($link_tbl.linkto = page.id)"
+ ." WHERE linkfrom=$pageid");
+ /* old new
+ * X => [1,0 2,0 1,1] X => [1,1 3,0]
+ * => delete 1,0 2,0 + insert 3,0
+ */
+ if ($links) {
+ foreach ($links as $link) {
+ $linkto = $link['linkto'];
+ if ($link['relation'])
+ $relation = $this->_get_pageid($link['relation'], true);
+ else
+ $relation = 0;
+ // avoid duplicates
+ if (isset($linkseen[$linkto]) and !$relation) {
+ continue;
+ }
+ if (!$relation) {
+ $linkseen[$linkto] = true;
+ }
+ $linkid = $this->_get_pageid($linkto, true);
+ assert($linkid);
+ $skip = 0;
+ // find linkfrom,linkto,relation triple in oldlinks
+ foreach ($oldlinks as $l) {
+ if ($relation) { // relation NOT NULL
+ if ($l['linkto'] == $linkid and $l['relation'] == $relation) {
+ // found and skip
+ $skip = 1;
+ }
+ }
+ }
+ if (! $skip ) {
+ if ($update) {
+ }
+ if ($relation) {
+ $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
+ . " VALUES ($pageid, $linkid, $relation)");
+ } else {
+ $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)"
+ . " VALUES ($pageid, $linkid)");
+ }
+ }
+
+ if (array_key_exists($linkid, $oldlinks)) {
+ // This was also in the previous page
+ unset($oldlinks[$linkid]);
+ }
+ }
+ }
+ // purge page table: delete all non-referenced pages
+ // for all previously linked pages...
+ if (DEBUG and $oldlinks) {
+ // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
+ foreach ($oldlinks as $id => $name) {
+ // ...check if the page is empty and has no version
+ if($id != '') {
+ if ($dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
+ . " LEFT JOIN $nonempty_tbl ON ($nonempty_tbl.id = $page_tbl.id)"//'"id" is not a recognized table hints option'
+ . " LEFT JOIN $version_tbl ON ($version_tbl.id = $page_tbl.id)"//'"id" is not a recognized table hints option'
+ . " WHERE $nonempty_tbl.id is NULL"
+ . " AND $version_tbl.id is NULL"
+ . " AND $page_tbl.id=$id"))
+ {
+ trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
+ $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
+ $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
+ }
+ }
+ }
+ }
+ $this->unlock(array('link'));
+ return true;
+ }
+
+};
+
+// (c-file-style: "gnu")
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
Added: trunk/schemas/sqlsrv-destroy.sql
===================================================================
--- trunk/schemas/sqlsrv-destroy.sql (rev 0)
+++ trunk/schemas/sqlsrv-destroy.sql 2010-06-07 14:05:29 UTC (rev 7485)
@@ -0,0 +1,17 @@
+-- $Id: mssql-destroy.sql,v 1.3 2005/09/28 19:27:23 rurban Exp $
+
+DROP TABLE page;
+DROP TABLE version;
+DROP TABLE recent;
+DROP TABLE nonempty;
+DROP TABLE link;
+DROP TABLE session;
+
+DROP TABLE pref;
+--DROP TABLE user;
+DROP TABLE member;
+
+-- wikilens theme
+DROP TABLE rating;
+
+DROP TABLE accesslog;
Added: trunk/schemas/sqlsrv-initialize.sql
===================================================================
--- trunk/schemas/sqlsrv-initialize.sql (rev 0)
+++ trunk/schemas/sqlsrv-initialize.sql 2010-06-07 14:05:29 UTC (rev 7485)
@@ -0,0 +1,144 @@
+-- $Id: sqlsrv-initialize.sql,v 1.5 2006/12/08 08:04:10 rurban Exp $
+-- UNTESTED!
+
+-- the CREATE FUNCTION section must be run as a seperate query. cut/paste run before executing the remainder
+-- of the contents of this file
+CREATE FUNCTION hasContent
+ (@ContentField varchar(max))
+RETURNS bit
+AS
+BEGIN
+
+IF @ContentField NOT LIKE ''
+ RETURN 1
+RETURN 0
+
+END
+-- end seperate section
+
+
+CREATE TABLE page (
+ id INT NOT NULL ,
+ pagename VARCHAR(100) NOT NULL,
+ hits INT NOT NULL DEFAULT 0,
+ pagedata TEXT NOT NULL DEFAULT '',
+ cached_html TEXT NOT NULL DEFAULT '', -- added with 1.3.11
+ PRIMARY KEY (id),
+ UNIQUE (pagename)
+);
+--SET IDENTITY_INSERT page ON;
+
+CREATE TABLE version (
+ id INT NOT NULL,
+ version INT NOT NULL,
+ mtime INT NOT NULL,
+ minor_edit TINYINT DEFAULT 0,
+ content varchar(max) NOT NULL DEFAULT '',--can't be text
+ versiondata TEXT NOT NULL DEFAULT '',
+ PRIMARY KEY (id,version)
+);
+CREATE INDEX version_mtime ON version (mtime);
+
+CREATE TABLE recent (
+ id INT NOT NULL,
+ latestversion INT,
+ latestmajor INT,
+ latestminor INT,
+ PRIMARY KEY (id)
+);
+
+CREATE TABLE nonempty (
+ id INT NOT NULL,
+ PRIMARY KEY (id)
+);
+
+CREATE TABLE link (
+ linkfrom INT NOT NULL,
+ linkto INT NOT NULL,
+ relation INT
+);
+CREATE INDEX linkfrom ON link (linkfrom);
+CREATE INDEX linkto ON link (linkto);
+
+CREATE TABLE session (
+ sess_id CHAR(32) NOT NULL DEFAULT '',
+ sess_data IMAGE NOT NULL,
+ sess_date BIGINT NOT NULL,
+ sess_ip CHAR(40) NOT NULL,
+ PRIMARY KEY (sess_id)
+);
+CREATE INDEX sessdate_index ON session (sess_date);
+CREATE INDEX sessip_index ON session (sess_ip);
+
+-- Optional DB Auth and Prefs
+-- For these tables below the default table prefix must be used
+-- in the DBAuthParam SQL statements also.
+
+CREATE TABLE pref (
+ userid CHAR(48) NOT NULL,
+ prefs TEXT NULL DEFAULT '',
+ passwd CHAR(48) DEFAULT '',
+ groupname CHAR(48) DEFAULT 'users',
+ PRIMARY KEY (userid)
+);
+
+-- update to 1.3.12: (see lib/upgrade.php)
+-- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT '';
+-- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users';
+
+-- deprecated since 1.3.12. only useful for seperate databases.
+-- better use the extra pref table where such users can be created easily
+-- without password.
+--CREATE TABLE user (
+-- userid CHAR(48) NOT NULL,
+-- passwd CHAR(48) DEFAULT '',
+-- prefs TEXT NULL DEFAULT '',
+-- groupname CHAR(48) DEFAULT 'users'
+--);
+
+-- Use the member table, if you need it for n:m user-group relations,
+-- and adjust your DBAUTH_AUTH_ SQL statements.
+CREATE TABLE member (
+ userid CHAR(48) NOT NULL,
+ groupname CHAR(48) NOT NULL DEFAULT 'users'
+);
+CREATE INDEX member_userid ON member (userid);
+CREATE INDEX member_groupname ON member (groupname);
+
+-- only if you plan to use the wikilens theme
+CREATE TABLE rating (
+ dimension smallINT NOT NULL,
+ raterpage INT NOT NULL,
+ rateepage INT NOT NULL,
+ ratingvalue FLOAT NOT NULL,
+ rateeversion INT NOT NULL,
+ tstamp bigint NOT NULL,
+ PRIMARY KEY (dimension, raterpage, rateepage)
+);
+CREATE INDEX rating_dimension ON rating (dimension);
+CREATE INDEX rating_raterpage ON rating (raterpage);
+CREATE INDEX rating_rateepage ON rating (rateepage);
+
+-- if ACCESS_LOG_SQL > 0
+-- only if you need fast log-analysis (spam prevention, recent referrers)
+-- see http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
+CREATE TABLE accesslog (
+ time_stamp BIGINT,
+ remote_host VARCHAR(255),
+ remote_user VARCHAR(50),
+ request_method VARCHAR(10),
+ request_line text,
+ request_args text,
+ request_file text,
+ request_uri text,
+ request_time CHAR(28),
+ status INT,
+ bytes_sent INT,
+ referer text,
+ agent text,
+ request_duration FLOAT
+);
+CREATE INDEX log_time ON accesslog (time_stamp);
+CREATE INDEX log_host ON accesslog (remote_host);
+-- create extra indices on demand (usually referer. see plugin/AccessLogSql)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-09 10:34:13
|
Revision: 7508
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7508&view=rev
Author: rurban
Date: 2010-06-09 10:34:03 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
move lib/updateinterwikimap shell script to admin
index.php: gforge should symlink or copy the config, as everybody else
update TODO
Modified Paths:
--------------
trunk/TODO
trunk/favicon.ico
trunk/index.php
trunk/tests/unit/lib/SetupWiki.php
Added Paths:
-----------
trunk/admin/updateinterwikimap
Removed Paths:
-------------
trunk/lib/updateinterwikimap
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/TODO 2010-06-09 10:34:03 UTC (rev 7508)
@@ -1,32 +1,20 @@
-1.3.15 2009-06-05 rurban:
-* finish new themes/Sidebar
-* check new mass rename
-* check for AJAX format=xml errors
-* beautify result of empty AJAX format=xml pages.
- no bordered div, which looks like <HR>
-
short-term TODO:
* rename should check existing subpages and rename these also.
* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
box states) with Sidebar
* clarify issues with pagenames: "," breaks PageList. Escape with "~" or "\"?
+ or htmlencode forbidden chars.
* fix Wikiwys with prettyurl, link labels and killing plugin args
-* ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
-* WikiUser/OpenID (from DokuWiki) - Status::in_work
-* more meta stuff: OpenSearch, format=dc (Dublin Core)
-* support missing REST interfaces (optional): action=remove => DELETE,
- action=editpage and minor updates (rating,...) => PUT.
- with fallbacks to POST
-* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
- See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
-* format=printable (?) for non js/dom
* WatchList (?)
-* Spellcheck AJAX backend (see DokuWiki)
-* GeSHi Highlighter plugin
-TODO for 1.4.0:
+TODO:
architecture:
+* flush <head> before <body> to parallelize css/js requests
* Optimization: try template_lite or try simple regex replacements as before.
+* Evaluate some xml syntax for plugins (as in MediaWiki):
+ <IncludePages pages=<plugin-list BackLinks/> />
+ <BackLink include_self=false />
+4 And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
* Fix postgresql stored procedures.
* Move serialized data from page_data / version_data to seperate SQL columns.
* WikiDB hooks. (?)
@@ -47,6 +35,16 @@
* lang: mapping
* fix ENABLE_MARKUP_DIVSPAN
* WikiUser/EMailConfirm (?)
+* ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
+* WikiUser/OpenID (from DokuWiki) - Status::in_work
+* more meta stuff: OpenSearch, format=dc (Dublin Core)
+* support missing REST interfaces (optional): action=remove => DELETE,
+ action=editpage and minor updates (rating,...) => PUT.
+ with fallbacks to POST
+* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
+ See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
+* Spellcheck AJAX backend (see DokuWiki)
+* GeSHi Highlighter plugin
fixes:
* fix pagelist nopage unification (store just key as names?)
@@ -54,6 +52,7 @@
* SQL textsearch with multiple words: AND
(the two new failing unit tests)
* fix textsearch optimize with "word -word -word"
+* format=printable (?) for non js/dom
OLDER TODO's:
Maybe (probably defer):
Copied: trunk/admin/updateinterwikimap (from rev 7497, trunk/lib/updateinterwikimap)
===================================================================
--- trunk/admin/updateinterwikimap (rev 0)
+++ trunk/admin/updateinterwikimap 2010-06-09 10:34:03 UTC (rev 7508)
@@ -0,0 +1,37 @@
+#!/bin/sh
+# cd lib
+# ../admin/updateinterwikimap
+currentfile=interwiki.map
+backupfile=/tmp/${currentfile}.bak
+downloadfile=/tmp/intermap.txt
+newfile=/tmp/${currentfile}
+tempfile=/tmp/intermap.tmp
+
+echo "Downloading latest InterWikiMap from PhpWiki SVN"
+svns up ${currentfile}
+
+echo "Downloading latest InterWikiMap from Usemod"
+curl http://usemod.com/intermap.txt -o ${downloadfile}
+
+echo "Backing up current ${currentfile} to ${backupfile}"
+cp -p ${currentfile} ${backupfile}
+
+echo "merging ${downloadfile} with installed ${currentfile}"
+cat ${downloadfile} > ${tempfile}
+cat ${backupfile} >> ${tempfile}
+cat ${tempfile} | sort -f | uniq > ${newfile}
+
+echo "Installing updated InterWikiMap"
+install -m 0644 ${newfile} ${currentfile}
+rm ${downloadfile} ${tempfile} ${newfile}
+
+echo "The following new InterWikiMap entries were found:"
+diff -u0 ${backupfile} ${currentfile}
+
+echo "Comparing with PhpWiki SVN:"
+svn diff ${currentfile}
+
+echo "*** You must check ${currentfile} for duplicates or other problems. ***"
+echo "*** The backup file is: ${backupfile}. ***"
+
+echo "Done."
Modified: trunk/favicon.ico
===================================================================
(Binary files differ)
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/index.php 2010-06-09 10:34:03 UTC (rev 7508)
@@ -30,14 +30,10 @@
*/
require_once (dirname(__FILE__).'/lib/prepend.php');
-// rcs_id('$Id$');
+//rcs_id('$Id$');
require_once(dirname(__FILE__).'/lib/IniConfig.php');
-if (!defined('GFORGE') or !GFORGE) {
- IniConfig(dirname(__FILE__)."/config/config.ini");
-} else {
- IniConfig(dirname(__FILE__)."/config/config-default.ini");
-}
+IniConfig(dirname(__FILE__)."/config/config.ini");
////////////////////////////////////////////////////////////////
// PrettyWiki
Deleted: trunk/lib/updateinterwikimap
===================================================================
--- trunk/lib/updateinterwikimap 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/lib/updateinterwikimap 2010-06-09 10:34:03 UTC (rev 7508)
@@ -1,36 +0,0 @@
-#!/bin/sh
-# updateinterwikimap
-currentfile=interwiki.map
-backupfile=/tmp/${currentfile}.bak
-downloadfile=/tmp/intermap.txt
-newfile=/tmp/${currentfile}
-tempfile=/tmp/intermap.tmp
-
-echo "Downloading latest InterWikiMap from PhpWiki CVS"
-cvs up ${currentfile}
-
-echo "Downloading latest InterWikiMap from Usemod"
-curl http://usemod.com/intermap.txt -o ${downloadfile}
-
-echo "Backing up current ${currentfile} to ${backupfile}"
-cp -p ${currentfile} ${backupfile}
-
-echo "merging ${downloadfile} with installed ${currentfile}"
-cat ${downloadfile} > ${tempfile}
-cat ${backupfile} >> ${tempfile}
-cat ${tempfile} | sort -f | uniq > ${newfile}
-
-echo "Installing updated InterWikiMap"
-install -m 0644 ${newfile} ${currentfile}
-rm ${downloadfile} ${tempfile} ${newfile}
-
-echo "The following new InterWikiMap entries were found:"
-diff -u0 ${backupfile} ${currentfile}
-
-echo "Comparing with PhpWiki CVS:"
-cvs diff ${currentfile}
-
-echo "*** You must check ${currentfile} for duplicates or other problems. ***"
-echo "*** The backup file is: ${backupfile}. ***"
-
-echo "Done."
Modified: trunk/tests/unit/lib/SetupWiki.php
===================================================================
--- trunk/tests/unit/lib/SetupWiki.php 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/tests/unit/lib/SetupWiki.php 2010-06-09 10:34:03 UTC (rev 7508)
@@ -22,9 +22,11 @@
}
/* PCRE memory problem (crash) with such big pages and anchored blocks */
+ /*
+ // Broken since r.7418
function testOldMarkupTestPage() {
$this->_loadPage('Help/OldMarkupTestPage');
- }
+ }*/
/* ADODB set_links _id_cache error: IncludePagePlugin => HomePage */
function testIncludePagePlugin() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-10 06:35:46
|
Revision: 7515
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7515&view=rev
Author: rurban
Date: 2010-06-10 06:35:40 +0000 (Thu, 10 Jun 2010)
Log Message:
-----------
new default theme = Sidebar
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2010-06-10 06:35:13 UTC (rev 7514)
+++ trunk/config/config-default.ini 2010-06-10 06:35:40 UTC (rev 7515)
@@ -126,7 +126,7 @@
ALLOW_LDAP_LOGIN = false
ALLOW_IMAP_LOGIN = false
-THEME = default
+THEME = Sidebar
; DEFAULT_LANGUAGE =
CHARSET = utf-8
WIKI_PGSRC = pgsrc
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2010-06-10 06:35:13 UTC (rev 7514)
+++ trunk/config/config-dist.ini 2010-06-10 06:35:40 UTC (rev 7515)
@@ -870,8 +870,11 @@
;
; The complete list of installed themes can be found by doing 'ls themes/'
; from the root of your PHPWiki installation.
+;
; white on yellow with fat blue links:
-THEME = default
+;THEME = default
+; a MonoBook extension, the new default
+THEME = Sidebar
; almost fully iconized classic grey MacOSX design:
;THEME = MacOSX
; as default, just some tricks to make the buttons smaller:
@@ -882,8 +885,6 @@
;THEME = Wordpress
; pure old-style c2wiki layout:
;THEME = Portland
-; example with some sidebar boxes:
-;THEME = Sidebar
; mozilla friendly, with lots of icons instead of buttons (i18n friendly):
;THEME = Crao
; default + rateit navbar:
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2010-06-10 06:35:13 UTC (rev 7514)
+++ trunk/configurator.php 2010-06-10 06:35:40 UTC (rev 7515)
@@ -1267,26 +1267,21 @@
subdirectory.
There are a number of pre-defined themes shipped with PhpWiki.
-Or you may create your own, e.g. by copying and then modifying one of
-stock themes.
+Or you may create your own, deriving from existing ones.
<pre>
+ THEME = Sidebar (default)
THEME = default
THEME = MacOSX
THEME = MonoBook (WikiPedia)
THEME = smaller
THEME = Wordpress
THEME = Portland
- THEME = Sidebar
THEME = Crao
THEME = wikilens (with Ratings)
THEME = Hawaiian
THEME = SpaceWiki
THEME = Hawaiian
-</pre>
-
-Problems:
-<pre>
- THEME = blog (Kubrick) [experimental. Several links missing]
+ THEME = blog (Kubrick) [experimental]
</pre>");
$properties["Character Set"] =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-23 13:12:30
|
Revision: 7555
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7555&view=rev
Author: rurban
Date: 2010-06-23 13:12:23 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
add wikilens to theme search path, and not double
Modified Paths:
--------------
trunk/lib/plugin/RateIt.php
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Sidebar/themeinfo.php
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2010-06-21 08:56:10 UTC (rev 7554)
+++ trunk/lib/plugin/RateIt.php 2010-06-23 13:12:23 UTC (rev 7555)
@@ -138,6 +138,9 @@
function head() { // early side-effects (before body)
global $WikiTheme;
+ static $_already;
+ if (!empty($_already)) return;
+ $_already = 1;
$WikiTheme->addMoreHeaders(JavaScript(
"var prediction = new Array; var rating = new Array;
var avg = new Array; var numusers = new Array;
Modified: trunk/themes/Sidebar/templates/top.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/top.tmpl 2010-06-21 08:56:10 UTC (rev 7554)
+++ trunk/themes/Sidebar/templates/top.tmpl 2010-06-23 13:12:23 UTC (rev 7555)
@@ -1,6 +1,13 @@
<?php // -*-php-*-
// rcs_id('$Id$');
-if (ENABLE_RATEIT && !empty($user) && $user->isAuthenticated() && $page->exists())
+$pagename = $page->getName();
+$isActionPage = isActionPage($pagename);
+if (ENABLE_PAGE_PUBLIC)
+ $public = $page->get('public');
+else
+ $public = false;
+if (ENABLE_RATEIT && !empty($user) && $user->isAuthenticated()
+ && $page->exists() && !$isActionPage && !$WikiTheme->DUMP_MODE)
$rating = 1;
else
$rating = 0;
@@ -8,7 +15,7 @@
<!-- Page title -->
<a name="top" id="contentTop"></a>
<?php if ($page->_pagename != "HomePage") { ?>
-<h1 class="firstHeading<?= $rating ? '-rating' : '' ?>"><?= $HEADER ?></h1>
+<h1 class="firstHeading<?= $rating ? '-rating' : '' ?><?= $public ? '-public' : '' ?>"><?= $HEADER ?></h1>
<?php } ?>
<?php if ($rating && $request->getArg('action') == 'browse') { ?>
<?= Template('ratings') ?>
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2010-06-21 08:56:10 UTC (rev 7554)
+++ trunk/themes/Sidebar/themeinfo.php 2010-06-23 13:12:23 UTC (rev 7555)
@@ -154,7 +154,7 @@
* WikiWords can automatically be split by inserting spaces between
* the words. The default is to leave WordsSmashedTogetherLikeSo.
*/
- $this->setAutosplitWikiWords(true);
+ //$this->setAutosplitWikiWords(true);
/**
* If true (default) show create '?' buttons on not existing pages, even if the
@@ -203,6 +203,9 @@
require_once("lib/wikilens/PageListColumns.php");
//require_once("lib/plugin/RateIt.php");
$plugin = new WikiPlugin_RateIt;
+ // add parent to current theme to find the RateIt images
+ // $WikiTheme->addParent('wikilens', 'noinit');
+ $WikiTheme->_parents[] = new WikiTheme('wikilens', 'noinit');
$plugin->head();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-06-23 19:43:52
|
Revision: 7566
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7566&view=rev
Author: rurban
Date: 2010-06-23 19:43:46 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
undo deletions r7561 and r7563. we need that
Modified Paths:
--------------
trunk/lib/MailNotify.php
trunk/lib/WikiTheme.php
Property Changed:
----------------
trunk/g
trunk/pgsrc/Help%2FGoogleLink
trunk/pgsrc/Help%2FIncludeTreePlugin
trunk/pgsrc/Help%2FInterWiki
trunk/pgsrc/Help%2FPhpWiki
trunk/pgsrc/Help%2FWikiWikiWeb
trunk/themes/default/flowplayer-3.1.4.swf
trunk/themes/default/flowplayer.controls-3.1.4.swf
Property changes on: trunk/g
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2010-06-23 15:43:24 UTC (rev 7565)
+++ trunk/lib/MailNotify.php 2010-06-23 19:43:46 UTC (rev 7566)
@@ -364,6 +364,79 @@
}
}
+ /**
+ * Send mail to user and store the cookie in the db
+ * wikiurl?action=ConfirmEmail&id=bla
+ */
+ function sendEmailConfirmation ($email, $userid) {
+ $id = rand_ascii_readable(16);
+ $wikidb = $GLOBALS['request']->getDbh();
+ $data = $wikidb->get('ConfirmEmail');
+ while(!empty($data[$id])) { // id collision
+ $id = rand_ascii_readable(16);
+ }
+ $subject = _("E-Mail address confirmation");
+ $ip = $request->get('REMOTE_HOST');
+ $expire_date = time() + 7*86400;
+ $content = fmt("Someone, probably you from IP address %s, has registered an
+account \"%s\" with this e-mail address on %s.
+
+To confirm that this account really does belong to you and activate
+e-mail features on %s, open this link in your browser:
+
+%s
+
+If this is *not* you, don't follow the link. This confirmation code
+will expire at %s.",
+ $ip, $userid, WIKI_NAME, WIKI_NAME,
+ WikiURL(HOME_PAGE, array('action' => 'ConfirmEmail',
+ 'id' => $id),
+ true),
+ CTime($expire_date));
+ $this->sendMail($subject, $content, "", true);
+ $data[$id] = array('email' => $email,
+ 'userid' => $userid,
+ 'expire' => $expire_date);
+ $wikidb->set('ConfirmEmail', $data);
+ return '';
+ }
+
+ function checkEmailConfirmation () {
+ global $request;
+ $wikidb = $request->getDbh();
+ $data = $wikidb->get('ConfirmEmail');
+ $id = $request->getArg('id');
+ if (empty($data[$id])) { // id not found
+ return HTML(HTML::h1("Confirm E-mail address"),
+ HTML::h1("Sorry! Wrong URL"));
+ }
+ // upgrade the user
+ $userid = $data['userid'];
+ $email = $data['email'];
+ $u = $request->getUser();
+ if ($u->UserName() == $userid) { // lucky: current user (session)
+ $prefs = $u->getPreferences();
+ $request->_user->_level = WIKIAUTH_USER;
+ $request->_prefs->set('emailVerified', true);
+ } else { // not current user
+ if (ENABLE_USER_NEW) {
+ $u = WikiUser($userid);
+ $u->getPreferences();
+ $prefs = &$u->_prefs;
+ } else {
+ $u = new WikiUser($request, $userid);
+ $prefs = $u->getPreferences();
+ }
+ $u->_level = WIKIAUTH_USER;
+ $request->setUser($u);
+ $request->_prefs->set('emailVerified', true);
+ }
+ unset($data[$id]);
+ $wikidb->set('ConfirmEmail', $data);
+ return HTML(HTML::h1("Confirm E-mail address"),
+ HTML::p("Your e-mail address has now been confirmed."));
+ }
+
function subject_encode ($subject) {
// We need to encode the subject if it contains non-ASCII characters
// The page name may contain non-ASCII characters, as well as
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2010-06-23 15:43:24 UTC (rev 7565)
+++ trunk/lib/WikiTheme.php 2010-06-23 19:43:46 UTC (rev 7566)
@@ -696,6 +696,7 @@
//
////////////////////////////////////////////////////////////////
var $_imageAliases = array();
+ var $_imageAlt = array();
/**
*
@@ -709,6 +710,13 @@
$this->_imageAliases[$alias] = $image_name;
}
+ function addImageAlt ($alias, $alt_text) {
+ $this->_imageAlt[$alias] = $alt_text;
+ }
+ function getImageAlt ($alias) {
+ return $this->_imageAlt[$alias];
+ }
+
function getImageURL ($image) {
$aliases = &$this->_imageAliases;
@@ -1515,6 +1523,11 @@
}
}
+ function calendarLink($date = false) {
+ return $this->calendarBase() . SUBPAGE_SEPARATOR .
+ strftime("%Y-%m-%d", $date ? $date : time());
+ }
+
function calendarBase() {
static $UserCalPageTitle = false;
global $request;
Property changes on: trunk/pgsrc/Help%2FGoogleLink
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/pgsrc/Help%2FIncludeTreePlugin
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/pgsrc/Help%2FInterWiki
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/pgsrc/Help%2FPhpWiki
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/pgsrc/Help%2FWikiWikiWeb
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/themes/default/flowplayer-3.1.4.swf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/themes/default/flowplayer.controls-3.1.4.swf
___________________________________________________________________
Deleted: svn:mergeinfo
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-06-24 14:45:25
|
Revision: 7568
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7568&view=rev
Author: vargenau
Date: 2010-06-24 14:45:19 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
No "language" attribute for <script>
Modified Paths:
--------------
trunk/configurator.php
trunk/lib/nusoap/nusoap.php
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/default/templates/login.tmpl
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/configurator.php 2010-06-24 14:45:19 UTC (rev 7568)
@@ -181,7 +181,7 @@
td.unchangeable-variable-left { border-top: none; background-color: #ffffee; color:inherit; }
-->
</style>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
<!--
function update(accepted, error, value, output) {
var msg = document.getElementById(output);
Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/lib/nusoap/nusoap.php 2010-06-24 14:45:19 UTC (rev 7568)
@@ -2162,7 +2162,7 @@
a:visited { color: #666666; font-weight: bold; }
a:hover { color: cc3300; font-weight: bold; }
</style>
- <script language="JavaScript" type="text/javascript">
+ <script type="text/javascript">
<!--
// POP-UP CAPTIONS...
function lib_bwcheck(){ //Browsercheck (needed)
@@ -4082,4 +4082,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -73,7 +73,7 @@
<label><?= Template('signin', array('FORMNAME' => 'editpage')) ?></label>
</fieldset>
<hr noshade="noshade" />
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
function showOldMarkupRules(show) {
if (document.getElementById) {
@@ -100,7 +100,7 @@
</div>
<?=$HIDDEN_INPUTS?>
</form>
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
if (document.getElementById) {
showOldMarkupRules(document.getElementById('useOldMarkup').checked);
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/Crao/templates/signin.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -17,7 +17,7 @@
<?= fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?>
<?=$SEP?>
</span>
- <script language="JavaScript" type="text/javascript"><!--
+ <script type="text/javascript"><!--
document.write('<input type="hidden" name="auth[logout]" value="0" />');
function SignOut(form) {
var form = document.forms["<?=$FORMNAME?>"];
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -57,7 +57,7 @@
<hr />
<?php } ?>
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
function showOldMarkupRules(show) {
if (document.getElementById) {
@@ -86,7 +86,7 @@
<?=$HIDDEN_INPUTS?>
</form>
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
if (document.getElementById) {
showOldMarkupRules(document.getElementById('useOldMarkup').checked);
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -70,7 +70,7 @@
<hr />
<?php } ?>
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
function showOldMarkupRules(show) {
if (document.getElementById) {
@@ -100,7 +100,7 @@
</form>
</div>
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
if (document.getElementById) {
showOldMarkupRules(document.getElementById('useOldMarkup').checked);
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -20,7 +20,7 @@
<?= fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
<?=$SEP?>
</span>
- <script language="JavaScript" type="text/javascript"><!--
+ <script type="text/javascript"><!--
document.write('<br /><input type="hidden" name="auth[logout]" value="0" />');
function SignOut() {
var form = document.forms["<?=$FORMNAME?>"];
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/default/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -96,7 +96,7 @@
<hr noshade="noshade" />
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
function showOldMarkupRules(show) {
if (document.getElementById) {
@@ -123,7 +123,7 @@
<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
-<script language="JavaScript1.3" type="text/javascript">
+<script type="text/javascript">
<!--
if (document.getElementById) {
showOldMarkupRules(document.getElementById('useOldMarkup').checked);
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl 2010-06-24 06:35:40 UTC (rev 7567)
+++ trunk/themes/default/templates/login.tmpl 2010-06-24 14:45:19 UTC (rev 7568)
@@ -100,7 +100,7 @@
</table>
</form>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
<!-- // Really there's got to be a simpler way to do this....
function select_input (type) {
var elements = document.forms['login'].elements;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-06-24 16:31:14
|
Revision: 7571
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7571&view=rev
Author: vargenau
Date: 2010-06-24 16:31:07 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
Use "id" instead of "name" for <a>
Modified Paths:
--------------
trunk/lib/plugin/CreateToc.php
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/MonoBook/templates/top.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/gforge/templates/blogform.tmpl
trunk/themes/gforge/templates/body.tmpl
trunk/themes/gforge/templates/editpage.tmpl
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/lib/plugin/CreateToc.php 2010-06-24 16:31:07 UTC (rev 7571)
@@ -315,7 +315,7 @@
else
$anchorString = "<a href=\"$url\" name=\"$manchor\">\$2</a>";
} else {
- $anchorString = "<a name=\"$manchor\"></a>";
+ $anchorString = "<a id=\"$manchor\"></a>";
if ($counter)
$anchorString .= "$counterString - ";
}
@@ -338,11 +338,11 @@
} else {
/* Not possible to make a backlink on a
* title with a WikiWord */
- $anchorString = "\$1<a name=\"$manchor\"></a>";
+ $anchorString = "\$1<a id=\"$manchor\"></a>";
}
}
else {
- $anchorString = "\$1<a name=\"$manchor\"></a>";
+ $anchorString = "\$1<a id=\"$manchor\"></a>";
if ($counter)
$anchorString .= "$counterString - ";
}
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -42,7 +42,7 @@
</div></td></tr></table>
<fieldset class="editarea">
<legend><?=_("Page Content: ")?></legend>
- <a name="editarea"></a><?=$EDIT_TEXTAREA?>
+ <a id="editarea"></a><?=$EDIT_TEXTAREA?>
</fieldset>
<!-- FIXME: fix layout, move CSS to CSS -->
<fieldset class="editarea">
Modified: trunk/themes/MonoBook/templates/top.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/top.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/MonoBook/templates/top.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -2,5 +2,5 @@
// rcs_id('$Id$');
?>
<!-- Page title -->
-<a name="top"></a>
+<a id="top"></a>
<h1 class="firstHeading"><?= $HEADER ?></h1>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -32,7 +32,7 @@
</td>
</tr>
</table>
-<a name="editarea" id="editarea"><?=$EDIT_TEXTAREA?></a>
+<a id="editarea"><?=$EDIT_TEXTAREA?></a>
<br />
<?=_("Summary")?>: <?= $SUMMARY_INPUT ?>
<br />
Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/Sidebar/templates/signin.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -16,7 +16,7 @@
<!-- Login -->
<li id="pt-login"><?= HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Login"),$sp) ?></li>
<?php } else { ?>
- <li id="pt-login"><a name="login"><?= _("Login required...") ?></a></li>
+ <li id="pt-login"><a id="login"><?= _("Login required...") ?></a></li>
<?php } ?>
</ul>
</div>
Modified: trunk/themes/Sidebar/templates/top.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/top.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/Sidebar/templates/top.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -13,7 +13,7 @@
$rating = 0;
?>
<!-- Page title -->
-<a name="top" id="contentTop"></a>
+<a id="contentTop"></a>
<?php if ($page->_pagename != "HomePage") { ?>
<h1 class="firstHeading<?= $rating ? '-rating' : '' ?><?= $public ? '-public' : '' ?>"><?= $HEADER ?></h1>
<?php } ?>
@@ -25,4 +25,4 @@
$loader = new WikiPluginLoader();
printXML($loader->expandPI("<"."?plugin RateIt show=text ?".">", $request, $dbi->_markup));
?></div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -42,7 +42,7 @@
<noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
</p>
-<a name="editarea" id="editarea"><?=$EDIT_TEXTAREA?></a>
+<a id="editarea"><?=$EDIT_TEXTAREA?></a>
<br /><small>
<?=_("Summary")?>: <?= $SUMMARY_INPUT ?>
<br />
Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/blog/templates/blogform.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -11,7 +11,7 @@
<input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
<?= $EDIT_TOOLBAR ?>
- <a name="editarea"></a>
+ <a id="editarea"></a>
<textarea id="edit-content" class="edit-content" rows="8" style="width:540px"
name="edit[content]"></textarea>
<br />
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/default/templates/blogform.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -11,7 +11,7 @@
<input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
<?= $EDIT_TOOLBAR ?>
- <a name="editarea"></a>
+ <a id="editarea"></a>
<textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px"
name="edit[content]"></textarea>
<br />
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/default/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -45,7 +45,7 @@
<?php if (!empty($WYSIWYG_B)) { ?>
<br /><div class="hint"><strong>Warning:</strong> Switching to the Wysiwyg editor will not keep your changes.</div>
<?php } ?>
- <a name="editarea"></a><?=$EDIT_TEXTAREA?>
+ <a id="editarea"></a><?=$EDIT_TEXTAREA?>
<!-- FIXME: fix layout, move CSS to CSS -->
<div class="toolbar" style="text-align: center;">
<label for="edit-summary"><?=_("Summary").':'?></label> <?=$SUMMARY_INPUT?>
Modified: trunk/themes/gforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/gforge/templates/blogform.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/gforge/templates/blogform.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -11,7 +11,7 @@
<input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
<?= $EDIT_TOOLBAR ?>
- <a name="editarea"></a>
+ <a id="editarea"></a>
<textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px"
name="edit[content]"></textarea>
<br />
Modified: trunk/themes/gforge/templates/body.tmpl
===================================================================
--- trunk/themes/gforge/templates/body.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/gforge/templates/body.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -21,7 +21,7 @@
else
$rating = 0;
?>
-<a name="top" id="contentTop"></a>
+<a id="contentTop"></a>
<h1>
<span class="firstHeading<?= $rating ? '-rating' : '' ?>">
<span style="float: left;"><?= $HEADER ?></span>
Modified: trunk/themes/gforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/gforge/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570)
+++ trunk/themes/gforge/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571)
@@ -37,7 +37,7 @@
<label for="pref-editWidth"><b><?=_("W")?></b></label> <?=$WIDTH_PREF?>
<noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
- <a name="editarea"></a><?=$EDIT_TEXTAREA?>
+ <a id="editarea"></a><?=$EDIT_TEXTAREA?>
<div class="toolbar" style="text-align: center;">
<label for="edit-summary"><?=_("Summary").':'?></label> <?=$SUMMARY_INPUT?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-07-02 07:31:41
|
Revision: 7589
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7589&view=rev
Author: vargenau
Date: 2010-07-02 07:31:33 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
<?= --> <?php echo
Modified Paths:
--------------
trunk/admin/README
trunk/doc/THEMES
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/Crao/templates/body.tmpl
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/Crao/templates/browse.tmpl
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Crao/templates/htmldump.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/Crao/templates/top.tmpl
trunk/themes/Crao/templates/wikiblog.tmpl
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/body.tmpl
trunk/themes/MonoBook/templates/browse-footer.tmpl
trunk/themes/MonoBook/templates/browse.tmpl
trunk/themes/MonoBook/templates/editpage.tmpl
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/MonoBook/templates/logo.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/MonoBook/templates/signin.tmpl
trunk/themes/MonoBook/templates/tags.tmpl
trunk/themes/MonoBook/templates/top.tmpl
trunk/themes/MonoBook/templates/viewsource.tmpl
trunk/themes/Portland/templates/actionbar.tmpl
trunk/themes/Portland/templates/body.tmpl
trunk/themes/Portland/templates/browse.tmpl
trunk/themes/Portland/templates/debug.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Portland/templates/navbar.tmpl
trunk/themes/Portland/templates/viewsource.tmpl
trunk/themes/Sidebar/clock.php
trunk/themes/Sidebar/hyperapplet.php
trunk/themes/Sidebar/hyperwiki.php
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Sidebar/templates/browse.tmpl
trunk/themes/Sidebar/templates/calendar.tmpl
trunk/themes/Sidebar/templates/content.tmpl
trunk/themes/Sidebar/templates/debug.tmpl
trunk/themes/Sidebar/templates/dump-footer.tmpl
trunk/themes/Sidebar/templates/frame-left.tmpl
trunk/themes/Sidebar/templates/frameset.tmpl
trunk/themes/Sidebar/templates/html.tmpl
trunk/themes/Sidebar/templates/htmldump.tmpl
trunk/themes/Sidebar/templates/logo.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/rc.tmpl
trunk/themes/Sidebar/templates/search.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Sidebar/templates/tags.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/Wordpress/templates/body.tmpl
trunk/themes/Wordpress/templates/browse.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/Wordpress/templates/viewsource.tmpl
trunk/themes/blog/templates/actionbar.tmpl
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/blog/templates/body.tmpl
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/blog/templates/browse-footer.tmpl
trunk/themes/blog/templates/browse.tmpl
trunk/themes/blog/templates/debug.tmpl
trunk/themes/blog/templates/info.tmpl
trunk/themes/blog/templates/navbar.tmpl
trunk/themes/blog/templates/sidebar.tmpl
trunk/themes/blog/templates/top.tmpl
trunk/themes/blog/templates/viewsource.tmpl
trunk/themes/blog/templates/wikiblog.tmpl
trunk/themes/default/templates/README
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/addcomment.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/body.tmpl
trunk/themes/default/templates/bottom.tmpl
trunk/themes/default/templates/browse-footer.tmpl
trunk/themes/default/templates/browse.tmpl
trunk/themes/default/templates/categorypage.tmpl
trunk/themes/default/templates/comment.tmpl
trunk/themes/default/templates/content.tmpl
trunk/themes/default/templates/debug.tmpl
trunk/themes/default/templates/dialog.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/default/templates/forumadd.tmpl
trunk/themes/default/templates/frameset.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/homepage.tmpl
trunk/themes/default/templates/html.tmpl
trunk/themes/default/templates/htmldump.tmpl
trunk/themes/default/templates/info.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/default/templates/nochanges.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/pagelink.tmpl
trunk/themes/default/templates/redirect.tmpl
trunk/themes/default/templates/savepage.tmpl
trunk/themes/default/templates/search.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/default/templates/top.tmpl
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/default/templates/viewsource.tmpl
trunk/themes/default/templates/wikiblog.tmpl
trunk/themes/default/templates/wikiforum.tmpl
trunk/themes/gforge/templates/actionbar.tmpl
trunk/themes/gforge/templates/blogform.tmpl
trunk/themes/gforge/templates/body.tmpl
trunk/themes/gforge/templates/bottom.tmpl
trunk/themes/gforge/templates/browse-footer.tmpl
trunk/themes/gforge/templates/browse.tmpl
trunk/themes/gforge/templates/debug.tmpl
trunk/themes/gforge/templates/editpage.tmpl
trunk/themes/gforge/templates/html.tmpl
trunk/themes/gforge/templates/login.tmpl
trunk/themes/gforge/templates/navbar.tmpl
trunk/themes/gforge/templates/pagelink.tmpl
trunk/themes/gforge/templates/userprefs.tmpl
trunk/themes/shamino_com/templates/actionbar.tmpl
trunk/themes/shamino_com/templates/browse-footer.tmpl
trunk/themes/shamino_com/templates/debug.tmpl
trunk/themes/shamino_com/templates/info.tmpl
trunk/themes/shamino_com/templates/signin.tmpl
trunk/themes/shamino_com/templates/top.tmpl
trunk/themes/smaller/templates/actionbar.tmpl
trunk/themes/smaller/templates/info.tmpl
trunk/themes/smaller/templates/navbar.tmpl
trunk/themes/smaller/templates/signin.tmpl
trunk/themes/wikilens/templates/body.tmpl
trunk/themes/wikilens/templates/categorypage.tmpl
trunk/themes/wikilens/templates/head.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
trunk/themes/wikilens/templates/top.tmpl
Modified: trunk/admin/README
===================================================================
--- trunk/admin/README 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/admin/README 2010-07-02 07:31:33 UTC (rev 7589)
@@ -37,16 +37,16 @@
<h5>Fulltext Search</h5>
<form id="searchform2" action="/cgi-bin/omega"
- method="get" accept-charset="<?=$charset?>" style="display:inline" class="searchform">
+ method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform">
<?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); ?>
<input type="hidden" name="DEFAULTOP" value="AND" />
<input name="P" size="18" maxlength="256"
- value="<?=$s?>"
- onfocus="if (this.value == '<?=_("Search")?>') {this.value = '';}"
+ value="<?php echo $s?>"
+ onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
onmouseout="window.status=''; return true;"
- onmouseover="window.status='<?=_("Quick Search")?>'; return true;"
+ onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
type="text" id="search2"
- title="<?=_("Search term(s)") ?>" />
+ title="<?php echo _("Search term(s)") ?>" />
<div align="right" style="padding-right:10px;">
<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="External Fulltext Search">
</div>
Modified: trunk/doc/THEMES
===================================================================
--- trunk/doc/THEMES 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/doc/THEMES 2010-07-02 07:31:33 UTC (rev 7589)
@@ -38,7 +38,7 @@
HTML objects.
Pure HTML entities, e.g. <? echo "<br>" ?> will be escaped to <br>.
-You can easily embed other templates by your own, e.g. <?= Template('body') ?>
+You can easily embed other templates by your own, e.g. <?php echo Template('body') ?>
Templates are used
* by the master action (html and htmldump), which include most other
@@ -48,7 +48,7 @@
* by certain pagetypes (e.g. wikiblog, comment, wikiforum)
To include templates from other themes use this syntax:
- <?= Template('default/search') ?>
+ <?php echo Template('default/search') ?>
includes the search template from the default theme.
Warning!
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -13,31 +13,31 @@
<?php } else { ?>
<div id="actionbuttons">
<?php } ?>
-<?= $EditB ?>
+<?php echo $EditB ?>
<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
-<?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
+<?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
<?php if (ENABLE_PAGEPERM) { ?>
-<?=$SEP?><?= Button('chown') ?>
-<?=$SEP?><?= Button('setacl') ?>
+<?php echo $SEP?><?php echo Button('chown') ?>
+<?php echo $SEP?><?php echo Button('setacl') ?>
<?php }} ?>
<?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
-<?=$SEP?><?= Button('remove') ?>
+<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
-<?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
-<?=$SEP?><?= Button("diff") ?>
-<?=$SEP?><?= Button("PageInfo", _("PageInfo")) ?>
+<?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
+<?php echo $SEP?><?php echo Button("diff") ?>
+<?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
<?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
<!-- Buttons really only for debugging -->
-<?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
-<?=$SEP?><?= Button("PageDump", _("PageDump")) ?>
+<?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?>
+<?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
<?php $purgeb = Button(array('nocache' => 'purge'),
_("PurgeHtmlCache"), $page->getName());
$purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
-<?=$SEP?><?= $purgeb ?>
+<?php echo $SEP?><?php echo $purgeb ?>
<!-- End debugging buttons -->
<?php } ?>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
- <?=$SEP?><?= Button("pdf") ?>
+ <?php echo $SEP?><?php echo Button("pdf") ?>
<?php } ?>
</div>
Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/body.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -1,22 +1,22 @@
<?php // -*-php-*-
// rcs_id('$Id$');
?>
-<body<?= $WikiTheme->getMoreAttr('body') ?>>
+<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
<div id="header"><?php // for top toolbars style sheet ?>
- <?= Template('top') ?>
+ <?php echo Template('top') ?>
</div>
-<div class="toolbar"><?= Template('navbar') ?></div>
+<div class="toolbar"><?php echo Template('navbar') ?></div>
<!-- Page content -->
<div id="content">
<?php if (isset($HEADER)) { ?>
<!-- Page title -->
-<h1><?= $HEADER ?></h1>
+<h1><?php echo $HEADER ?></h1>
<?php } ?>
-<?= $CONTENT ?>
-<?= Template('bottom') ?>
+<?php echo $CONTENT ?>
+<?php echo Template('bottom') ?>
</div>
<?php if (isset($revision)) { ?>
<!-- Actionbar -->
-<?= Template('actionbar') ?>
+<?php echo Template('actionbar') ?>
<?php } ?>
</body>
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/bottom.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -7,5 +7,5 @@
-<?= $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (defined('DEBUG') and DEBUG) { ?><?= Template('debug') ?><?php } ?>
+<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
+<?php if (defined('DEBUG') and DEBUG) { ?><?php echo Template('debug') ?><?php } ?>
Modified: trunk/themes/Crao/templates/browse.tmpl
===================================================================
--- trunk/themes/Crao/templates/browse.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/browse.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -3,18 +3,18 @@
?>
<?php if ($revision and !$revision->isCurrent()) { ?>
- <p><strong><?=_("Note:")?></strong>
- <?=_("You are viewing an old revision of this page.")?>
- <?= Button('browse', _("View the current version"), $page)?>.
+ <p><strong><?php echo _("Note:")?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version"), $page)?>.
</p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
- <p><?= $redirected ?></p>
+ <p><?php echo $redirected ?></p>
<?php } ?>
-<?=$CONTENT?>
+<?php echo $CONTENT?>
<div id="revision">
-<p class="editdate"><?= $WikiTheme->getLastModifiedMessage($revision) ?></p>
+<p class="editdate"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></p>
<?php
global $HIDE_TOOLBARS;
if (!$HIDE_TOOLBARS) {
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/editpage.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -2,22 +2,22 @@
// rcs_id('$Id$');
?>
<?php if (isset($PREVIEW_CONTENT)) { ?>
- <p><strong><?=_("Preview only! Changes not saved.")?></strong>
+ <p><strong><?php echo _("Preview only! Changes not saved.")?></strong>
<!-- FIXME: it would be nice to put a link to the #editarea anchor below,
but it does not work currently with the <base> declared in top.tmpl.
I think we need to do away with using <base> altogether... -->
- <?= fmt("Please continue editing. (You'll find your %s at the bottom of the page.)",
+ <?php echo fmt("Please continue editing. (You'll find your %s at the bottom of the page.)",
/* HTML::a(array("href" => "#editarea"), */ _("edit area") /*) */) ?>
</p>
<hr class="printer" noshade="noshade" />
- <?= $PREVIEW_CONTENT ?>
+ <?php echo $PREVIEW_CONTENT ?>
<hr class="printer" noshade="noshade" />
<?php } ?>
-<?= $PAGE_LOCKED_MESSAGE ?>
-<?= $CONCURRENT_UPDATE_MESSAGE ?>
+<?php echo $PAGE_LOCKED_MESSAGE ?>
+<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
<?php if (! $IS_CURRENT) { ?>
- <p><strong><?=_("Warning: You are editing an old revision.")?>
- <?=_("Saving this page will overwrite the current version.")?></strong></p>
+ <p><strong><?php echo _("Warning: You are editing an old revision.")?>
+ <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
<?php } ?>
<?php /*
* FIXME: Hack!
@@ -27,50 +27,50 @@
* a redirect from a page to itself.)
*/ ?>
<form method="post" id="editpage" name="editpage"
- action="<?= $request->getPostURL() ?>"
- accept-charset="<?=CHARSET?>">
+ action="<?php echo $request->getPostURL() ?>"
+ accept-charset="<?php echo CHARSET?>">
<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
<?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
<br class="clear-floats" />
<table width="100%">
- <tr><td><?= $EDIT_TOOLBAR ?></td>
+ <tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td align="right"><div id="editarea-size">
- <?=_("Size").':'?>
- <label for="pref-editHeight"><b><?=_("H")?></b></label> <?=$HEIGHT_PREF?>
- <label for="pref-editWidth"><b><?=_("W")?></b></label> <?=$WIDTH_PREF?>
- <noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
+ <?php echo _("Size").':'?>
+ <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
+ <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
+ <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
<fieldset class="editarea">
- <legend><?=_("Page Content: ")?></legend>
- <a id="editarea"></a><?=$EDIT_TEXTAREA?>
+ <legend><?php echo _("Page Content: ")?></legend>
+ <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
</fieldset>
<!-- FIXME: fix layout, move CSS to CSS -->
<fieldset class="editarea">
- <legend><?=_("Summary").':'?></legend><br />
- <?=$SUMMARY_INPUT?>
+ <legend><?php echo _("Summary").':'?></legend><br />
+ <?php echo $SUMMARY_INPUT?>
</fieldset>
<?php if (ENABLE_CAPTCHA) { ?>
<fieldset class="toolbar" style="text-align: center;">
<?php echo $CAPTCHA_IMAGE ?><br/>
- <?php echo $CAPTCHA_LABEL ?><?= $CAPTCHA_INPUT ?>
+ <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
</fieldset>
<?php } ?>
<fieldset class="toolbar">
- <?=$MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?=_("This is a minor change.")?></label>
- <?=$OLD_MARKUP_CB?> <label for="useOldMarkup"><?=_("Use old markup")?></label> <?=$OLD_MARKUP_CONVERT?>
+ <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label>
+ <?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
<?php if ($user->isAdmin()) { ?>
- <?= $LOCKED_CB ?> <label for="edit-locked"><?=_("Locked")?></label>
+ <?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
<?php } ?>
</fieldset>
<fieldset class="toolbar">
- <?= $PREVIEW_B ?>
+ <?php echo $PREVIEW_B ?>
<?php if ($SAVE_B) { ?>
- <?=$SEP?><?= $SAVE_B ?>
+ <?php echo $SEP?><?php echo $SAVE_B ?>
<?php } ?>
</fieldset>
<fieldset class="toolbar">
- <?=$AUTHOR_MESSAGE?>
- <label><?= Template('signin', array('FORMNAME' => 'editpage')) ?></label>
+ <?php echo $AUTHOR_MESSAGE?>
+ <label><?php echo Template('signin', array('FORMNAME' => 'editpage')) ?></label>
</fieldset>
<hr noshade="noshade" />
<script type="text/javascript">
@@ -90,15 +90,15 @@
</script>
<div id="oldMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?= fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help/OldTextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<div id="newMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?= fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
-<?=$HIDDEN_INPUTS?>
+<?php echo $HIDDEN_INPUTS?>
</form>
<script type="text/javascript">
<!--
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/head.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -2,22 +2,22 @@
// rcs_id('$Id$');
?>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
<?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
-<meta name="robots" content="<?= $ROBOTS_CONTENT ?>" />
+<meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
<?php if (!empty($PAGE_DESCRIPTION)) { ?>
-<meta name="description" content="<?=$PAGE_DESCRIPTION?>" />
+<meta name="description" content="<?php echo $PAGE_DESCRIPTION?>" />
<?php } ?>
<?php if (!empty($PAGE_KEYWORDS)) { ?>
-<meta name="keywords" content="<?=$PAGE_KEYWORDS?>" />
+<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
<?php } ?>
-<meta name="language" content="<?=DEFAULT_LANGUAGE?>" />
+<meta name="language" content="<?php echo DEFAULT_LANGUAGE?>" />
<meta name="document-type" content="Public" />
<meta name="document-rating" content="General" />
<meta name="generator" content="PhpWiki" />
-<meta name="PHPWIKI_VERSION" content="<?=PHPWIKI_VERSION?>" />
-<base href="<?=PHPWIKI_BASE_URL?>" />
-<link rel="shortcut icon" href="<?=$WikiTheme->getImageURL('favicon.ico')?>" />
+<meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" />
+<base href="<?php echo PHPWIKI_BASE_URL?>" />
+<link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
<?php /**
* Additional navigation links are provided here in the html header for browsers
* which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
@@ -26,14 +26,14 @@
* http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
*/ ?>
<?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
-<link rel="home" title="<?=HOME_PAGE?>" href="<?=WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?=
-_("HowToUseWiki")?>" href="<?=WikiURL(
+<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
+<link rel="help" title="<?php echo
+_("HowToUseWiki")?>" href="<?php echo WikiURL(
_("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?=COPYRIGHTPAGE_TITLE?>" href="<?=COPYRIGHTPAGE_URL?>" />
-<link rel="author" title="<?=AUTHORPAGE_TITLE?>" href="<?=AUTHORPAGE_URL?>" />
-<link rel="search" title="<?=
-_("FindPage")?>" href="<?=WikiURL(
+<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
+<link rel="search" title="<?php echo
+_("FindPage")?>" href="<?php echo WikiURL(
_("FindPage"))?>" />
<?php /**
* Provide alternate variations of the page content:
@@ -51,7 +51,7 @@
$alternatelinkTitle = $page->getName();
$alternatelinkUrl = WikiURL($revision, array('action' => 'browse'));
} ?>
-<link rel="alternate" title="<?= $alternatelinkTitle ?>" href="<?= $alternatelinkUrl ?>" />
+<link rel="alternate" title="<?php echo $alternatelinkTitle ?>" href="<?php echo $alternatelinkUrl ?>" />
<?php }
/**
* Link tag for RSS auto-discovery. See
@@ -59,38 +59,38 @@
* http://www.oreillynet.com/cs/weblog/view/wlg/1475
*/
?>
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=WikiURL(
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL(
_("RecentChanges"), array('format' => 'rss'))?>" />
<?php /**
* Add some user-specific links.
*/ ?>
<?php if (!$user->isSignedIn()) {
/* For users not signed in */ ?>
-<link rel="bookmark" title="<?=
-_("SandBox")?>" href="<?=WikiURL(
+<link rel="bookmark" title="<?php echo
+_("SandBox")?>" href="<?php echo WikiURL(
_("SandBox"))?>" />
-<link rel="bookmark" title="<?=
-_("WikiWikiWeb")?>" href="<?=WikiURL(
+<link rel="bookmark" title="<?php echo
+_("WikiWikiWeb")?>" href="<?php echo WikiURL(
_("WikiWikiWeb"))?>" />
<?php } ?>
-<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?= WikiURL($page,array('action'=>'edit')) ?>" />
+<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?php echo WikiURL($page,array('action'=>'edit')) ?>" />
<?php if ($user->isadmin()) {
/* Only for the Administrator */ ?>
-<link rel="bookmark" title="<?=
-_("PhpWikiAdministration")?>" href="<?=WikiURL(
+<link rel="bookmark" title="<?php echo
+_("PhpWikiAdministration")?>" href="<?php echo WikiURL(
_("PhpWikiAdministration"))?>" />
<?php } ?>
<?php if ($user->isSignedIn()) {
/* For signed-in users */ ?>
-<link rel="bookmark" title="<?=
-_("UserPreferences")?>" href="<?=WikiURL(
+<link rel="bookmark" title="<?php echo
+_("UserPreferences")?>" href="<?php echo WikiURL(
_("UserPreferences"))?>" />
<?php /* User's calendar page
*/
$UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR ._("Calendar");
$UserCalPageUrl = WikiURL($UserCalPageTitle);
?>
-<link rel="bookmark" title="<?= $UserCalPageTitle ?>" href="<?= $UserCalPageUrl ?>" />
+<link rel="bookmark" title="<?php echo $UserCalPageTitle ?>" href="<?php echo $UserCalPageUrl ?>" />
<?php /* Today's calendar page for the user if it exists
*/
$UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //FIXME
@@ -98,10 +98,10 @@
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
-<link rel="bookmark" title="<?= $UserCalPageTodayTitle ?>" href="<?= $UserCalPageTodayUrl ?>" />
+<link rel="bookmark" title="<?php echo $UserCalPageTodayTitle ?>" href="<?php echo $UserCalPageTodayUrl ?>" />
<?php } ?>
<?php } //end of links for signed-in user ?>
-<?= $WikiTheme->getCSS() ?>
+<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
@@ -109,8 +109,8 @@
else
$pagetitle = " - ". AsString($TITLE);
?>
-<title><?=WIKI_NAME.$pagetitle?></title>
-<meta property="og:title" content="<?= $TITLE ?>"/>
-<meta property="og:site_name" content="<?= WIKI_NAME ?>"/>
-<?= $WikiTheme->getMoreHeaders() ?>
+<title><?php echo WIKI_NAME.$pagetitle?></title>
+<meta property="og:title" content="<?php echo $TITLE ?>"/>
+<meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php echo $WikiTheme->getMoreHeaders() ?>
</head>
Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/htmldump.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -10,7 +10,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
<?php /**
* Additional navigation links are provided here in the html header for browsers
* which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
@@ -18,12 +18,12 @@
* See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
* http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
*/ ?>
-<link rel="home" title="<?=HOME_PAGE?>" href="<?=WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?=_("HowToUseWiki")?>" href="<?=WikiURL(_("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?=COPYRIGHTPAGE_TITLE?>" href="<?=COPYRIGHTPAGE_URL?>" />
-<link rel="author" title="<?=AUTHORPAGE_TITLE?>" href="<?=AUTHORPAGE_URL?>" />
+<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
+<link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
+<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<?= $WikiTheme->getCSS() ?>
+<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
@@ -31,7 +31,7 @@
else
$pagetitle = " - ". AsString($TITLE);
?>
-<title><?=WIKI_NAME.$pagetitle?></title>
+<title><?php echo WIKI_NAME.$pagetitle?></title>
</head>
-<?= Template('body') ?>
+<?php echo Template('body') ?>
</html>
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/navbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -2,26 +2,26 @@
// rcs_id('$Id$');
?>
<!-- The top navigation/search bar -->
-<form action="<?= WikiURL(_("TitleSearch"))?>"
- method="get" accept-charset="<?=$charset?>" id="searchform">
+<form action="<?php echo WikiURL(_("TitleSearch"))?>"
+ method="get" accept-charset="<?php echo $charset?>" id="searchform">
<input type="hidden" name="auto_redirect" value="1" />
<?php if (! USE_PATH_INFO) { ?>
- <input type="hidden" name="pagename" value="<?=_("TitleSearch")?>" />
+ <input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />
<?php } ?>
<div id="navbuttons">
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr valign="middle"><td align="left">
-<?= WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php if (!empty($revision)) { ?>
-<?=$SEP?><?= Button("RelatedChanges", _("RelatedChanges")) ?>
-<?=$SEP?><?= Button("LikePages", _("LikePages")) ?>
-<?=$SEP?><?= Button("BackLinks", _("BackLinks")) ?>
+<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>
+<?php echo $SEP?><?php echo Button("LikePages", _("LikePages")) ?>
+<?php echo $SEP?><?php echo Button("BackLinks", _("BackLinks")) ?>
<?php } ?>
</td>
<td align="right" width="150">
<div id="search">
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <?= WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?=$SEP?>
+ <?php echo WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?php echo $SEP?>
<?php } ?>
<?php if (!empty($user)) { ?>
<?php
@@ -32,24 +32,24 @@
$UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
-<?= WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?=$SEP?>
+<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?php echo $SEP?>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
-<?= WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?=$SEP?>
+<?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?>
<?php } ?>
<?php } ?>
-<?= WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12"
+<?php echo WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12"
maxlength="256"
- onfocus="if (this.value == '<?=_("Search")?>') {this.value = '';}"
+ onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
onmouseout="window.status=''; return true;"
- onmouseover="window.status='<?=_("Search")?>'; return true;"
+ onmouseover="window.status='<?php echo _("Search")?>'; return true;"
<?php if (ENABLE_LIVESEARCH) { ?>
- title="<?=_("LiveSearch")?>"
+ title="<?php echo _("LiveSearch")?>"
onKeypress="liveSearchStart()"
- onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?=_("Search")?>';}" />
+ onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?php echo _("Search")?>';}" />
</div><br /><div align="left" id="LSResult"></div>
<?php } else { ?>
- title="<?=_("TitleSearch")?>" />
+ title="<?php echo _("TitleSearch")?>" />
</div>
<?php } ?>
</td></tr></table></div>
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/signin.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -7,27 +7,27 @@
$NOFORM = true;
?>
<?php if (empty($NOFORM)) { ?>
- <form method="post" action="<?= $request->getPostURL() ?>" accept-charset="<?=$charset?>" name="<?=$FORMNAME?>">
- <?= HiddenInputs($request->getArgs(), false, array('auth')) ?>
+ <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>">
+ <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
<?php } ?>
<?php if ($user->isSignedIn()) {
$SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
?>
<span>
- <?= fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?>
- <?=$SEP?>
+ <?php echo fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?>
+ <?php echo $SEP?>
</span>
<script type="text/javascript"><!--
document.write('<input type="hidden" name="auth[logout]" value="0" />');
function SignOut(form) {
- var form = document.forms["<?=$FORMNAME?>"];
+ var form = document.forms["<?php echo $FORMNAME?>"];
form.elements["auth[logout]"].value = 1;
form.submit();
}
- document.write('<?=$SignOutB?>'); // -->
+ document.write('<?php echo $SignOutB?>'); // -->
</script>
<noscript>
- <?= Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+ <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
</noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
@@ -49,11 +49,11 @@
form.submit();
}
//-->
- document.write(' <?=
+ document.write(' <?php echo
_("Sign In")
?>');
</script>
- <?= $SignInInput ?>
+ <?php echo $SignInInput ?>
<?php } ?>
<?php if (empty($NOFORM)) { ?>
</form>
Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/top.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -8,8 +8,8 @@
<table summary="logo"
width="100%" cellpadding="0" cellspacing="0" border="0">
<tr valign="middle">
- <td><div id="logo"><a href="<?=WikiURL(HOME_PAGE)?>"><?=WIKI_NAME?></a></div></td>
- <td><div id="signin"><?= Template('signin') ?></div></td>
+ <td><div id="logo"><a href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME?></a></div></td>
+ <td><div id="signin"><?php echo Template('signin') ?></div></td>
</tr>
</table>
<?php } ?>
Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/Crao/templates/wikiblog.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -24,24 +24,24 @@
?>
<!-- FIXME: move table formatting to css -->
-<div title="<?= fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>"
+<div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>"
class="wikiblog wikitext">
<div class="wikiblog-header">
- <strong class="floatleft"><?= WikiLink($page, 'known', $CDATE) ?></strong>
- <strong class="floatright"><?= WikiLink($BLOG_CREATOR, 'if_known') ?></strong>
+ <strong class="floatleft"><?php echo WikiLink($page, 'known', $CDATE) ?></strong>
+ <strong class="floatright"><?php echo WikiLink($BLOG_CREATOR, 'if_known') ?></strong>
<br class="clear-floats" />
</div>
<div class="wikiblog-body">
<?php if ($rev->get('summary')) { ?>
- <h3 class="wikiblog-summary"><?= $rev->get('summary') ?></h3>
+ <h3 class="wikiblog-summary"><?php echo $rev->get('summary') ?></h3>
<?php } ?>
- <?= $CONTENT ?>
+ <?php echo $CONTENT ?>
</div>
<?php if ($buttons or $modified) { ?>
<div class="wikiblog-footer">
- <?= $buttons ?>
- <?= $modified ?>
+ <?php echo $buttons ?>
+ <?php echo $modified ?>
<br class="clear-floats" />
</div>
<?php } ?>
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -10,79 +10,79 @@
$isBrowse = $request->getArg('action') == 'browse';
?>
<div class="portlet" id="p-cactions">
- <h5><?= _("Views") ?></h5>
+ <h5><?php echo _("Views") ?></h5>
<ul>
<?php if (!string_ends_with($pagename, _("/Discussion"))) { ?>
<?php $talk = new WikiPageName('Talk:'.$pagename); ?>
- <?= ActionButton(array(),
+ <?php echo ActionButton(array(),
$isActionPage ? _("ActionPage") : _("Article"),
$talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?>
<?php if (!$isActionPage) { ?>
<?php if ($dbh->isWikiPage($talk->getName())) { ?>
- <?= ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
+ <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
<?php } else { ?>
- <?= ActionButton(array('action'=>'create',
+ <?php echo ActionButton(array('action'=>'create',
'template'=>_("TemplateTalk")),
_("Discussion"), $talk->getName()) ?>
<?php } ?>
<?php } ?>
<?php } else {
$talk = new WikiPageName($pagename); ?>
- <?= ActionButton(array(),$isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?>
- <?= ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
+ <?php echo ActionButton(array(),$isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?>
+ <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
<?php } ?>
<?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
- <?= ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false,
+ <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false,
array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
<?php } else { ?>
- <?= ActionButton("viewsource", _("View Source")) ?>
+ <?php echo ActionButton("viewsource", _("View Source")) ?>
<?php } ?>
<?php if ($dbh->isWikiPage($page->getName())) { ?>
- <?= ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page. [alt-h]")) ?>
+ <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page. [alt-h]")) ?>
<?php if (!empty($revision) and ($isAdmin or mayAccessPage('purge', $pagename))) { ?>
- <?= ActionButton("purge") ?>
+ <?php echo ActionButton("purge") ?>
<?php } ?>
<?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?>
- <?= ActionButton('rename') ?>
- <?= ActionButton($page->get('locked') ? 'unlock' : 'lock') ?>
+ <?php echo ActionButton('rename') ?>
+ <?php echo ActionButton($page->get('locked') ? 'unlock' : 'lock') ?>
<?php } ?>
<?php } ?>
<? if ( $user->isSignedIn() ) { ?>
- <?= ActionButton("WatchPage", _("Watch"), false,
+ <?php echo ActionButton("WatchPage", _("Watch"), false,
array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
<?php } ?>
</ul>
</div>
<div class="portlet" id="p-tbx">
- <h5><?= _("Special Actions") ?></h5>
+ <h5><?php echo _("Special Actions") ?></h5>
<div class="pBody">
<ul>
<?php if ( $user->isSignedIn() ) { ?>
<?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?>
<?php if (ENABLE_PAGEPERM and mayAccessPage('change', $pagename)) { ?>
- <?= ActionButton('chown') ?>
- <?= ActionButton('setacl') ?>
+ <?php echo ActionButton('chown') ?>
+ <?php echo ActionButton('setacl') ?>
<?php }} ?>
<?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
- <?= ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
- <?= ActionButton('remove') ?>
+ <?php echo ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+ <?php echo ActionButton('remove') ?>
<?php } ?>
<?php } ?>
- <?= ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?>
- <?= ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?>
- <?= ActionButton("diff") ?>
- <?= ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?>
+ <?php echo ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?>
+ <?php echo ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?>
+ <?php echo ActionButton("diff") ?>
+ <?php echo ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?>
<?php if (DEBUG and USECACHE) {
$PurgeCache = ActionButton(array('nocache' => 'purge'),
_("Purge HTML cache"), $pagename);
$PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?>
- <?= $PurgeCache ?>
+ <?php echo $PurgeCache ?>
<?php } ?>
</ul>
</div>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/body.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -2,35 +2,35 @@
// rcs_id('$Id$');
// Todo: set the body attr dynamically. here class="ns-2" for mozilla
?>
-<body <?= $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<div id="global-wrapper">
<div id="column-content">
<div id="content">
- <?= Template('top') ?>
+ <?php echo Template('top') ?>
<div id="bodyContent">
- <?= $CONTENT ?>
+ <?php echo $CONTENT ?>
<!-- end content -->
<div class="visualClear"></div>
</div>
</div>
<?php if (empty($NOSIGNIN)) { ?>
- <?= Template('signin') ?>
+ <?php echo Template('signin') ?>
<?php } ?>
- <?= Template('logo') ?>
+ <?php echo Template('logo') ?>
</div>
<div id="column-one">
- <?= Template('navbar') ?>
+ <?php echo Template('navbar') ?>
<?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
- <?= Template('actionbar') ?>
- <?= Template('tags') ?>
+ <?php echo Template('actionbar') ?>
+ <?php echo Template('tags') ?>
<?php } ?>
</div>
<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
- <?= Template('browse-footer') ?>
+ <?php echo Template('browse-footer') ?>
</div>
<div id="bottom">
- <?= Template('bottom') ?>
+ <?php echo Template('bottom') ?>
</div>
</div>
</body>
Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -4,27 +4,27 @@
<?php // <hr class="printer" noshade="noshade" /> ?>
<div class="visualClear"></div>
<ul id="f-list">
- <li id="f-lastmod"> <?= $WikiTheme->getOwnerMessage($page) ?> <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?> </li>
+ <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li>
<li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b>
<?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?>
- <?= WikiLink(_("Copyrights")) ?>
+ <?php echo WikiLink(_("Copyrights")) ?>
<?php } else { ?>
<a class="internal" href="http://www.phpwiki.org/Copyrights" title ="PhpWiki:Copyrights">Copyrights</a>
<?php } ?>
</b> for details).<br /></li>
<?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?>
- <?= WikiLink(_("About".WIKI_NAME)) ?>
+ <?php echo WikiLink(_("About".WIKI_NAME)) ?>
<?php } else { ?>
<li id="f-about"><a href="http://www.phpwiki.org/PhpWiki" title ="PhpWiki:About">About PhpWiki</a></li>
<?php } ?>
<li id="f-disclaimer">
<?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?>
- <?= WikiLink(_("GeneralDisclaimer")) ?>
+ <?php echo WikiLink(_("GeneralDisclaimer")) ?>
<?php } else { ?>
<a href="http://www.phpwiki.org/GeneralDisclaimer" title ="PhpWiki:Disclaimer">Disclaimer</a>
<?php } ?>
</li>
</ul>
- <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?= $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div>
- <div id="f-copyrightico"><a href="http://www.gnu.org/copyleft/fdl.html"><img src="<?= $WikiTheme->getImageURL("gnu-fdl.png") ?>" alt="GNU Free Documentation License" /></a></div>
+ <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div>
+ <div id="f-copyrightico"><a href="http://www.gnu.org/copyleft/fdl.html"><img src="<?php echo $WikiTheme->getImageURL("gnu-fdl.png") ?>" alt="GNU Free Documentation License" /></a></div>
Modified: trunk/themes/MonoBook/templates/browse.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/browse.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -3,13 +3,13 @@
?>
<?php if ($revision and !$revision->isCurrent()) { ?>
- <p><strong><?=_("Note:")?></strong>
- <?=_("You are viewing an old revision of this page.")?>
- <?= Button('browse', _("View the current version"), $page)?>.
+ <p><strong><?php echo _("Note:")?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version"), $page)?>.
</p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
- <p><?= $redirected ?></p>
+ <p><?php echo $redirected ?></p>
<?php } ?>
-<?=$CONTENT?>
+<?php echo $CONTENT?>
Modified: trunk/themes/MonoBook/templates/editpage.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/editpage.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/editpage.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -2,4 +2,4 @@
// rcs_id('$Id$');
?>
<div id="contentSub"></div>
-<?= Template("default/editpage") ?>
+<?php echo Template("default/editpage") ?>
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/info.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -94,61 +94,61 @@
?>
<!-- FIXME: move table formatting to css -->
-<table summary="<?= $tableSummary ?>" class="pageinfo"
+<table summary="<?php echo $tableSummary ?>" class="pageinfo"
border="0" cellspacing="0" cellpadding="3">
<?php if (!$is_current) { ?>
<tr>
- <td align="right" class="pageinfo"><?=_("Supplanted on:")?></td>
- <td><?= $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td>
+ <td align="right" class="pageinfo"><?php echo _("Supplanted on:")?></td>
+ <td><?php echo $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td>
</tr>
<?php } ?>
<tr>
- <td align="right" nowrap="nowrap" class="pageinfo"><?= $label['date'] ?></td>
- <td><?= $modifed ?><?= $minor_flag ?></td>
+ <td align="right" nowrap="nowrap" class="pageinfo"><?php echo $label['date'] ?></td>
+ <td><?php echo $modifed ?><?php echo $minor_flag ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?= $label['author'] ?></td>
- <td><?= $authorLink ?>
+ <td align="right" class="pageinfo"><?php echo $label['author'] ?></td>
+ <td><?php echo $authorLink ?>
<?php if (! ($author == $authorId)) { ?>
- <span class="pageinfo-authorid">(<?= $authorId ?>)</span>
+ <span class="pageinfo-authorid">(<?php echo $authorId ?>)</span>
<?php } ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?=_("Page Version:")?></td>
- <td><?= $version ?></td>
+ <td align="right" class="pageinfo"><?php echo _("Page Version:")?></td>
+ <td><?php echo $version ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?=_("Markup:")?></td>
- <td><?= $markupVersion ?></td>
+ <td align="right" class="pageinfo"><?php echo _("Markup:")?></td>
+ <td><?php echo $markupVersion ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?=_("Size:")?></td>
- <td><?= $wordcount ?>, <?= $size ?></td>
+ <td align="right" class="pageinfo"><?php echo _("Size:")?></td>
+ <td><?php echo $wordcount ?>, <?php echo $size ?></td>
</tr>
<?php if ($is_current) { ?>
<tr>
- <td align="right" class="pageinfo"><?= _("Hits:") ?></td>
- <td><?= $hits ?></td>
+ <td align="right" class="pageinfo"><?php echo _("Hits:") ?></td>
+ <td><?php echo $hits ?></td>
</tr>
<?php } ?>
<tr>
- <td align="right" valign="top" class="pageinfo"><?= $label['summary'] ?></td>
- <td><?= $summary ?></td>
+ <td align="right" valign="top" class="pageinfo"><?php echo $label['summary'] ?></td>
+ <td><?php echo $summary ?></td>
</tr>
<?php if ($is_current) { ?>
<tr>
- <td align="right"><?= $LOCKED_CB ?></td>
- <td class="pageinfo"><?=_("Locked")?></td>
+ <td align="right"><?php echo $LOCKED_CB ?></td>
+ <td class="pageinfo"><?php echo _("Locked")?></td>
</tr>
<tr>
<td align="right" class="pageinfo">ACL type</td>
- <td><?= $type ?></td>
+ <td><?php echo $type ?></td>
</tr>
<tr>
<td align="right" valign="top" class="pageinfo">ACL</td>
- <td><?= $perm->asAclGroupLines() ?></td>
+ <td><?php echo $perm->asAclGroupLines() ?></td>
</tr>
<?php } ?>
@@ -174,29 +174,29 @@
<?php if (!empty($pagetype)) { $pagetype = implode(", ", $pagetype); ?>
<tr>
- <td align="right" class="pageinfo"><?=_("Page Type:")?></td>
- <td align="left"><?=$pagetype?></td>
+ <td align="right" class="pageinfo"><?php echo _("Page Type:")?></td>
+ <td align="left"><?php echo $pagetype?></td>
</tr>
<?php } ?>
</table>
<div id="actionbuttons">
- <?= Button("viewsource", _("View Source")) ?>
- <?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
- <?=$SEP?><?= Button("AuthorHistory", _("AuthorHistory")) ?>
- <?=$SEP?><?= Button("Diff") ?>
- <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
- <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
+ <?php echo Button("viewsource", _("View Source")) ?>
+ <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+ <?php echo $SEP?><?php echo Button("Diff") ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
<?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
<!-- Buttons really only for debugging -->
- <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
+ <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?>
<?php
$PurgeCache = Button(array('nocache' => 'purge'),
_("PurgeHtmlCache"), $page->getName());
$PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
- <?=$SEP?><?= $PurgeCache ?>
+ <?php echo $SEP?><?php echo $PurgeCache ?>
<!-- End debugging buttons -->
<?php } ?>
Modified: trunk/themes/MonoBook/templates/logo.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/logo.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/logo.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
// rcs_id('$Id$');
?>
-<div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>"><img src="<?= $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?=
+<div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><img src="<?php echo $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?php echo
fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div>
<div id="img-logo-right" />
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -9,35 +9,35 @@
<!-- The left navigation/search bar -->
<!-- Here you should add favorite Links and Categories -->
<div class="portlet" id="p-navigation">
- <h5><?= _("Navigation") ?></h5>
+ <h5><?php echo _("Navigation") ?></h5>
<div class="pBody">
<ul>
- <li id="n-mainpage"><?= WikiLink(HOME_PAGE, "",_("Home page")) ?></li>
- <li><? $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?= $link ?></li>
- <li id="n-recentcomments"><?= WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
- <li id="n-recentnewpages"><?= WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
- <li id="n-likepages"><?= Button(array('action'=>'LikePages'),_("Like pages"), $page->getName()) ?></li>
- <li id="n-randompage"><?= WikiLink(_("RandomPage"), "",_("Random page")) ?></li>
-<li id="n-help"><?= WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li>
+ <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home page")) ?></li>
+ <li><? $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?></li>
+ <li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
+ <li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
+ <li id="n-likepages"><?php echo Button(array('action'=>'LikePages'),_("Like pages"), $page->getName()) ?></li>
+ <li id="n-randompage"><?php echo WikiLink(_("RandomPage"), "",_("Random page")) ?></li>
+<li id="n-help"><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li>
</ul>
</div>
</div>
<div class="portlet" id="p-search">
- <h5><?= _("Search") ?></h5>
+ <h5><?php echo _("Search") ?></h5>
<div class="pBody">
-<?= Template("search",
+<?php echo Template("search",
array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")),
'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
'type'=>'submit',
'value'=>_("Go"))))) ?>
-<!-- <form action="<?= WikiURL(_("TitleSearch"))?>"
- method="get" accept-charset="<?=$charset?>">
- <?= WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
+<!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>"
+ method="get" accept-charset="<?php echo $charset?>">
+ <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
<input type="hidden" name="auto_redirect" value="1" />
<input type="text" name="s" size="12" maxlength="256"
- title='<?=_("Quick Search")?>'
- onmouseover="window.status='<?=_("Quick Search")?>'; return true;"
+ title='<?php echo _("Quick Search")?>'
+ onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
onmouseout="window.status=''; return true;" />
</form>
-->
@@ -45,37 +45,37 @@
</div>
<div class="portlet" id="p-tb">
- <h5><?= _("Toolbox") ?></h5>
+ <h5><?php echo _("Toolbox") ?></h5>
<div class="pBody">
<ul>
<?php if ($revision) { ?>
- <li id="t-whatlinkshere"><?= Button(array('action'=>'BackLinks'), _("What links here"), $page->getName()) ?></li>
+ <li id="t-whatlinkshere"><?php echo Button(array('action'=>'BackLinks'), _("What links here"), $page->getName()) ?></li>
<?php } ?>
<?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?>
- <li id="t-recentchangeslinked"><?= $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li>
+ <li id="t-recentchangeslinked"><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li>
<?php } ?>
<?php if ($user->isAdmin()) { ?>
- <li><?= WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
+ <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
<?php } ?>
<?php if ($user->isSignedIn()) { ?>
- <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?= $link ?></li>
+ <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
<?php } ?>
<li>
<?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
<script type="text/javascript"><!--
-document.write('<?= $PrintableLink ?>'); // -->
+document.write('<?php echo $PrintableLink ?>'); // -->
</script>
<noscript>
- <?= $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
+ <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
</noscript>
</li>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) {
// Do not display the pdf icon
$btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
?>
- <li><?= $btn ?></li>
+ <li><?php echo $btn ?></li>
<?php } ?>
- <li><?= WikiLink(_("AllPages"), "",_("All pages")) ?></li>
+ <li><?php echo WikiLink(_("AllPages"), "",_("All pages")) ?></li>
</ul>
</div>
</div>
Modified: trunk/themes/MonoBook/templates/signin.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/signin.tmpl 2010-06-28 12:33:51 UTC (rev 7588)
+++ trunk/themes/MonoBook/templates/signin.tmpl 2010-07-02 07:31:33 UTC (rev 7589)
@@ -6,17 +6,17 @@
<div class="portlet" id="p-personal"><div class="pBody">
<ul>
<?php if ($user->isAuthenticat...
[truncated message content] |
|
From: <var...@us...> - 2010-07-02 08:05:14
|
Revision: 7591
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7591&view=rev
Author: vargenau
Date: 2010-07-02 08:05:07 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
<? --> <?php
Modified Paths:
--------------
trunk/doc/INSTALL.flatfile
trunk/doc/THEMES
trunk/themes/MacOSX/images/index.php
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/debug.tmpl
trunk/themes/Sidebar/templates/search.tmpl
trunk/themes/alphatest.php
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/debug.tmpl
trunk/themes/default/templates/search.tmpl
Modified: trunk/doc/INSTALL.flatfile
===================================================================
--- trunk/doc/INSTALL.flatfile 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/doc/INSTALL.flatfile 2010-07-02 08:05:07 UTC (rev 7591)
@@ -106,7 +106,7 @@
<title>Make a directory</title>
</head>
-<?
+<?php
/*
I created this to set up server-writable files
Modified: trunk/doc/THEMES
===================================================================
--- trunk/doc/THEMES 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/doc/THEMES 2010-07-02 08:05:07 UTC (rev 7591)
@@ -32,11 +32,11 @@
Only one template is called, ususally the "html.tmpl" template,
which includes all other templates then.
-WikiTheme templates are regular xhtml, but the php parts within "<?" and "?>"
+WikiTheme templates are regular xhtml, but the php parts within "<?php" and "?>"
are treated especially by phpwiki. HTML entities within the php parts
should be created by our HtmlElement methods, which create well-formed
HTML objects.
-Pure HTML entities, e.g. <? echo "<br>" ?> will be escaped to <br>.
+Pure HTML entities, e.g. <?php echo "<br>" ?> will be escaped to <br>.
You can easily embed other templates by your own, e.g. <?php echo Template('body') ?>
Modified: trunk/themes/MacOSX/images/index.php
===================================================================
--- trunk/themes/MacOSX/images/index.php 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/MacOSX/images/index.php 2010-07-02 08:05:07 UTC (rev 7591)
@@ -12,7 +12,7 @@
function changebg(color) { document.bgColor = backgroundcolor[color]; }
//--></script>
</head><body bgcolor="#8888aa">
-<?
+<?php
$dir = opendir(".");
while($fileName = readdir($dir))
if (!(strcmp(substr($fileName, -4), ".png")))
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2010-07-02 08:05:07 UTC (rev 7591)
@@ -53,7 +53,7 @@
<?php } ?>
- <? if ( $user->isSignedIn() ) { ?>
+ <?php if ( $user->isSignedIn() ) { ?>
<?php echo ActionButton("WatchPage", _("Watch"), false,
array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
<?php } ?>
Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/Sidebar/templates/debug.tmpl 2010-07-02 08:05:07 UTC (rev 7591)
@@ -16,7 +16,7 @@
</div>
</td><td>
<span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?>
-<? if (substr(PHP_OS,0,3) != 'WIN') { $mem = @getMemoryUsage(); PrintXml(fmt(", Memory: %s", $mem)); } ?>
+<?php if (substr(PHP_OS,0,3) != 'WIN') { $mem = @getMemoryUsage(); PrintXml(fmt(", Memory: %s", $mem)); } ?>
</span>
</td></tr></table>
<br class="clear-floats" />
Modified: trunk/themes/Sidebar/templates/search.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/search.tmpl 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/Sidebar/templates/search.tmpl 2010-07-02 08:05:07 UTC (rev 7591)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
// rcs_id('$Id$');
?>
-<!--{{{ LiveSearch --> <? // -*- php -*- ?>
+<!--{{{ LiveSearch --> <?php // -*- php -*- ?>
<div id="searchholder">
<form id="searchform" action="<?php echo WikiURL(_("FindPage"))?>"
method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform">
Modified: trunk/themes/alphatest.php
===================================================================
--- trunk/themes/alphatest.php 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/alphatest.php 2010-07-02 08:05:07 UTC (rev 7591)
@@ -20,7 +20,7 @@
' <a href="#" onmouseover="javascript:changebg(' + n + ')">' + backgroundcolor[n] + '</a>'
); }
//--></script>
-<?
+<?php
function find_pngs($dir) {
$file_list = '';
Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/default/templates/actionbar.tmpl 2010-07-02 08:05:07 UTC (rev 7591)
@@ -14,7 +14,7 @@
<div id="actionbuttons">
<?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
<?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), false, array('id'=>'btn-edit')) ?>
- <? if (ENABLE_WYSIWYG) { ?>
+ <?php if (ENABLE_WYSIWYG) { ?>
<?php echo $SEP?><?php echo Button(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?>
<?php } ?>
<?php } else { ?>
Modified: trunk/themes/default/templates/debug.tmpl
===================================================================
--- trunk/themes/default/templates/debug.tmpl 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/default/templates/debug.tmpl 2010-07-02 08:05:07 UTC (rev 7591)
@@ -16,9 +16,9 @@
</div>
</td><td>
<span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?>
-<? $mem = @getMemoryUsage(); if ($mem) { ?>
+<?php $mem = @getMemoryUsage(); if ($mem) { ?>
<?php echo fmt(", Memory: %s", $mem) ?>
-<? } ?>
+<?php } ?>
</span>
</td></tr></table>
<br class="clear-floats" />
Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl 2010-07-02 07:53:09 UTC (rev 7590)
+++ trunk/themes/default/templates/search.tmpl 2010-07-02 08:05:07 UTC (rev 7591)
@@ -1,4 +1,4 @@
-<!--{{{ LiveSearch --> <? // -*- php -*- ?>
+<!--{{{ LiveSearch --> <?php // -*- php -*- ?>
<div id="searchholder">
<form id="searchform" action="<?php echo WikiURL(_("TitleSearch"))?>"
method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-07-15 15:56:29
|
Revision: 7614
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7614&view=rev
Author: vargenau
Date: 2010-07-15 15:56:21 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
Fix paging
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB.php
trunk/pgsrc/AllPages
trunk/pgsrc/AllPagesCreatedByMe
trunk/pgsrc/AllPagesLastEditedByMe
trunk/pgsrc/AllPagesOwnedByMe
trunk/pgsrc/AllUserPages
trunk/pgsrc/MyRatings
trunk/pgsrc/RateIt
trunk/pgsrc/UserRatings
trunk/themes/gforge/pgsrc/ExternalPages
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/lib/PageList.php 2010-07-15 15:56:21 UTC (rev 7614)
@@ -861,7 +861,9 @@
$this->addPage($page);
}
}
- if ($i and empty($this->_options['count']))
+ if (! is_array($page_iter->_options) || ! array_key_exists('limit_by_db', $page_iter->_options) || ! $page_iter->_options['limit_by_db'])
+ $this->_options['slice'] = 1;
+ if ($i and empty($this->_options['count']))
$this->_options['count'] = $i;
}
@@ -1491,7 +1493,7 @@
count($this->_columns),
$this->_options['limit']);
if ($tokens and !empty($this->_options['slice']))
- $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['COUNT']);
+ $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['SIZE']);
}
foreach ($this->_pages as $pagenum => $page) {
$one_row = $this->_renderPageRow($page, $i++);
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/lib/WikiDB/backend/PearDB.php 2010-07-15 15:56:21 UTC (rev 7614)
@@ -661,14 +661,16 @@
. $orderby;
}
}
- if ($limit) {
+ if ($limit && $orderby) {
// extract from,count from limit
list($from,$count) = $this->limit($limit);
$result = $dbh->limitQuery($sql, $from, $count);
+ $options = array('limit_by_db' => 1);
} else {
$result = $dbh->query($sql);
+ $options = array('limit_by_db' => 0);
}
- return new WikiDB_backend_PearDB_iter($this, $result);
+ return new WikiDB_backend_PearDB_iter($this, $result, $options);
}
/**
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2010-07-15 15:56:21 UTC (rev 7614)
@@ -361,14 +361,16 @@
. $orderby;
}
}
- if ($limit) {
+ if ($limit && $orderby) {
// extract from,count from limit
list($from,$count) = $this->limit($limit);
$result = $dbh->limitQuery($sql, $from, $count);
+ $options = array('limit_by_db' => 1);
} else {
$result = $dbh->query($sql);
+ $options = array('limit_by_db' => 0);
}
- return new WikiDB_backend_PearDB_iter($this, $result);
+ return new WikiDB_backend_PearDB_iter($this, $result, $options);
}
function most_popular($limit=20, $sortby='-hits') {
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/lib/WikiDB.php 2010-07-15 15:56:21 UTC (rev 7614)
@@ -280,6 +280,7 @@
return new WikiDB_PageIterator($this, $result,
array('include_empty' => $include_empty,
'exclude' => $exclude,
+ 'limit_by_db' => $result->_options['limit_by_db'],
'limit' => $result->limit()));
}
Modified: trunk/pgsrc/AllPages
===================================================================
--- trunk/pgsrc/AllPages 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/AllPages 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -11,7 +11,7 @@
Here is the list of **all pages** on this Wiki, including any
[[OrphanedPages|orphaned pages]] which are otherwise inaccessible. [[AllUserPages|Show only user pages]].
-<<AllPages info||=mtime,author,hits limit||=1000 sortby||=pagename>>
+<<AllPages info||=mtime,author,hits sortby||=pagename>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/AllPagesCreatedByMe
===================================================================
--- trunk/pgsrc/AllPagesCreatedByMe 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/AllPagesCreatedByMe 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
The list of pages which were created by you. (If you are authenticated only)
-<<AllPages creator=[] info||=mtime,author,hits limit||=1000 sortby||=pagename>>
+<<AllPages creator=[] info||=mtime,author,hits sortby||=pagename>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/AllPagesLastEditedByMe
===================================================================
--- trunk/pgsrc/AllPagesLastEditedByMe 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/AllPagesLastEditedByMe 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
The list of pages for which you were the last author. (If you are authenticated only)
-<<AllPages author=[] info||=mtime,author,hits limit||=1000 sortby||=pagename>>
+<<AllPages author=[] info||=mtime,author,hits sortby||=pagename>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/AllPagesOwnedByMe
===================================================================
--- trunk/pgsrc/AllPagesOwnedByMe 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/AllPagesOwnedByMe 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
The list of pages which you own. (If you are authenticated only)
-<<AllPages owner=[] info||=mtime,author,hits limit||=1000 sortby||=pagename>>
+<<AllPages owner=[] info||=mtime,author,hits sortby||=pagename>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/AllUserPages
===================================================================
--- trunk/pgsrc/AllUserPages 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/AllUserPages 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
Here is the list of **all user pages** on this Wiki (pages that were not created at initialisation of the wiki). [[AllPages|Show all pages]].
-<<AllPages userpages=1 info||=mtime,author,hits limit||=1000 sortby||=pagename>>
+<<AllPages userpages=1 info||=mtime,author,hits sortby||=pagename>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/MyRatings
===================================================================
--- trunk/pgsrc/MyRatings 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/MyRatings 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Fri, 2 Jul 2010 13:54:01 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,7 +8,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<UserRatings info=ratingvalue limit||=1000 >>
+<<UserRatings info=ratingvalue>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/RateIt
===================================================================
--- trunk/pgsrc/RateIt 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/RateIt 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Fri, 2 Jul 2010 13:54:01 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
<<RateIt show=ratings>>
-<<AllPages info=rating sortby||=-rating limit||=1000>>
+<<AllPages info=rating sortby||=-rating>>
----
[[CategoryActionPage]]
Modified: trunk/pgsrc/UserRatings
===================================================================
--- trunk/pgsrc/UserRatings 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/pgsrc/UserRatings 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Fri, 2 Jul 2010 13:54:01 +0000
+Date: Tue, 13 Jul 2010 17:31:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,7 +8,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<UserRatings limit||=1000 >>
+<<UserRatings>>
----
[[CategoryActionPage]]
Modified: trunk/themes/gforge/pgsrc/ExternalPages
===================================================================
--- trunk/themes/gforge/pgsrc/ExternalPages 2010-07-15 15:18:53 UTC (rev 7613)
+++ trunk/themes/gforge/pgsrc/ExternalPages 2010-07-15 15:56:21 UTC (rev 7614)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:33:18 +0000
+Date: Tue, 13 Jul 2010 17:28:03 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,7 +8,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<AllPages info=external,author sortby=-external limit=10000>>
+<<AllPages info=external,author sortby=-external>>
----
[[CategoryActionPage]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-07-20 09:09:11
|
Revision: 7625
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7625&view=rev
Author: vargenau
Date: 2010-07-20 09:09:04 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
Create user page automagically (for Gforge)
Modified Paths:
--------------
trunk/lib/loadsave.php
trunk/themes/gforge/templates/navbar.tmpl
trunk/themes/gforge/themeinfo.php
Added Paths:
-----------
trunk/themes/gforge/pgsrc/CategoryWiki%20user
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2010-07-18 12:40:33 UTC (rev 7624)
+++ trunk/lib/loadsave.php 2010-07-20 09:09:04 UTC (rev 7625)
@@ -1532,7 +1532,7 @@
} else if (WIKI_NAME == "help") {
$mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
} else {
- $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+ $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
}
foreach (array_merge($mandatory,
$GLOBALS['AllActionPages'],
Added: trunk/themes/gforge/pgsrc/CategoryWiki%20user
===================================================================
--- trunk/themes/gforge/pgsrc/CategoryWiki%20user (rev 0)
+++ trunk/themes/gforge/pgsrc/CategoryWiki%20user 2010-07-20 09:09:04 UTC (rev 7625)
@@ -0,0 +1,16 @@
+Date: Thu, 15 Apr 2010 16:33:18 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=CategoryWiki%20user;
+ flags=EXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+This Category lists **all users who have created their own user page** in this wiki.
+
+<<BackLinks info||=pagename,mtime sortby||=+pagename >>
+
+----
+[[CategoryCategory]]
Property changes on: trunk/themes/gforge/pgsrc/CategoryWiki%20user
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/gforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/gforge/templates/navbar.tmpl 2010-07-18 12:40:33 UTC (rev 7624)
+++ trunk/themes/gforge/templates/navbar.tmpl 2010-07-20 09:09:04 UTC (rev 7625)
@@ -3,6 +3,8 @@
?>
<?php
$curuserprefs = $user->getPreferences();
+$dbh = $request->getDbh();
+$username = $user->UserName();
?>
<tr><td class="submenu"><?php echo WikiLink(_("HomePage"), "","Home Page") ?></td></tr>
@@ -20,5 +22,8 @@
<tr><td class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "","Wiki Admin") ?></td></tr>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
+ <?php if ($dbh->isWikiPage($username)) { ?>
+ <tr><td class="submenu"><?php echo WikiLink($username, "","My User Page") ?></td></tr>
+ <?php } ?>
<tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "","User Preferences") ?></td></tr>
<?php } ?>
Modified: trunk/themes/gforge/themeinfo.php
===================================================================
--- trunk/themes/gforge/themeinfo.php 2010-07-18 12:40:33 UTC (rev 7624)
+++ trunk/themes/gforge/themeinfo.php 2010-07-20 09:09:04 UTC (rev 7625)
@@ -137,6 +137,15 @@
$this->setDateFormat("%d %B %Y");
$this->setTimeFormat("%H:%M");
}
+
+ /* Callback when a new user creates or edits a page */
+ function CbNewUserEdit (&$request, $userid) {
+ $content = "{{Template/UserPage}}\n\n----\n[[CategoryWiki user]]";
+ $dbi =& $request->_dbi;
+ $page = $dbi->getPage($userid);
+ $page->save($content, WIKIDB_FORCE_CREATE, array('author' => $userid));
+ $dbi->touch();
+ }
}
$WikiTheme = new WikiTheme_gforge('gforge');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-09 12:06:21
|
Revision: 7632
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7632&view=rev
Author: vargenau
Date: 2010-08-09 12:06:15 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
This is not true: content can be put before the plugin call
Modified Paths:
--------------
trunk/lib/plugin/RedirectTo.php
trunk/pgsrc/Help%2FRedirectToPlugin
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2010-08-09 12:00:55 UTC (rev 7631)
+++ trunk/lib/plugin/RedirectTo.php 2010-08-09 12:06:15 UTC (rev 7632)
@@ -25,7 +25,6 @@
* Usage:
* <<RedirectTo href="http://www.internet-technology.de/fourwins_de.htm" >>
* or <<RedirectTo page=AnotherPage >>
- * at the VERY FIRST LINE in the content! Otherwise it will be ignored.
*
* Author: Reini Urban <ru...@x-...>
*
Modified: trunk/pgsrc/Help%2FRedirectToPlugin
===================================================================
--- trunk/pgsrc/Help%2FRedirectToPlugin 2010-08-09 12:00:55 UTC (rev 7631)
+++ trunk/pgsrc/Help%2FRedirectToPlugin 2010-08-09 12:06:15 UTC (rev 7632)
@@ -1,4 +1,4 @@
-Date: Mon, 9 Aug 2010 14:00:10 +0000
+Date: Mon, 9 Aug 2010 14:02:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -14,6 +14,7 @@
When redirecting to another wiki page, a note is added to the top of the target
page saying //(Redirected from SomeRedirectingPage)//.
+Redirection to external URLs will only work on locked pages.
== Arguments ==
@@ -36,12 +37,11 @@
== Caveats ==
-The ~RedirectToPlugin invocation must be the first thing on a page.
-For most purposes it makes any other content on the page inaccessible.
+For most purposes, the ~RedirectToPlugin invocation makes any other content on the page inaccessible.
== Example ==
-A page may be made a alias for the HomePage by placing this code at the top:
+A page may be made a alias for the [[HomePage]] by using this code:
{{{
<<RedirectTo page="HomePage">>
}}}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-09 14:00:37
|
Revision: 7633
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7633&view=rev
Author: vargenau
Date: 2010-08-09 14:00:30 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
Consistent naming for templates: TemplateTalk --> Template/Talk
Modified Paths:
--------------
trunk/lib/loadsave.php
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/gforge/templates/actionbar.tmpl
Added Paths:
-----------
trunk/pgsrc/Template%2FTalk
Removed Paths:
-------------
trunk/pgsrc/TemplateTalk
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/lib/loadsave.php 2010-08-09 14:00:30 UTC (rev 7633)
@@ -1528,11 +1528,11 @@
$finder = new FileFinder;
if (!GFORGE) {
- $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
+ $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
} else if (WIKI_NAME == "help") {
- $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
+ $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
} else {
- $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+ $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
}
foreach (array_merge($mandatory,
$GLOBALS['AllActionPages'],
Copied: trunk/pgsrc/Template%2FTalk (from rev 7632, trunk/pgsrc/TemplateTalk)
===================================================================
--- trunk/pgsrc/Template%2FTalk (rev 0)
+++ trunk/pgsrc/Template%2FTalk 2010-08-09 14:00:30 UTC (rev 7633)
@@ -0,0 +1,14 @@
+Date: Mon, 9 Apr 2010 15:32:58 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=Template%2FTalk;
+ flags=EXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+You can discuss here the content of the page.
+
+Do not forget to sign your contribution (you can use the
+Signature button in the edit Toolbar).
Deleted: trunk/pgsrc/TemplateTalk
===================================================================
--- trunk/pgsrc/TemplateTalk 2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/pgsrc/TemplateTalk 2010-08-09 14:00:30 UTC (rev 7633)
@@ -1,14 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
- pagename=TemplateTalk;
- flags=EXTERNAL_PAGE;
- markup=2;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-You can discuss here the content of the page.
-
-Do not forget to sign your contribution (you can use the
-Signature button in the edit Toolbar).
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2010-08-09 14:00:30 UTC (rev 7633)
@@ -22,7 +22,7 @@
<?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
<?php } else { ?>
<?php echo ActionButton(array('action'=>'create',
- 'template'=>_("TemplateTalk")),
+ 'template'=>_("Template/Talk")),
_("Discussion"), $talk->getName()) ?>
<?php } ?>
<?php } ?>
Modified: trunk/themes/gforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/gforge/templates/actionbar.tmpl 2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/themes/gforge/templates/actionbar.tmpl 2010-08-09 14:00:30 UTC (rev 7633)
@@ -31,7 +31,7 @@
<?php } else { ?>
<td>
<?php echo Button(array('action'=>'create',
- 'template'=>_("TemplateTalk")),
+ 'template'=>_("Template/Talk")),
_("Discussion"), $talk->getName()) ?>
</td>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-11 11:58:51
|
Revision: 7638
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7638&view=rev
Author: vargenau
Date: 2010-08-11 11:58:40 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
Harmonize file footer
Modified Paths:
--------------
trunk/RPC2.php
trunk/SOAP.php
trunk/index.php
trunk/lib/AccessLog.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/PageList.php
trunk/lib/RSSWriter091.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/display.php
trunk/lib/gif.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FrameInclude.php
trunk/lib/plugin/GoogleMaps.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/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/NoCache.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/PageDump.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/PopUp.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/RssFeed.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/Transclude.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.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/WikicreoleTable.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
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/tests/CompatInfo.php
trunk/tests/unit/lib/HtmlParserTest.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/XmlRpcTest.php
trunk/tests/unit/test.php
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/lib/RecentChanges.php
trunk/themes/blog/themeinfo.php
trunk/themes/default/themeinfo.php
trunk/themes/gforge/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/wikilens/themeinfo.php
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/RPC2.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
/*
* The guts of this code have been moved to lib/XmlRpcServer.php.
@@ -12,7 +12,7 @@
// Intercept GET requests from confused users. Only POST is allowed here!
if (empty($GLOBALS['HTTP_SERVER_VARS']))
$GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER;
-if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST")
+if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST")
{
die('This is the address of the XML-RPC interface.' .
' You must use XML-RPC calls to access information here.');
@@ -30,12 +30,11 @@
$server = new XmlRpcServer;
$server->service();
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
-?>
\ No newline at end of file
+// End:
+?>
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/SOAP.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -5,11 +5,11 @@
* Please see http://phpwiki.sourceforge.net/phpwiki/PhpWiki.wdsl
* for the wdsl discussion.
*
- * Todo:
- * checkCredentials: set the $GLOBALS['request']->_user object for
+ * Todo:
+ * checkCredentials: set the $GLOBALS['request']->_user object for
* mayAccessPage
* enable native pecl extension (xml-rpc or soap)
- * serverurl:
+ * serverurl:
* Installer helper which changes server url of the default PhpWiki.wdsl
* Or do it dynamically in the soap class? No, the client must connect to us.
*
@@ -51,7 +51,7 @@
$credentials['username'] = $_SERVER['REMOTE_ADDR'];
elseif (isset($GLOBALS['REMOTE_ADDR']))
$credentials['username'] = $GLOBALS['REMOTE_ADDR'];
- else
+ else
$credentials['username'] = $server->host;
}
}
@@ -63,7 +63,7 @@
} else {
$request->_user = new WikiUser($request, $credentials['username']);
}
- $request->_user->AuthCheck(array('userid' => $credentials['username'],
+ $request->_user->AuthCheck(array('userid' => $credentials['username'],
'passwd' => $credentials['password']));
if (! mayAccessPage ($access, $pagename))
$server->fault(401,'',"no permission");
@@ -73,8 +73,8 @@
$GLOBALS['SCRIPT_NAME'] = DATA_PATH . "/SOAP.php";
$url = SERVER_URL . DATA_PATH . "/SOAP.php";
-// Local or external wdsl support is experimental.
-// It works without also. Just the client has to
+// Local or external wdsl support is experimental.
+// It works without also. Just the client has to
// know the wdsl definitions.
$server = new soap_server(/* 'PhpWiki.wdsl' */);
// Now change the server url to ours, because in the wdsl is the original PhpWiki address
@@ -213,7 +213,7 @@
global $server;
checkCredentials($server,$credentials,'view',_("RecentChanges"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
- $params = array('limit' => $limit, 'since' => $since,
+ $params = array('limit' => $limit, 'since' => $since,
'include_minor_revisions' => $include_minor);
$page_iter = $dbi->mostRecent($params);
$pages = array();
@@ -303,13 +303,13 @@
}
return $pages;
}
-/**
+/**
* array listRelations([ Integer option = 1 ])
*
* Returns an array of all available relation names.
* option: 1 relations only ( with 0 also )
* option: 2 attributes only
- * option: 3 both, all names of relations and attributes
+ * option: 3 both, all names of relations and attributes
* option: 4 unsorted, this might be added as bitvalue: 7 = 4+3. default: sorted
* For some semanticweb autofill methods.
*
@@ -318,8 +318,8 @@
function listRelations($option = 1, $credentials=false) {
global $server;
checkCredentials($server,$credentials,'view',_("HomePage"));
- $also_attributes = $option & 2;
- $only_attributes = $option & 2 and !($option & 1);
+ $also_attributes = $option & 2;
+ $only_attributes = $option & 2 and !($option & 1);
$sorted = !($option & 4);
return $dbh->listRelations($also_attributes,
$only_attributes,
@@ -351,12 +351,11 @@
$server->service($GLOBALS['HTTP_RAW_POST_DATA']);
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/index.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -1,15 +1,15 @@
<?php // -*-php-*-
/*
-Copyright 1999,2000,2001,2002,2003,2004,2009 $ThePhpWikiProgrammingTeam
+Copyright 1999,2000,2001,2002,2003,2004,2009 $ThePhpWikiProgrammingTeam
= array(
-"Steve Wainstead", "Clifford A. Adams", "Lawrence Akka",
+"Steve Wainstead", "Clifford A. Adams", "Lawrence Akka",
"Scott R. Anderson", "Jon Åslund", "Neil Brown", "Jeff Dairiki",
"Stéphane Gourichon", "Jan Hidders", "Arno Hollosi", "John Jorgensen",
"Antti Kaihola", "Jeremie Kass", "Carsten Klapp", "Marco Milanesi",
-"Grant Morgan", "Jan Nieuwenhuizen", "Aredridel Niothke",
-"Pablo Roca Rozas", "Sandino Araico Sánchez", "Joel Uckelman",
-"Reini Urban", "Marc-Etienne Vargenau", "Joby Walker", "Tim Voght",
+"Grant Morgan", "Jan Nieuwenhuizen", "Aredridel Niothke",
+"Pablo Roca Rozas", "Sandino Araico Sánchez", "Joel Uckelman",
+"Reini Urban", "Marc-Etienne Vargenau", "Joby Walker", "Tim Voght",
"Jochen Kalmbach");
This file is part of PhpWiki.
@@ -37,30 +37,29 @@
////////////////////////////////////////////////////////////////
// PrettyWiki
-// Check if we were included by some other wiki version
-// (getimg.php, en, de, wiki, ...) or not.
+// Check if we were included by some other wiki version
+// (getimg.php, en, de, wiki, ...) or not.
// If the server requested this index.php fire up the code by loading lib/main.php.
-// Parallel wiki scripts can now simply include /index.php for the
-// main configuration, extend or redefine some settings and
+// Parallel wiki scripts can now simply include /index.php for the
+// main configuration, extend or redefine some settings and
// load lib/main.php by themselves. See the file 'wiki'.
// This overcomes the IndexAsConfigProblem.
-// Generally a simple
+// Generally a simple
// define('VIRTUAL_PATH', $_SERVER['SCRIPT_NAME']);
// is enough in the wiki file, plus the action definition in a .htaccess file
////////////////////////////////////////////////////////////////
// If every page is just empty, comment the if (@is_dir line out,
// to force include "lib/main.php".
-// Without the dir check it might fail for index.php via DirectoryIndex
+// Without the dir check it might fail for index.php via DirectoryIndex
if (@is_dir(SCRIPT_FILENAME) or realpath(SCRIPT_FILENAME) == realpath(__FILE__))
include(dirname(__FILE__)."/lib/main.php");
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/AccessLog.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -52,7 +52,7 @@
//$request->_accesslog =& $this;
//if (empty($request->_accesslog->entries))
register_shutdown_function("Request_AccessLogEntry_shutdown_function");
-
+
if ($do_sql) {
if (!$request->_dbi->isSQL()) {
trigger_error("Unsupported database backend for ACCESS_LOG_SQL.\nNeed DATABASE_TYPE=SQL or ADODB or PDO");
@@ -126,7 +126,7 @@
if ($this->logtable) {
// mysql specific only:
return $this->read_sql("request_host=".$this->_dbi->quote($host)
- ." AND time_stamp > ". (time()-$since_minutes*60)
+ ." AND time_stamp > ". (time()-$since_minutes*60)
." ORDER BY time_stamp DESC");
} else {
$iter = new WikiDB_Array_generic_iter();
@@ -215,7 +215,7 @@
/**
* Constructor.
*
- * The log entry will be automatically appended to the log file or
+ * The log entry will be automatically appended to the log file or
* SQL table when the current request terminates.
*
* If you want to modify a Request_AccessLogEntry before it gets
@@ -267,7 +267,7 @@
function setStatus ($status) {
$this->status = $status;
}
-
+
/**
* Set response size.
*
@@ -281,7 +281,7 @@
// Workaround:
$this->duration = str_replace(",",".",sprintf("%f",$seconds));
}
-
+
/**
* Get time zone offset.
*
@@ -351,7 +351,7 @@
/* If ACCESS_LOG_SQL & 2 we do write it by our own */
function write_sql() {
global $request;
-
+
$dbh =& $request->_dbi;
if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) {
//$log_tbl =& $this->_accesslog->logtable;
@@ -365,7 +365,7 @@
if (!empty($args['pref']['passwd2'])) $args['pref']['passwd2'] = '<not displayed>';
$this->request_args = substr(serialize($args),0,254); // if VARCHAR(255) is used.
} else {
- $this->request_args = $request->get('QUERY_STRING');
+ $this->request_args = $request->get('QUERY_STRING');
}
$this->request_method = $request->get('REQUEST_METHOD');
$this->request_uri = $request->get('REQUEST_URI');
@@ -383,7 +383,7 @@
*/
function Request_AccessLogEntry_shutdown_function () {
global $request;
-
+
if (isset($request->_accesslog->entries) and $request->_accesslog->logfile)
foreach ($request->_accesslog->entries as $entry) {
$entry->write_file();
@@ -435,12 +435,12 @@
$query = '';
$backend_type = $request->_dbi->_backend->backendType();
switch ($backend_type) {
- case 'mysql':
+ case 'mysql':
$Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))"; break;
- case 'pgsql':
- case 'postgres7':
+ case 'pgsql':
+ case 'postgres7':
$Referring_URL = "substr(referer,0,position('?' in referer))"; break;
- default:
+ default:
$Referring_URL = "referer";
}
switch ($args['mode']) {
@@ -470,12 +470,12 @@
if ($where_conditions<>'')
$where_conditions = 'WHERE '.$where_conditions.' ';
switch ($backend_type) {
- case 'mysql':
+ case 'mysql':
$Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))"; break;
- case 'pgsql':
- case 'postgres7':
+ case 'pgsql':
+ case 'postgres7':
$Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')"; break;
- default:
+ default:
$Referring_Domain = "referer"; break;
}
$query = "SELECT "
@@ -552,13 +552,13 @@
// If PHPSESSID appears in the URI, just display the URI to the left of this
$sessname = session_name();
switch ($backend_type) {
- case 'mysql':
+ case 'mysql':
$Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))";
break;
- case 'pgsql':
- case 'postgres7':
+ case 'pgsql':
+ case 'postgres7':
$Request_URI = "regexp_replace(request_uri, '$sessname.*', '')"; break;
- default:
+ default:
$Request_URI = 'request_uri'; break;
}
$now = time();
@@ -608,7 +608,7 @@
return array(
'mode' => 'referring_domains',
// referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits
- 'caption' => '',
+ 'caption' => '',
// blank means use the mode as the caption/title for the output
'local_referrers' => 'true', // only show external referring sites
'period' => '', // the type of period to report:
@@ -698,19 +698,19 @@
$len = strlen($localhost);
$backend_type = $request->_dbi->_backend->backendType();
switch ($backend_type) {
- case 'mysql':
+ case 'mysql':
$ref_localhost = "left(referer,$len)<>'$localhost'"; break;
- case 'pgsql':
- case 'postgres7':
+ case 'pgsql':
+ case 'postgres7':
$ref_localhost = "substr(referer,0,$len)<>'$localhost'"; break;
- default:
+ default:
$ref_localhost = "";
}
$where_conditions = $where_conditions.$ref_localhost;
}
// The assumed contract is that there is a space at the end of the
- // conditions string, so that following SQL clauses (such as GROUP BY)
+ // conditions string, so that following SQL clauses (such as GROUP BY)
// will not cause a syntax error
if ($where_conditions<>'')
$where_conditions = $where_conditions.' ';
@@ -729,7 +729,6 @@
}
-// For emacs users
// Local Variables:
// mode: php
// tab-width: 8
@@ -737,5 +736,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-// vim: expandtab shiftwidth=4:
?>
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/BlockParser.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -4,17 +4,17 @@
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
* This file is part of PhpWiki.
- *
+ *
* PhpWiki is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* PhpWiki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with PhpWiki; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -24,11 +24,11 @@
require_once('lib/InlineParser.php');
/**
- * Deal with paragraphs and proper, recursive block indents
+ * Deal with paragraphs and proper, recursive block indents
* for the new style markup (version 2)
*
* Everything which goes over more than line:
- * automatic lists, UL, OL, DL, table, blockquote, verbatim,
+ * automatic lists, UL, OL, DL, table, blockquote, verbatim,
* p, pre, plugin, ...
*
* FIXME:
@@ -36,12 +36,12 @@
* (old-style) tables
* FIXME: unify this with the RegexpSet in InlineParser.
*
- * FIXME: This is very php5 sensitive: It was fixed for 1.3.9,
- * but is again broken with the 1.3.11
+ * FIXME: This is very php5 sensitive: It was fixed for 1.3.9,
+ * but is again broken with the 1.3.11
* allow_call_time_pass_reference clean fixes
*
* @package Markup
- * @author: Geoffrey T. Dairiki
+ * @author: Geoffrey T. Dairiki
*/
/**
@@ -97,7 +97,7 @@
if (! preg_match($this->_re, $text, $m)) {
return false;
}
-
+
$match = new AnchoredRegexpSet_match;
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
@@ -136,7 +136,7 @@
if (! preg_match($pat, $text, $m)) {
return false;
}
-
+
$match = new AnchoredRegexpSet_match;
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
@@ -146,11 +146,11 @@
}
-
+
class BlockParser_Input {
function BlockParser_Input ($text) {
-
+
// Expand leading tabs.
// FIXME: do this better.
//
@@ -182,14 +182,14 @@
}
return $this->_atSpace;
}
-
+
function currentLine () {
if ($this->_pos >= count($this->_lines)) {
return false;
}
return $this->_lines[$this->_pos];
}
-
+
function nextLine () {
$this->_atSpace = $this->_lines[$this->_pos++] === '';
if ($this->_pos >= count($this->_lines)) {
@@ -202,7 +202,7 @@
$this->_atSpace = ($this->_lines[$this->_pos] === '');
$this->_pos++;
}
-
+
function getPos () {
return array($this->_pos, $this->_atSpace);
}
@@ -225,7 +225,7 @@
else
return "<EOF>";
}
-
+
function _debug ($tab, $msg) {
//return ;
$where = $this->where();
@@ -233,7 +233,7 @@
printXML(HTML::div("$tab $msg: at: '",
HTML::tt($where),
"'"));
- flush();
+ flush();
}
}
@@ -271,7 +271,7 @@
else
return $this->_atSpace;
}
-
+
function currentLine () {
return $this->_line;
}
@@ -296,7 +296,7 @@
function advance () {
$this->nextLine();
}
-
+
function getPos () {
return array($this->_line, $this->_atSpace, $this->_input->getPos());
}
@@ -306,7 +306,7 @@
$this->_atSpace = $pos[1];
$this->_input->setPos($pos[2]);
}
-
+
function getPrefix () {
assert ($this->_line !== false);
$line = $this->_input->currentLine();
@@ -322,7 +322,7 @@
return $this->_input->where();
}
}
-
+
class Block_HtmlElement extends HtmlElement
{
@@ -335,7 +335,7 @@
}
class ParsedBlock extends Block_HtmlElement {
-
+
function ParsedBlock (&$input, $tag = 'div', $attr = false) {
$this->Block_HtmlElement($tag, $attr);
$this->_initBlockTypes();
@@ -345,8 +345,8 @@
function _parse (&$input) {
// php5 failed to advance the block. php5 copies objects by ref.
// nextBlock == block, both are the same objects. So we have to clone it.
- for ($block = $this->_getBlock($input);
- $block;
+ for ($block = $this->_getBlock($input);
+ $block;
$block = (is_object($nextBlock) ? clone($nextBlock) : $nextBlock))
{
while ($nextBlock = $this->_getBlock($input)) {
@@ -399,7 +399,7 @@
$this->_atSpace = $input->skipSpace();
$line = $input->currentLine();
- if ($line === false or $line === '') { // allow $line === '0'
+ if ($line === false or $line === '') { // allow $line === '0'
return false;
}
$tight_top = !$this->_atSpace;
@@ -409,7 +409,7 @@
$block = clone($this->_block_types[$m->regexp_ind]);
if (DEBUG & _DEBUG_PARSER)
$input->_debug('>', get_class($block));
-
+
if ($block->_match($input, $m)) {
//$block->_text = $line;
if (DEBUG & _DEBUG_PARSER)
@@ -421,7 +421,7 @@
if (DEBUG & _DEBUG_PARSER)
$input->_debug('[', "_match failed");
}
- if ($line === false or $line === '') // allow $line === '0'
+ if ($line === false or $line === '') // allow $line === '0'
return false;
trigger_error("Couldn't match block: '$line'", E_USER_NOTICE);
@@ -500,7 +500,7 @@
'blockquote');
return true;
}
-
+
function merge ($nextBlock) {
if (get_class($nextBlock) == get_class($this)) {
assert ($nextBlock->_depth < $this->_depth);
@@ -535,7 +535,7 @@
if (preg_match('/[*#+-o]/', $input->getPrefix())) {
return false;
}
-
+
$prefix = $m->match;
$indent = sprintf("\\ {%d}", strlen($prefix));
@@ -619,7 +619,7 @@
{
var $nrows;
var $ncols;
-
+
function Block_table_dl_defn ($term, $defn) {
$this->XmlContent();
if (!is_array($defn))
@@ -647,7 +647,7 @@
$this->_tight_top = $tight_top;
$this->_tight_bot = $tight_bot;
}
-
+
function _addToRow ($item) {
if (empty($this->_accum)) {
$this->_accum = HTML::td();
@@ -663,7 +663,7 @@
$row->setTightness($this->_next_tight_top, $tight_bottom);
$this->_next_tight_top = $tight_bottom;
-
+
$this->pushContent($row);
$this->_accum = false;
$this->_nrows++;
@@ -675,7 +675,7 @@
return;
$this->_flushRow($table_rows[0]->_tight_top);
-
+
foreach ($table_rows as $subdef) {
$this->pushContent($subdef);
$this->_nrows += $subdef->nrows();
@@ -690,7 +690,7 @@
else
$first_row->unshiftContent($th);
}
-
+
function _ComputeNcols ($defn) {
$ncols = 2;
foreach ($defn as $item) {
@@ -774,7 +774,7 @@
function _setTightness($top, $bot) {
$this->_content[0]->setTightness($top, $bot);
}
-
+
function finish () {
$defs = &$this->_content;
@@ -782,7 +782,7 @@
$ncols = 0;
foreach ($defs as $defn)
$ncols = max($ncols, $defn->ncols());
-
+
foreach ($defs as $key => $defn)
$defs[$key]->setWidth($ncols);
@@ -807,7 +807,7 @@
if (!preg_match('/[*#;]*$/A', $input->getPrefix())) {
return false;
}
-
+
$prefix = $m->match;
$oldindent = '[*#;](?=[#*]|;.*:.*\S)';
@@ -873,7 +873,7 @@
*/
echo 'count($this->_content): ', count($this->_content),"\n";
echo "\$this->_content[0]: "; var_dump ($this->_content[0]);
-
+
for ($i=1; $i < min(5, count($this->_content)); $i++) {
$c =& $this->_content[$i];
echo '$this->_content[',$i,"]: \n";
@@ -918,12 +918,12 @@
}
}
$input->advance();
-
+
if ($m->match == '<nowiki>')
$text = join("<br>\n", $text);
else
$text = join("\n", $text);
-
+
// FIXME: no <img>, <big>, <small>, <sup>, or <sub>'s allowed
// in a <pre>.
if ($m->match == '<pre>') {
@@ -1198,7 +1198,7 @@
{
var $_attr = array('class' => 'mail-style-quote');
var $_re = '>\ ?';
-
+
function _match (&$input, $m) {
//$indent = str_replace(' ', '\\ ', $m->match) . '|>$';
$indent = $this->_re;
@@ -1235,14 +1235,14 @@
class Block_heading extends BlockMarkup
{
var $_re = '!{1,3}';
-
+
function _match (&$input, $m) {
$tag = "h" . (5 - strlen($m->match));
$text = TransformInline(trim($m->postmatch));
$input->advance();
$this->_element = new Block_HtmlElement($tag, false, $text);
-
+
return true;
}
}
@@ -1250,7 +1250,7 @@
class Block_heading_wikicreole extends BlockMarkup
{
var $_re = '={2,6}';
-
+
function _match (&$input, $m) {
$tag = "h" . strlen($m->match);
// Remove spaces
@@ -1261,7 +1261,7 @@
$input->advance();
$this->_element = new Block_HtmlElement($tag, false, $text);
-
+
return true;
}
}
@@ -1312,7 +1312,7 @@
$tag = 'div';
}
// without last >
- $argstr = substr(trim(substr($m->match,strlen($tag)+1)),0,-1);
+ $argstr = substr(trim(substr($m->match,strlen($tag)+1)),0,-1);
$pos = $input->getPos();
$pi = $content = $m->postmatch;
while (!preg_match('/^(.*)\<\/'.$tag.'\>(.*)$/i', $pi, $me)) {
@@ -1330,9 +1330,9 @@
$input->advance();
if (strstr($content, "\n"))
$content = TransformText($content);
- else
+ else
$content = TransformInline($content);
- if (!$argstr)
+ if (!$argstr)
$args = false;
else {
$args = array();
@@ -1398,12 +1398,11 @@
return new XmlContent($output->getContent());
}
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/CachedMarkup.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -1,21 +1,21 @@
-<?php
+<?php
// rcs_id('$Id$');
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
* This file is part of PhpWiki.
- *
+ *
* PhpWiki is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* PhpWiki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with PhpWiki; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -62,7 +62,7 @@
// ZLIB format has a five bit checksum in it's header.
// Lets check for sanity.
if (((ord($packed[0]) * 256 + ord($packed[1])) % 31 == 0)
- and (substr($packed,0,2) == "\037\213")
+ and (substr($packed,0,2) == "\037\213")
or (substr($packed,0,2) == "x\332")) // 120, 218
{
if (function_exists('gzuncompress')) {
@@ -84,11 +84,11 @@
if (preg_match("/^\w+$/", $packed))
return $packed;
// happened with _BackendInfo problem also.
- trigger_error("Can't unpack bad cached markup. Probably php_zlib extension not loaded.",
+ trigger_error("Can't unpack bad cached markup. Probably php_zlib extension not loaded.",
E_USER_WARNING);
return false;
}
-
+
/** Get names of wikipages linked to.
*
* @return array of hashes { linkto=>pagename, relation=>pagename }
@@ -102,7 +102,7 @@
continue;
$links = array_merge($links, $item_links);
}
- // array_unique has a bug with hashes!
+ // array_unique has a bug with hashes!
// set_links checks for duplicates, array_merge does not
//return array_unique($links);
return $links;
@@ -181,7 +181,7 @@
. ".*"
. "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)";
}
-
+
if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text))
$this->_description = preg_replace("/\s*\n\s*/", " ", trim($text));
}
@@ -204,18 +204,18 @@
function getDescription () {
return isset($this->_description) ? $this->_description : '';
}
-
+
function asXML () {
$xml = '';
$basepage = $this->_basepage;
-
+
foreach ($this->_content as $item) {
if (is_string($item)) {
$xml .= $item;
}
- elseif (is_subclass_of($item,
- check_php_version(5)
- ? 'Cached_DynamicContent'
+ elseif (is_subclass_of($item,
+ check_php_version(5)
+ ? 'Cached_DynamicContent'
: 'cached_dynamiccontent'))
{
$val = $item->expand($basepage, $this);
@@ -236,11 +236,11 @@
if (is_string($item)) {
print $item;
}
- elseif (is_subclass_of($item,
- check_php_version(5)
- ? 'Cached_DynamicContent'
- : 'cached_dynamiccontent'))
- { // give the content the chance to know about itself or even
+ elseif (is_subclass_of($item,
+ check_php_version(5)
+ ? 'Cached_DynamicContent'
+ : 'cached_dynamiccontent'))
+ { // give the content the chance to know about itself or even
// to change itself
$val = $item->expand($basepage, $this);
if ($val) $val->printXML();
@@ -251,7 +251,7 @@
}
}
}
-}
+}
/**
* The base class for all dynamic content.
@@ -301,7 +301,7 @@
$this->_getURL($basepage),
$this->_getRelation($basepage));
}
-
+
function _getURL($basepage) {
return $this->_url;
}
@@ -343,18 +343,18 @@
if (substr($this->_page,0,1) == ':') {
$this->_page = substr($this->_page,1);
$this->_nolink = true;
- }
+ }
if ($anchor)
$this->_anchor = $anchor;
if ($label and $label != $page)
$this->_label = $label;
- $this->_basepage = false;
+ $this->_basepage = false;
}
function _getType() {
return 'internal';
}
-
+
function getPagename($basepage) {
$page = new WikiPageName($this->_page, $basepage);
if ($page->isValid()) return $page->name;
@@ -364,9 +364,9 @@
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
if (isset($this->_nolink)) return false;
- if ($link = $this->getPagename($basepage))
+ if ($link = $this->getPagename($basepage))
return array(array('linkto' => $link));
- else
+ else
return false;
}
@@ -428,7 +428,7 @@
}
return WikiLink($this->_page, 'if_known');
}
-}
+}
class Cached_SpellCheck extends Cached_WikiLink
{
@@ -438,14 +438,14 @@
}
function expand($basepage, &$markup) {
- $link = HTML::a(array('class' => 'spell-wrong',
+ $link = HTML::a(array('class' => 'spell-wrong',
'title' => 'SpellCheck: '.join(', ', $this->suggestions),
- 'name' => $this->_page),
+ 'name' => $this->_page),
$this->_page);
return $link;
}
-}
-
+}
+
class Cached_PhpwikiURL extends Cached_DynamicContent
{
function Cached_PhpwikiURL ($url, $label) {
@@ -479,16 +479,16 @@
return $this->_label;
return $this->_url;
}
-}
+}
/*
* Relations (::) are named links to pages.
- * Attributes (:=) are named metadata per page, "named links to numbers with units".
+ * Attributes (:=) are named metadata per page, "named links to numbers with units".
* We don't want to exhaust the linktable with numbers,
- * since this would create empty pages per each value,
- * so we don't store the attributes as full relationlink.
- * But we do store the attribute name as relation with an empty pagename
- * to denote that this is an attribute,
+ * since this would create empty pages per each value,
+ * so we don't store the attributes as full relationlink.
+ * But we do store the attribute name as relation with an empty pagename
+ * to denote that this is an attribute,
* and to enable a fast listRelations mode=attributes
*/
class Cached_SemanticLink extends Cached_WikiLink {
@@ -519,12 +519,12 @@
if (!isset($this->_page) and isset($this->_attribute)) {
// An attribute: we store it in the basepage now, to fill the cache for page->save
// TODO: side-effect free query
- $page = $GLOBALS['request']->getPage($basepage);
+ $page = $GLOBALS['request']->getPage($basepage);
$page->setAttribute($this->_relation, $this->_attribute);
$this->_page = $basepage;
return array(array('linkto' => '', 'relation' => $this->_relation));
}
- if ($link = $this->getPagename($basepage))
+ if ($link = $this->getPagename($basepage))
return array(array('linkto' => $link, 'relation' => $this->_relation));
else
return false;
@@ -539,10 +539,10 @@
$is_attribute = ($m[2] == ':=');
if ($is_attribute) {
$this->_attribute = urldecode($m[3]);
- // since this stored in the markup cache, we are extra sensible
+ // since this stored in the markup cache, we are extra sensible
// not to store false empty stuff.
$units = new Units();
- if (!DISABLE_UNITS and !$units->errcode)
+ if (!DISABLE_UNITS and !$units->errcode)
{
$this->_attribute_base = $units->Definition($this->_attribute);
$this->_unit = $units->baseunit($this->_attribute);
@@ -572,8 +572,8 @@
(
HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page),
'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
- 'title' => $is_attribute
- ? $title
+ 'title' => $is_attribute
+ ? $title
: sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
$label)
);
@@ -617,7 +617,7 @@
}
}
-/**
+/**
* Highlight found search engine terms
*/
class Cached_SearchHighlight extends Cached_DynamicContent
@@ -632,8 +632,8 @@
'title' => _("Found by ") . $this->engine),
$this->_word);
}
-}
-
+}
+
class Cached_ExternalLink extends Cached_Link {
function Cached_ExternalLink($url, $label=false) {
@@ -645,7 +645,7 @@
function _getType() {
return 'external';
}
-
+
function _getName($basepage) {
$label = isset($this->_label) ? $this->_label : false;
return ($label and is_string($label)) ? $label : $this->_url;
@@ -658,7 +658,7 @@
$link = LinkURL($this->_url, $label);
if (GOOGLE_LINKS_NOFOLLOW) {
- // Ignores nofollow when the user who saved the page was authenticated.
+ // Ignores nofollow when the user who saved the page was authenticated.
$page = $request->getPage($basepage);
$current = $page->getCurrentRevision(false);
if (!$current->get('author_id'))
@@ -675,7 +675,7 @@
}
class Cached_InterwikiLink extends Cached_ExternalLink {
-
+
function Cached_InterwikiLink($link, $label=false) {
$this->_link = $link;
if ($label)
@@ -706,7 +706,7 @@
$label = isset($this->_label) ? $this->_label : false;
return ($label and is_string($label)) ? $label : $this->_link;
}
-
+
/* there may be internal interwiki links also */
function _getType() {
return $this->getPagename(false) ? 'internal' : 'external';
@@ -737,7 +737,7 @@
}
// Needed to put UserPages to backlinks. Special method to markup userpages with icons
-// Thanks to PhpWiki:DanFr for finding this bug.
+// Thanks to PhpWiki:DanFr for finding this bug.
// Fixed since 1.3.8, prev. versions had no userpages in backlinks
class Cached_UserLink extends Cached_WikiLink {
function expand($basepage, &$markup) {
@@ -753,7 +753,7 @@
}
/**
- * 1.3.13: Previously stored was only _pi.
+ * 1.3.13: Previously stored was only _pi.
* A fresh generated cache has now ->name and ->args also.
* main::isActionPage only checks the raw content.
*/
@@ -771,7 +771,7 @@
function setTightness($top, $bottom) {
}
-
+
function isInlineElement() {
return false;
}
@@ -803,12 +803,11 @@
}
}
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/DbaDatabase.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -19,7 +19,7 @@
$this->_error(
sprintf(
_("The DBA handler %s is unsupported!")."\n".
- _("Supported handlers are: %s"),
+ _("Supported handlers are: %s"),
$handler, join(",",dba_handlers())));
}
$this->readonly = false;
@@ -30,11 +30,11 @@
function set_timeout($timeout) {
$this->_timeout = $timeout;
}
-
+
function open($mode = 'w') {
if ($this->_dbh)
return; // already open.
-
+
$watchdog = $this->_timeout;
global $ErrorManager;
@@ -45,7 +45,7 @@
if (!function_exists("dba_open")) {
echo "You don't seem to have DBA support compiled into PHP.";
}
-
+
if (READONLY) {
$mode = 'r';
}
@@ -62,12 +62,12 @@
if ($watchdog <= 0)
break;
// "c" failed, try "w" instead.
- if ($mode == "w"
- and file_exists($this->_file)
+ if ($mode == "w"
+ and file_exists($this->_file)
and (isWindows() or !is_writable($this->_file)))
{
// try to continue with read-only
- if (!defined("READONLY"))
+ if (!defined("READONLY"))
define("READONLY", true);
$GLOBALS['request']->_dbi->readonly = true;
$this->readonly = true;
@@ -116,7 +116,7 @@
function exists($key) {
return dba_exists($key, $this->_dbh);
}
-
+
function fetch($key) {
$val = dba_fetch($key, $this->_dbh);
if ($val === false)
@@ -134,7 +134,7 @@
return $this->_error("replace($key)");
}
-
+
function firstkey() {
return dba_firstkey($this->_dbh);
}
@@ -182,7 +182,7 @@
return $this->_error("optimize()");
return 1;
}
-
+
function _error($mes) {
//trigger_error("DbaDatabase: $mes", E_USER_WARNING);
//return false;
@@ -201,12 +201,11 @@
}
}
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/DbaListSet.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -52,7 +52,7 @@
list( $prev , , ) = explode(':', $this->_dbh->fetch(intval($i)), 3);
return intval($prev);
}
-
+
function exists($i) {
$i = intval($i);
return $i && $this->_dbh->exists($i);
@@ -68,7 +68,7 @@
list($prev, $next,) = explode(':', $dbh->fetch(intval($i)), 3);
$dbh->replace($i, "$prev:$next:$data");
}
-
+
function insert_before($i, $data) {
assert(intval($i));
return $this->_insert_before_nc($i, $data);
@@ -78,7 +78,7 @@
assert(intval($i));
return $this->_insert_after_nc($i, $data);
}
-
+
function append($seq, $data) {
$key = "s" . urlencode($seq);
$this->_insert_before_nc($key, $data);
@@ -88,7 +88,7 @@
$key = "s" . urlencode($seq);
$this->_insert_after_nc($key, $data);
}
-
+
function _insert_before_nc($i, &$data) {
$newkey = $this->_new_key();
$old_prev = $this->_setprev($i, $newkey);
@@ -135,8 +135,6 @@
}
}
-
-// For emacs users
// Local Variables:
// mode: php
// tab-width: 8
@@ -144,4 +142,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/ErrorManager.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -4,7 +4,7 @@
// php5: ignore E_STRICT (var warnings)
/*
-if (defined('E_STRICT')
+if (defined('E_STRICT')
and (E_ALL & E_STRICT)
and (error_reporting() & E_STRICT)) {
echo " errormgr: error_reporting=", error_reporting();
@@ -17,9 +17,9 @@
E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5,3)) ? E_DEPRECATED : 0));
define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE);
-/* It is recommended to leave assertions on.
+/* It is recommended to leave assertions on.
You can simply comment the two lines below to leave them on.
- Only where absolute speed is necessary you might want to turn
+ Only where absolute speed is necessary you might want to turn
them off.
*/
//also turn it on if phpwiki_version notes no release
@@ -40,8 +40,8 @@
* of it --- you can access the one instance via $GLOBALS['ErrorManager'].
*
* FIXME: more docs.
- */
-class ErrorManager
+ */
+class ErrorManager
{
/**
* Constructor.
@@ -97,7 +97,7 @@
else
echo $this->_flush_errors();
}
-
+
/**
* Get rid of all pending error messages in case of all non-html
* - pdf or image - output.
@@ -112,7 +112,7 @@
*
* This also flushes the postponed error queue.
*
- * @return object HTML describing any queued errors (or false, if none).
+ * @return object HTML describing any queued errors (or false, if none).
*/
function getPostponedErrorsAsHTML() {
$flushed = $this->_flush_errors();
@@ -129,14 +129,14 @@
}
if ($worst_err->isNotice())
return $flushed;
- $class = $worst_err->getHtmlClass();
+ $class = $worst_err->getHtmlClass();
$html = HTML::div(array('style' => 'border: none', 'class' => $class),
- HTML::h4(array('class' => 'errors'),
+ HTML::h4(array('class' => 'errors'),
"PHP " . $worst_err->getDescription()));
$html->pushContent($flushed);
return $html;
}
-
+
/**
* Push a custom error handler on the handler stack.
*
@@ -228,7 +228,7 @@
if (!empty($GLOBALS['request']->_finishing)) {
$this->_postpone_mask = 0;
}
-
+
$in_handler = true;
foreach ($this->_handlers as $handler) {
@@ -282,7 +282,7 @@
else if (($error->errno & error_reporting()) != 0) {
if (($error->errno & $this->_postpone_mask) != 0) {
if ((function_exists('isa') and isa($error, 'PhpErrorOnce'))
- or (!function_exists('isa') and
+ or (!function_exists('isa') and
(
// stdlib independent isa()
(strtolower(get_class($error)) == 'phperroronce')
@@ -311,7 +311,7 @@
function warning($msg, $errno = E_USER_NOTICE) {
$this->handleError(new PhpWikiError($errno, $msg, '?', '?'));
}
-
+
/**
* @access private
*/
@@ -355,7 +355,7 @@
$request->_validators->_mtime = false;
}
if ($already) return;
-
+
// FIXME: Howto announce that to Request->cacheControl()?
if (!headers_sent()) {
header( "Cache-control: no-cache" );
@@ -370,7 +370,7 @@
*
* This is necessary since PHP's set_error_handler() does not allow
* one to set an object method as a handler.
- *
+ *
* @access private
*/
function ErrorManager_errorHandler($errno, $errstr, $errfile, $errline)
@@ -461,7 +461,7 @@
return 'errors';
}
}
-
+
function getDescription() {
if ($this->isNotice()) {
return 'Notice';
@@ -482,7 +482,7 @@
$dir = str_replace('/','\\',$dir);
$this->errfile = str_replace('/','\\',$this->errfile);
$dir .= "\\";
- } else
+ } else
$dir .= '/';
$errfile = preg_replace('|^' . preg_quote($dir) . '|', '', $this->errfile);
$lines = explode("\n", $this->errstr);
@@ -502,7 +502,7 @@
$this->getDescription(),
array_shift($lines));
}
-
+
$html = HTML::div(array('class' => $this->getHtmlClass()), HTML::p($msg));
// The class is now used for the div container.
// $html = HTML::div(HTML::p($msg));
@@ -512,7 +512,7 @@
$list->pushContent(HTML::li($line));
$html->pushContent($list);
}
-
+
return $html;
}
@@ -569,7 +569,7 @@
}
function _getDetail() {
- return HTML::div(array('class' => $this->getHtmlClass()),
+ return HTML::div(array('class' => $this->getHtmlClass()),
HTML::p($this->getDescription() . ": $this->errstr"));
}
}
@@ -577,7 +577,7 @@
/**
* A class representing a Php warning, printed only the first time.
*
- * Similar to PhpError, except only the first same error message is printed,
+ * Similar to PhpError, except only the first same error message is printed,
* with number of occurences.
*/
class PhpErrorOnce extends PhpError {
@@ -606,7 +606,7 @@
}
return $this->_count;
}
-
+
function _getDetail($count=0) {
if (!$count) $count = $this->_count;
$dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__),0,-4);
@@ -614,7 +614,7 @@
$dir = str_replace('/','\\',$dir);
$this->errfile = str_replace('/','\\',$this->errfile);
$dir .= "\\";
- } else
+ } else
$dir .= '/';
$errfile = preg_replace('|^' . preg_quote($dir) . '|', '', $this->errfile);
if (is_string($this->errstr))
@@ -636,7 +636,7 @@
array_shift($lines),
$count > 1 ? sprintf(" (...repeated %d times)",$count) : "");
}
- $html = HTML::div(array('class' => $this->getHtmlClass()),
+ $html = HTML::div(array('class' => $this->getHtmlClass()),
HTML::p($msg));
if ($lines) {
$list = HTML::ul();
@@ -644,7 +644,7 @@
$list->pushContent(HTML::li($line));
$html->pushContent($list);
}
-
+
return $html;
}
}
@@ -659,7 +659,6 @@
$GLOBALS['ErrorManager'] = new ErrorManager;
}
-// (c-file-style: "gnu")
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/ExternalReferrer.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -1,11 +1,11 @@
<?php
// rcs_id('$Id$');
-/**
+/**
* Detect external referrers
* Currently only search engines, and highlight the searched item.
*
- * Todo:
+ * Todo:
* store all external referrers in (rotatable) log/db for a RecentReferrers plugin.
*/
if (!function_exists('isExternalReferrer')) { // also defined in stdlib.php
@@ -23,7 +23,7 @@
class SearchEngines {
- var $searchEngines =
+ var $searchEngines =
array(
"search.sli.sympatico.ca/" => array("engine" => "Sympatico", "query1" => "query=", "query2" => "", "url" => "http://www1.sympatico.ca/"),
"www.search123.com/cgi-bin/" => array("engine" => "Search123", "query1" => "query=", "query2" => "", "url" => "http://www.search123.com/"),
@@ -64,10 +64,10 @@
"lycos." => array("engine" => "Lycos", "query1" => "query=", "query2" => "", "url" => "http://www.lycos.com/"),
"msn." => array("engine" => "MSN", "query1" => "q=", "query2" => "", "url" => "http://search.msn.com/"),
"dmoz." => array("engine" => "Dmoz", "query1" => "search=", "query2" => "", "url" => "http://www.dmoz.org/"),
-
+
);
- /**
+ /**
* parseSearchQuery(url)
* Parses the passed refering url looking for search engine data. If search info is found,
* the method determines the name of the search engine, it's URL, and the search keywords
@@ -115,7 +115,6 @@
}
}
-// For emacs users
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/HtmlElement.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -33,7 +33,7 @@
assert(count($args) >= 1);
assert(is_string($args[0]));
$this->_tag = array_shift($args);
-
+
if ($args && is_array($args[0]))
$this->_attr = array_shift($args);
else {
@@ -56,7 +56,7 @@
elseif ($args[0] === false)
array_shift($args);
}
-
+
if (count($args) == 1 && is_array($args[0]))
$args = $args[0];
$this->_content = $args;
@@ -89,15 +89,15 @@
if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
{
$this->_attr['title'] = preg_replace
- ("/\[(alt-)?(.)\]$/",
- "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
+ ("/\[(alt-)?(.)\]$/",
+ "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
$this->_attr['title']);
} else {
- $this->_attr['title'] .=
+ $this->_attr['title'] .=
" [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
}
} else {
- $this->_attr['title'] =
+ $this->_attr['title'] =
"[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
}
}
@@ -126,7 +126,7 @@
function raw ($html_text) {
return new RawXml($html_text);
}
-
+
function getTagProperties($tag) {
$props = &$GLOBALS['HTML_TagProperties'];
return isset($props[$tag]) ? $props[$tag] : 0;
@@ -544,8 +544,7 @@
}
return HTML($html);
}
-
-// (c-file-style: "gnu")
+
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2010-08-10 12:30:47 UTC (rev 7637)
+++ trunk/lib/HtmlElement5.php 2010-08-11 11:58:40 UTC (rev 7638)
@@ -33,7 +33,7 @@
assert(count($args) >= 1);
assert(is_string($args[0]));
$this->_tag = array_shift($args);
-
+
if ($args && is_array($args[0]))
$this->_attr = array_shift($args);
else {
@@ -56,7 +56,7 @@
elseif ($args[0] === false)
array_shift($args);
}
-
+
if (count($args) == 1 && is_array($args[0]))
$args = $args[0];
$this->_content = $args;
@@ -89,15 +89,15 @@
if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
{
$this->_attr['title'] = preg_replace
- ("/\[(alt-)?(.)\]$/",
- "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
+ ("/\[(alt-)?(.)\]$/",
+ "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
$this->_attr['title']);
} else {
- $this->_attr['title'] .=
+ $this->_attr['title'] .=
" [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
}
} else {
- $this->_attr['title'] =
+ $this->_attr['title'] =
"[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
}
}
@@ -126,7 +126,7 @@
public static function raw ($html_text) {
return new RawXml($html_text);
}
-
+
function getTagProperties($tag) {
$props = &$GLOBALS['HTML_TagProperties'];
return isset($props[$tag]) ? $props[$tag] : 0;
@@ -544,8...
[truncated message content] |
|
From: <var...@us...> - 2010-08-13 13:34:33
|
Revision: 7644
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7644&view=rev
Author: vargenau
Date: 2010-08-13 13:34:26 +0000 (Fri, 13 Aug 2010)
Log Message:
-----------
New plugin: WikiAdminSetAclSimple
Modified Paths:
--------------
trunk/lib/IniConfig.php
trunk/lib/main.php
trunk/pgsrc/Help%2FPagePermissions
trunk/pgsrc/PhpWikiAdministration
trunk/pgsrc/PhpWikiAdministration%2FSetAcl
trunk/themes/gforge/pgsrc/PhpWikiAdministration
trunk/themes/gforge/templates/actionbar.tmpl
Added Paths:
-----------
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/pgsrc/SetGlobalAccessRights
trunk/pgsrc/SetGlobalAccessRightsSimple
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/lib/IniConfig.php 2010-08-13 13:34:26 UTC (rev 7644)
@@ -700,6 +700,7 @@
$AllAllowedPlugins[] = 'WikiAdminRename';
$AllAllowedPlugins[] = 'WikiAdminSearchReplace';
$AllAllowedPlugins[] = 'WikiAdminSetAcl';
+ $AllAllowedPlugins[] = 'WikiAdminSetAclSimple';
$AllAllowedPlugins[] = 'WikiAdminUtils';
$AllAllowedPlugins[] = 'WikicreoleTable';
$AllAllowedPlugins[] = 'WikiForm';
@@ -763,9 +764,12 @@
$AllActionPages[] = 'PhpWikiAdministration/Rename';
$AllActionPages[] = 'PhpWikiAdministration/SearchReplace';
$AllActionPages[] = 'PhpWikiAdministration/SetAcl';
+ $AllActionPages[] = 'PhpWikiAdministration/SetAclSimple';
$AllActionPages[] = 'RecentChangesMyPages';
$AllActionPages[] = 'RecentEdits';
$AllActionPages[] = 'RecentNewPages';
+ $AllActionPages[] = 'SetGlobalAccessRights';
+ $AllActionPages[] = 'SetGlobalAccessRightsSimple';
$AllActionPages[] = 'UserContribs';
// The GFORGE theme omits them
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/lib/main.php 2010-08-13 13:34:26 UTC (rev 7644)
@@ -717,6 +717,7 @@
case 'upgrade':
case 'chown':
case 'setacl':
+ case 'setaclsimple':
return WIKIAUTH_ADMIN;
/* authcheck occurs only in the plugin.
@@ -1087,6 +1088,10 @@
$this->adminActionSubpage(_("SetAcl"));
}
+ function action_setaclsimple () {
+ $this->adminActionSubpage(_("SetAclSimple"));
+ }
+
function action_rename () {
$this->adminActionSubpage(_("Rename"));
}
@@ -1410,9 +1415,10 @@
//$x = error_reporting(); // DEBUG: why is it 1 here? should be E_ALL
if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
- error_reporting(E_ALL & ~E_STRICT); // exclude E_STRICT
+ error_reporting(E_ALL & ~E_STRICT); // exclude E_STRICT
else
- error_reporting(E_ALL); // php4
+ error_reporting(E_ALL); // php4
+
// don't run the main loop for special requests (test, getimg, xmlrpc, soap, ...)
if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)
main();
Added: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php (rev 0)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,181 @@
+<?php // -*-php-*-
+// rcs_id('$Id$');
+/*
+ * Copyright 2004 $ThePhpWikiProgrammingTeam
+ * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/**
+ * Set simple individual PagePermissions
+ *
+ * Usage: <<WikiAdminSetAclSimple >> or called via WikiAdminSelect
+ * Author: Marc-Etienne Vargenau, Alcatel-Lucent
+ *
+ */
+
+require_once('lib/plugin/WikiAdminSetAcl.php');
+
+class WikiPlugin_WikiAdminSetAclSimple
+extends WikiPlugin_WikiAdminSetAcl
+{
+ function getName() {
+ return _("WikiAdminSetAclSimple");
+ }
+
+ function getDescription() {
+ return _("Set simple individual page permissions.");
+ }
+
+ function run($dbi, $argstr, &$request, $basepage) {
+ if ($request->getArg('action') != 'browse')
+ if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple"))
+ return $this->disabled("(action != 'browse')");
+ if (!ENABLE_PAGEPERM)
+ return $this->disabled("ENABLE_PAGEPERM = false");
+
+ $args = $this->getArgs($argstr, $request);
+ $this->_args = $args;
+ $this->preSelectS($args, $request);
+
+ $p = $request->getArg('p');
+ $post_args = $request->getArg('admin_setacl');
+ $pages = array();
+ if ($p && !$request->isPost())
+ $pages = $p;
+ elseif ($this->_list)
+ $pages = $this->_list;
+ $header = HTML::fieldset();
+ if ($p && $request->isPost() &&
+ (!empty($post_args['aclliberal']) || !empty($post_args['aclrestricted']))) {
+ // without individual PagePermissions:
+ if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
+ $request->_notAuthorized(WIKIAUTH_ADMIN);
+ $this->disabled("! user->isAdmin");
+ }
+ if (!empty($post_args['aclliberal'])) {
+ return $this->setaclPages($request, array_keys($p), $this->liberalPerms());
+ } else if (!empty($post_args['aclrestricted'])) {
+ return $this->setaclPages($request, array_keys($p), $this->restrictedPerms());
+ }
+ }
+ if (empty($pages)) {
+ // List all pages to select from.
+ $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
+ }
+ $pagelist = new PageList_Selectable($args['info'],
+ $args['exclude'],
+ array('types' => array(
+ 'acl'
+ => new _PageList_Column_acl('acl', _("ACL")))));
+
+ $pagelist->addPageList($pages);
+ $button_label_liberal = _("Set Liberal Access Rights");
+ $button_label_restrictive = _("Set Restrictive Access Rights");
+ $header = $this->setaclForm($header, $pages);
+ $header->pushContent(HTML::legend(_("Select the pages where to change access rights")));
+
+ $buttons = HTML::p(Button('submit:admin_setacl[aclliberal]', $button_label_liberal, 'wikiadmin'),
+ Button('submit:admin_setacl[aclrestricted]', $button_label_restrictive, 'wikiadmin'));
+ $header->pushContent($buttons);
+
+ return HTML::form(array('action' => $request->getPostURL(),
+ 'method' => 'post'),
+ $header,
+ $pagelist->getContent(),
+ HiddenInputs($request->getArgs(),
+ false,
+ array('admin_setacl')),
+ ENABLE_PAGEPERM
+ ? ''
+ : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
+ }
+
+ /*
+ * acces rights where everyone can edit
+ * _EVERY: view edit list create;
+ * _ADMIN: remove purge dump change;
+ * _OWNER: remove purge dump change;
+ */
+
+ function liberalPerms() {
+
+ $perm = array('view' => array(ACL_EVERY => true),
+ 'edit' => array(ACL_EVERY => true),
+ 'create' => array(ACL_EVERY => true),
+ 'list' => array(ACL_EVERY => true),
+ 'remove' => array(ACL_ADMIN => true,
+ ACL_OWNER => true),
+ 'purge' => array(ACL_ADMIN => true,
+ ACL_OWNER => true),
+ 'dump' => array(ACL_ADMIN => true,
+ ACL_OWNER => true),
+ 'change' => array(ACL_ADMIN => true,
+ ACL_OWNER => true));
+ return $perm;
+ }
+
+ /*
+ * acces rights where only authenticated users can see pages
+ * _AUTHENTICATED: view edit list create;
+ * _ADMIN: remove purge dump change;
+ * _OWNER: remove purge dump change;
+ * _EVERY: -view -edit -list -create;
+ */
+
+ function restrictedPerms() {
+
+ $perm = array('view' => array(ACL_AUTHENTICATED => true,
+ ACL_EVERY => false),
+ 'edit' => array(ACL_AUTHENTICATED => true,
+ ACL_EVERY => false),
+ 'create' => array(ACL_AUTHENTICATED => true,
+ ACL_EVERY => false),
+ 'list' => array(ACL_AUTHENTICATED => true,
+ ACL_EVERY => false),
+ 'remove' => array(ACL_ADMIN => true,
+ ACL_OWNER => true),
+ 'purge' => array(ACL_ADMIN => true,
+ ACL_OWNER => true),
+ 'dump' => array(ACL_ADMIN => true,
+ ACL_OWNER => true),
+ 'change' => array(ACL_ADMIN => true,
+ ACL_OWNER => true));
+ return $perm;
+ }
+
+ function setaclForm(&$header, $pagehash) {
+
+ $pages = array();
+ foreach ($pagehash as $name => $checked) {
+ if ($checked) $pages[] = $name;
+ }
+
+ $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ',$pages)), HTML::br());
+ return $header;
+ }
+};
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
Property changes on: trunk/lib/plugin/WikiAdminSetAclSimple.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/pgsrc/Help%2FPagePermissions
===================================================================
--- trunk/pgsrc/Help%2FPagePermissions 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/pgsrc/Help%2FPagePermissions 2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Tue, 1 Jun 2010 17:01:57 +0000
+Date: Fri, 13 Aug 2010 15:31:59 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -111,7 +111,7 @@
|= dump | zip, ziphtml, dumpserial, dumphtml
|= edit | revert, edit
|= create | //edit or create, if the page doesn't exist yet//
-|= change | upload, loadfile, remove, lock, unlock, upgrade, chown, setacl, rename. \\ All other actionpages which are not wikiwords.
+|= change | upload, loadfile, remove, lock, unlock, upgrade, chown, setacl, setaclsimple, rename. \\ All other actionpages which are not wikiwords.
=== Default Permissions ===
Added: trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin (rev 0)
+++ trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin 2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,52 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=Help%2FWikiAdminSetAclSimplePlugin;
+ flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+The **~WikiAdminSetAclSimple** [[Help:WikiPlugin|plugin]] allows to change access rights on pages.
+
+== Usage ==
+{{{
+<<WikiAdminSetAclSimple arguments>>
+}}}
+
+== Arguments ==
+
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **p**
+| Pages to select
+| //None//
+|-
+| **info**
+| Columns to include in listing
+| pagename, perm, mtime, owner, author
+|}
+
+== Example ==
+
+{{{
+<<WikiAdminSetAclSimple s=Temp*>>
+}}}
+
+<<WikiAdminSetAclSimple s=Temp*>>
+
+== Author ==
+* [[PhpWiki:ReiniUrban|Reini Urban]]
+
+== See Also ==
+* [[PhpWikiAdministration]]
+
+<noinclude>
+----
+[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
+</noinclude>
Property changes on: trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/pgsrc/PhpWikiAdministration 2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Fri, 13 Aug 2010 15:31:59 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -20,8 +20,13 @@
or call the available ~WikiAdmin actions directly:
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]]
+| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+== Global Access Rights ==
+
+* [[SetGlobalAccessRightsSimple]]
+* [[SetGlobalAccessRights]]
+
== User Management ==
=== Reset a users password ===
Modified: trunk/pgsrc/PhpWikiAdministration%2FSetAcl
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAcl 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAcl 2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Fri, 13 Aug 2010 15:31:59 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,6 +8,10 @@
charset=UTF-8
Content-Transfer-Encoding: binary
+For simple Access Rights modifications, see **[[phpwiki:?action=setaclsimple|SetAclSimple]]**.
+
+----
+
<<WikiAdminSetAcl>>
----
Added: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple (rev 0)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,18 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=PhpWikiAdministration%2FSetAclSimple;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+
+----
+
+<<WikiAdminSetAclSimple>>
+
+----
+[[CategoryActionPage]]
Property changes on: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/pgsrc/SetGlobalAccessRights
===================================================================
--- trunk/pgsrc/SetGlobalAccessRights (rev 0)
+++ trunk/pgsrc/SetGlobalAccessRights 2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,14 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=SetGlobalAccessRights;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminSetAcl s=. info=pagename>>
+
+----
+[[CategoryActionPage]]
Property changes on: trunk/pgsrc/SetGlobalAccessRights
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/pgsrc/SetGlobalAccessRightsSimple (rev 0)
+++ trunk/pgsrc/SetGlobalAccessRightsSimple 2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,14 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=SetGlobalAccessRightsSimple;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminSetAclSimple s=. info=pagename>>
+
+----
+[[CategoryActionPage]]
Property changes on: trunk/pgsrc/SetGlobalAccessRightsSimple
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/gforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration 2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Jul 2010 16:58:46 +0000
+Date: Fri, 13 Aug 2010 15:31:51 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -20,8 +20,13 @@
or call the available ~WikiAdmin actions directly:
-| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+== Global Access Rights ==
+
+* [[SetGlobalAccessRightsSimple]]
+* [[SetGlobalAccessRights]]
+
== Cleanup ==
A Wiki SandBox is very easy to clean. Here you can restore it to
Modified: trunk/themes/gforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/gforge/templates/actionbar.tmpl 2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/themes/gforge/templates/actionbar.tmpl 2010-08-13 13:34:26 UTC (rev 7644)
@@ -104,7 +104,7 @@
<?php } ?>
<?php if ($curuserprefs->get('setaclMenuItem')) { ?>
- <td><?php echo Button('setacl', _("Access Rights")) ?></td>
+ <td><?php echo Button('setaclsimple', _("Access Rights")) ?></td>
<td class="spacer"> </td>
<?php } ?>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-23 15:10:17
|
Revision: 7647
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7647&view=rev
Author: vargenau
Date: 2010-08-23 15:10:10 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
Move "perm" and "acl" columns from plugins to PageList
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/pgsrc/Help%2FPageList
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/lib/PageList.php 2010-08-23 15:10:10 UTC (rev 7647)
@@ -546,6 +546,35 @@
}
};
+class _PageList_Column_perm extends _PageList_Column {
+ function _getValue ($page_handle, &$revision_handle) {
+ $perm_array = pagePermissions($page_handle->_pagename);
+ return pagePermissionsSimpleFormat($perm_array,
+ $page_handle->get('author'),
+ $page_handle->get('group'));
+ }
+};
+
+class _PageList_Column_acl extends _PageList_Column {
+ function _getValue ($page_handle, &$revision_handle) {
+ $perm_tree = pagePermissions($page_handle->_pagename);
+
+ list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
+ if ($type == 'inherited') {
+ $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
+ } elseif ($type == 'page') {
+ $type = _("individual page permission");
+ } elseif ($type == 'default') {
+ $type = _("default page permission");
+ }
+ $result = HTML::span();
+ $result->pushContent($type);
+ $result->pushContent(HTML::br());
+ $result->pushContent($perm->asAclGroupLines());
+ return $result;
+ }
+};
+
class PageList {
var $_group_rows = 3;
var $_columns = array();
@@ -1176,11 +1205,11 @@
// initialised by the plugin
'renamed_pagename'
=> new _PageList_Column_renamed_pagename('rename', _("Rename to")),
+ */
'perm'
=> new _PageList_Column_perm('perm', _("Permission")),
'acl'
=> new _PageList_Column_acl('acl', _("ACL")),
- */
'checkbox'
=> new _PageList_Column_checkbox('p', _("All")),
'pagename'
Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php 2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/lib/plugin/WikiAdminChmod.php 2010-08-23 15:10:10 UTC (rev 7647)
@@ -188,16 +188,6 @@
}
}
-// conflicts with WikiAdminSetAcl
-class _PageList_Column_chmod_perm extends _PageList_Column {
- function _getValue ($page_handle, &$revision_handle) {
- $perm_array = pagePermissions($page_handle->_pagename);
- return pagePermissionsSimpleFormat($perm_array,
- $page_handle->get('author'),
- $page_handle->get('group'));
- }
-};
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2010-08-23 15:10:10 UTC (rev 7647)
@@ -278,35 +278,6 @@
}
}
-class _PageList_Column_acl extends _PageList_Column {
- function _getValue ($page_handle, &$revision_handle) {
- $perm_tree = pagePermissions($page_handle->_pagename);
-
- list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
- if ($type == 'inherited') {
- $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
- } elseif ($type == 'page') {
- $type = _("individual page permission");
- } elseif ($type == 'default') {
- $type = _("default page permission");
- }
- $result = HTML::span();
- $result->pushContent($type);
- $result->pushContent(HTML::br());
- $result->pushContent($perm->asAclGroupLines());
- return $result;
- }
-};
-
-class _PageList_Column_perm extends _PageList_Column {
- function _getValue ($page_handle, &$revision_handle) {
- $perm_array = pagePermissions($page_handle->_pagename);
- return pagePermissionsSimpleFormat($perm_array,
- $page_handle->get('author'),
- $page_handle->get('group'));
- }
-};
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList 2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/pgsrc/Help%2FPageList 2010-08-23 15:10:10 UTC (rev 7647)
@@ -1,4 +1,4 @@
-Date: Tue, 1 Jun 2010 17:01:57 +0000
+Date: Mon, 23 Aug 2010 17:09:36 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -111,11 +111,11 @@
|= owner | Owner
|= checkbox | Selectable checkbox at the left
|= content | Page content
+|= perm | Permission Mask
+|= acl | ACL
Special, custom columns, either theme or plugin (~WikiAdmin*) specific:
|= remove | Remove
-|= perm | Permission Mask
-|= acl | ACL
|= renamed_pagename | Rename to
|= ratingwidget | wikilens theme specific.
|= custom | See plugin/_WikiTranslation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-24 10:04:00
|
Revision: 7649
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7649&view=rev
Author: vargenau
Date: 2010-08-24 10:03:52 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
New action page: AllPagesByAcl
Modified Paths:
--------------
trunk/lib/IniConfig.php
trunk/pgsrc/SpecialPages
trunk/themes/gforge/pgsrc/SpecialPages
Added Paths:
-----------
trunk/pgsrc/AllPagesByAcl
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2010-08-23 15:13:51 UTC (rev 7648)
+++ trunk/lib/IniConfig.php 2010-08-24 10:03:52 UTC (rev 7649)
@@ -4,7 +4,7 @@
* A configurator intended to read its config from a PHP-style INI file,
* instead of a PHP file.
*
- * Pass a filename to the IniConfig() function and it will read all it's
+ * Pass a filename to the IniConfig() function and it will read all its
* definitions from there, all by itself, and proceed to do a mass-define
* of all valid PHPWiki config items. In this way, we can hopefully be
* totally backwards-compatible with the old index.php method, while still
@@ -743,18 +743,19 @@
$AllAllowedPlugins[] = '_WikiTranslation';
}
- // Used by SetupWiki to pull in required pages, if not translated, then in english.
+ // Used by SetupWiki to pull in required pages, if not translated, then in English.
// Also used by _WikiTranslation. Really important are only those which return pagelists
// or contain basic functionality.
$AllActionPages = $ActionPages;
$AllActionPages[] = 'AllPagesCreatedByMe';
$AllActionPages[] = 'AllPagesLastEditedByMe';
$AllActionPages[] = 'AllPagesOwnedByMe';
+ $AllActionPages[] = 'AllPagesByAcl';
$AllActionPages[] = 'AllUserPages';
$AllActionPages[] = 'FullRecentChanges';
$AllActionPages[] = 'LeastPopular';
$AllActionPages[] = 'LockedPages';
- $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens derived themes
+ $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens-derived themes
$AllActionPages[] = 'MyRecentEdits';
$AllActionPages[] = 'MyRecentChanges';
$AllActionPages[] = 'PhpWikiAdministration';
Added: trunk/pgsrc/AllPagesByAcl
===================================================================
--- trunk/pgsrc/AllPagesByAcl (rev 0)
+++ trunk/pgsrc/AllPagesByAcl 2010-08-24 10:03:52 UTC (rev 7649)
@@ -0,0 +1,16 @@
+Date: Tue, 24 Aug 2010 12:00:09 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: AllPages 7614 2010-07-15 15:56:21Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=AllPages;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+Here is the list of **all pages** on this Wiki, sorted by ACL (Access Control List).
+
+<<AllPages info||=acl sortby||=acl>>
+
+----
+[[CategoryActionPage]]
Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages 2010-08-23 15:13:51 UTC (rev 7648)
+++ trunk/pgsrc/SpecialPages 2010-08-24 10:03:52 UTC (rev 7649)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Tue, 24 Aug 2010 12:00:09 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -21,6 +21,7 @@
* [[AllPagesCreatedByMe]]
* [[AllPagesOwnedByMe]]
* [[AllPagesLastEditedByMe]]
+* [[AllPagesByAcl]]
* [[NewPagesPerUser]]
* [[LockedPages]]
* [[OrphanedPages]]
Modified: trunk/themes/gforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/gforge/pgsrc/SpecialPages 2010-08-23 15:13:51 UTC (rev 7648)
+++ trunk/themes/gforge/pgsrc/SpecialPages 2010-08-24 10:03:52 UTC (rev 7649)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Jul 2010 16:58:46 +0000
+Date: Tue, 24 Aug 2010 11:59:55 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -21,6 +21,7 @@
* [[AllPagesCreatedByMe]]
* [[AllPagesOwnedByMe]]
* [[AllPagesLastEditedByMe]]
+* [[AllPagesByAcl]]
* [[NewPagesPerUser]]
* [[LockedPages]]
* [[OrphanedPages]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-24 14:24:23
|
Revision: 7651
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7651&view=rev
Author: vargenau
Date: 2010-08-24 14:24:17 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
Remove method asAclGroupLines that was introduced in r6688
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/default/templates/info.tmpl
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/PageList.php 2010-08-24 14:24:17 UTC (rev 7651)
@@ -536,7 +536,7 @@
$result = HTML::span();
$result->pushContent($type);
$result->pushContent(HTML::br());
- $result->pushContent($perm->asAclGroupLines());
+ $result->pushContent($perm->asAclLines());
return $result;
}
};
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/PagePerm.php 2010-08-24 14:24:17 UTC (rev 7651)
@@ -705,32 +705,6 @@
return $s;
}
- // Print ACL as group followed by actions allowed for the group
- function asAclGroupLines() {
-
- $s = '';
- $perm =& $this->perm;
- $actions = array("view", "edit", "create", "list", "remove", "purge", "dump", "change");
- $groups = array(ACL_EVERY, ACL_ANONYMOUS, ACL_BOGOUSER, ACL_HASHOMEPAGE, ACL_SIGNED, ACL_AUTHENTICATED, ACL_ADMIN, ACL_OWNER, ACL_CREATOR);
-
- foreach ($groups as $group) {
- $none = true;
- foreach ($actions as $action) {
- if (isset($perm[$action][$group])) {
- if ($none) {
- $none = false;
- $s .= "$group:";
- }
- $s .= (($perm[$action][$group] ? " " : " -") . $action);
- }
- }
- if (!($none)) {
- $s .= "; ";
- }
- }
- return $s;
- }
-
// This is just a bad hack for testing.
// Simplify the ACL to a unix-like "rwx------+" string
// See getfacl(8)
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2010-08-24 14:24:17 UTC (rev 7651)
@@ -95,9 +95,9 @@
$result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
$pagename)));
$result->pushContent(HTML::p(fmt("from '%s'",
- $oldperm ? $oldperm->asAclGroupLines() : "None")));
+ $oldperm ? $oldperm->asAclLines() : "None")));
$result->pushContent(HTML::p(fmt("to '%s'.",
- $perm->asAclGroupLines())));
+ $perm->asAclLines())));
// Create new revision so that ACL change appears in history.
$current = $page->getCurrentRevision();
@@ -106,8 +106,8 @@
$text = $current->getPackedContent();
$meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
$pagename,
- $oldperm ? $oldperm->asAclGroupLines() : "None",
- $perm->asAclGroupLines());
+ $oldperm ? $oldperm->asAclLines() : "None",
+ $perm->asAclLines());
$meta['is_minor_edit'] = 1;
$meta['author'] = $request->_user->UserName();
unset($meta['mtime']); // force new date
@@ -242,7 +242,7 @@
elseif ($type == 'default')
$type = _("default page permission");
$header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
- $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclGroupLines()),HTML::br());
+ $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
$header->pushContent(HTML::p(HTML::strong(_("Description").': '),
_("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/themes/MonoBook/templates/info.tmpl 2010-08-24 14:24:17 UTC (rev 7651)
@@ -148,7 +148,7 @@
</tr>
<tr>
<td align="right" valign="top" class="pageinfo">ACL</td>
- <td><?php echo $perm->asAclGroupLines() ?></td>
+ <td><?php echo $perm->asAclLines() ?></td>
</tr>
<?php } ?>
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/themes/default/templates/info.tmpl 2010-08-24 14:24:17 UTC (rev 7651)
@@ -140,7 +140,7 @@
</tr>
<tr>
<td align="right" valign="top" class="pageinfo">ACL</td>
- <td><?php echo $perm->asAclGroupLines() ?></td>
+ <td><?php echo $perm->asAclLines() ?></td>
</tr>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-31 09:41:29
|
Revision: 7654
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7654&view=rev
Author: vargenau
Date: 2010-08-31 09:41:22 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
Add explanations for Simple Access Rights
Modified Paths:
--------------
trunk/pgsrc/PhpWikiAdministration
trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/pgsrc/SetGlobalAccessRights
trunk/pgsrc/SetGlobalAccessRightsSimple
trunk/themes/gforge/pgsrc/PhpWikiAdministration
Added Paths:
-----------
trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration 2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/PhpWikiAdministration 2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -24,6 +24,8 @@
== Global Access Rights ==
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
* [[SetGlobalAccessRightsSimple]]
* [[SetGlobalAccessRights]]
Modified: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -12,6 +12,17 @@
----
+//Liberal Access Rights// means //Everyone can edit//.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only logged users can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+
<<WikiAdminSetAclSimple>>
----
Modified: trunk/pgsrc/SetGlobalAccessRights
===================================================================
--- trunk/pgsrc/SetGlobalAccessRights 2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/SetGlobalAccessRights 2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,6 +8,9 @@
charset=UTF-8
Content-Transfer-Encoding: binary
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
<<WikiAdminSetAcl s=. info=pagename>>
----
Modified: trunk/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/pgsrc/SetGlobalAccessRightsSimple 2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/SetGlobalAccessRightsSimple 2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,6 +8,9 @@
charset=UTF-8
Content-Transfer-Encoding: binary
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
<<WikiAdminSetAclSimple s=. info=pagename>>
----
Modified: trunk/themes/gforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration 2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration 2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:51 +0000
+Date: Tue, 31 Aug 2010 11:36:17 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -24,6 +24,8 @@
== Global Access Rights ==
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
* [[SetGlobalAccessRightsSimple]]
* [[SetGlobalAccessRights]]
Added: trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple (rev 0)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2010-08-31 09:41:22 UTC (rev 7654)
@@ -0,0 +1,29 @@
+Date: Tue, 31 Aug 2010 11:36:17 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7644 2010-08-13 13:34:26Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=PhpWikiAdministration%2FSetAclSimple;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only project members can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+
+<<WikiAdminSetAclSimple>>
+
+----
+[[CategoryActionPage]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-08-31 11:37:24
|
Revision: 7655
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7655&view=rev
Author: vargenau
Date: 2010-08-31 11:37:18 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
Add explanations for Simple Access Rights
Modified Paths:
--------------
trunk/pgsrc/SetGlobalAccessRightsSimple
Added Paths:
-----------
trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple
Modified: trunk/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/pgsrc/SetGlobalAccessRightsSimple 2010-08-31 09:41:22 UTC (rev 7654)
+++ trunk/pgsrc/SetGlobalAccessRightsSimple 2010-08-31 11:37:18 UTC (rev 7655)
@@ -11,6 +11,17 @@
This action page will allow you to set the default access rights for wiki pages.
Pages without individual access rights will use these default access rights.
+----
+
+//Liberal Access Rights// means //Everyone can edit//.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only logged users can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
<<WikiAdminSetAclSimple s=. info=pagename>>
----
Added: trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple (rev 0)
+++ trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple 2010-08-31 11:37:18 UTC (rev 7655)
@@ -0,0 +1,26 @@
+Date: Tue, 31 Aug 2010 11:36:04 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7654 2010-08-31 09:41:22Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=SetGlobalAccessRightsSimple;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only project members can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+[[CategoryActionPage]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X