Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2008-08-22 09:55:05
|
Revision: 6182
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6182&view=rev
Author: vargenau
Date: 2008-08-22 09:55:12 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Removed svn:executable
Property Changed:
----------------
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/YouTube.php
trunk/pgsrc/PhpWikiAdministration%2FChown
trunk/pgsrc/San%20Diego
trunk/pgsrc/Template%2FAttribute
trunk/pgsrc/Template%2FRelation
trunk/pgsrc/area
trunk/pgsrc/is_a
trunk/pgsrc/located_in
trunk/pgsrc/population
Property changes on: trunk/lib/plugin/AnalyseAccessLogSql.php
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/lib/plugin/ListPages.php
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/lib/plugin/YouTube.php
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/PhpWikiAdministration%2FChown
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/San%20Diego
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/Template%2FAttribute
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/Template%2FRelation
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/area
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/is_a
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/located_in
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/pgsrc/population
___________________________________________________________________
Deleted: svn:executable
- *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-08-22 10:34:09
|
Revision: 6184
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6184&view=rev
Author: vargenau
Date: 2008-08-22 10:33:41 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Activated Id substitution for Subversion
Modified Paths:
--------------
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/Theme.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_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/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/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.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/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/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/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/lib/pear/File_Passwd.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/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.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/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/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/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/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/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/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/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/pgsrc/AllPages
trunk/pgsrc/AllPagesCreatedByMe
trunk/pgsrc/AllPagesLastEditedByMe
trunk/pgsrc/AllPagesOwnedByMe
trunk/pgsrc/AllUsers
trunk/pgsrc/AppendText
trunk/pgsrc/AuthorHistory
trunk/pgsrc/BackLinks
trunk/pgsrc/BlogArchives
trunk/pgsrc/BlogJournal
trunk/pgsrc/CategoryActionPage
trunk/pgsrc/CategoryCategory
trunk/pgsrc/CategoryGroup
trunk/pgsrc/CategoryWikiPlugin
trunk/pgsrc/CreatePage
trunk/pgsrc/DebugAuthInfo
trunk/pgsrc/DebugGroupInfo
trunk/pgsrc/DebugInfo
trunk/pgsrc/EditMetaData
trunk/pgsrc/FindPage
trunk/pgsrc/FullRecentChanges
trunk/pgsrc/FullTextSearch
trunk/pgsrc/FuzzyPages
trunk/pgsrc/GoogleLink
trunk/pgsrc/Help
trunk/pgsrc/Help%2FActionPage
trunk/pgsrc/Help%2FAddCommentPlugin
trunk/pgsrc/Help%2FAddingPages
trunk/pgsrc/Help%2FAllPagesPlugin
trunk/pgsrc/Help%2FAllUsersPlugin
trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
trunk/pgsrc/Help%2FAppendTextPlugin
trunk/pgsrc/Help%2FAsciiMathPlugin
trunk/pgsrc/Help%2FAsciiSVGPlugin
trunk/pgsrc/Help%2FAuthorHistoryPlugin
trunk/pgsrc/Help%2FBackLinksPlugin
trunk/pgsrc/Help%2FBlogArchivesPlugin
trunk/pgsrc/Help%2FBlogJournalPlugin
trunk/pgsrc/Help%2FBoxRightPlugin
trunk/pgsrc/Help%2FCacheTestPlugin
trunk/pgsrc/Help%2FCalendarListPlugin
trunk/pgsrc/Help%2FCalendarPlugin
trunk/pgsrc/Help%2FCategoryPagePlugin
trunk/pgsrc/Help%2FCommentPlugin
trunk/pgsrc/Help%2FCreateBibPlugin
trunk/pgsrc/Help%2FCreatePagePlugin
trunk/pgsrc/Help%2FDeadEndPagesPlugin
trunk/pgsrc/Help%2FDiffPlugin
trunk/pgsrc/Help%2FEditMetaDataPlugin
trunk/pgsrc/Help%2FEditText
trunk/pgsrc/Help%2FExternalSearchPlugin
trunk/pgsrc/Help%2FFileInfoPlugin
trunk/pgsrc/Help%2FFoafViewerPlugin
trunk/pgsrc/Help%2FFrameIncludePlugin
trunk/pgsrc/Help%2FFullTextSearchPlugin
trunk/pgsrc/Help%2FFuzzyPagesPlugin
trunk/pgsrc/Help%2FGoToPlugin
trunk/pgsrc/Help%2FGoodStyle
trunk/pgsrc/Help%2FGoogleMapsPlugin
trunk/pgsrc/Help%2FGooglePluginPlugin
trunk/pgsrc/Help%2FGraphVizPlugin
trunk/pgsrc/Help%2FHelloWorldPlugin
trunk/pgsrc/Help%2FHowToUseWiki
trunk/pgsrc/Help%2FHtmlConverterPlugin
trunk/pgsrc/Help%2FIncludePagePlugin
trunk/pgsrc/Help%2FIncludePagesPlugin
trunk/pgsrc/Help%2FIncludeSiteMapPlugin
trunk/pgsrc/Help%2FInterWikiSearchPlugin
trunk/pgsrc/Help%2FJabberPresencePlugin
trunk/pgsrc/Help%2FLdapSearchPlugin
trunk/pgsrc/Help%2FLikePagesPlugin
trunk/pgsrc/Help%2FLinkDatabasePlugin
trunk/pgsrc/Help%2FLinkIcons
trunk/pgsrc/Help%2FListPagesPlugin
trunk/pgsrc/Help%2FListSubpagesPlugin
trunk/pgsrc/Help%2FMagicPhpWikiURLs
trunk/pgsrc/Help%2FMediawikiTablePlugin
trunk/pgsrc/Help%2FModeratedPagePlugin
trunk/pgsrc/Help%2FMoreAboutMechanics
trunk/pgsrc/Help%2FMostPopularPlugin
trunk/pgsrc/Help%2FNewMarkupTestPage
trunk/pgsrc/Help%2FNoCachePlugin
trunk/pgsrc/Help%2FOldMarkupTestPage
trunk/pgsrc/Help%2FOldStyleTablePlugin
trunk/pgsrc/Help%2FOldTextFormattingRules
trunk/pgsrc/Help%2FOrphanedPagesPlugin
trunk/pgsrc/Help%2FPageDumpPlugin
trunk/pgsrc/Help%2FPageGroupPlugin
trunk/pgsrc/Help%2FPageGroupTest
trunk/pgsrc/Help%2FPageGroupTestFour
trunk/pgsrc/Help%2FPageGroupTestOne
trunk/pgsrc/Help%2FPageGroupTestThree
trunk/pgsrc/Help%2FPageGroupTestTwo
trunk/pgsrc/Help%2FPageHistoryPlugin
trunk/pgsrc/Help%2FPageInfoPlugin
trunk/pgsrc/Help%2FPagePermissions
trunk/pgsrc/Help%2FPageTrailPlugin
trunk/pgsrc/Help%2FPasswordResetPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides
trunk/pgsrc/Help%2FPhpHighlightPlugin
trunk/pgsrc/Help%2FPhpWeatherPlugin
trunk/pgsrc/Help%2FPloticusPlugin
trunk/pgsrc/Help%2FPluginManagerPlugin
trunk/pgsrc/Help%2FPopUpPlugin
trunk/pgsrc/Help%2FPopularNearbyPlugin
trunk/pgsrc/Help%2FPreferenceAppPlugin
trunk/pgsrc/Help%2FPrevNextPlugin
trunk/pgsrc/Help%2FRandomPagePlugin
trunk/pgsrc/Help%2FRateItPlugin
trunk/pgsrc/Help%2FRawHtmlPlugin
trunk/pgsrc/Help%2FRecentChangesCachedPlugin
trunk/pgsrc/Help%2FRecentChangesPlugin
trunk/pgsrc/Help%2FRecentCommentsPlugin
trunk/pgsrc/Help%2FRecentEditsPlugin
trunk/pgsrc/Help%2FRecentReferrersPlugin
trunk/pgsrc/Help%2FRedirectToPlugin
trunk/pgsrc/Help%2FRelatedChangesPlugin
trunk/pgsrc/Help%2FRichTablePlugin
trunk/pgsrc/Help%2FRssFeedPlugin
trunk/pgsrc/Help%2FSearchHighlightPlugin
trunk/pgsrc/Help%2FSemanticRelations
trunk/pgsrc/Help%2FSemanticRelationsPlugin
trunk/pgsrc/Help%2FSemanticSearchPlugin
trunk/pgsrc/Help%2FSiteMapPlugin
trunk/pgsrc/Help%2FSqlResultPlugin
trunk/pgsrc/Help%2FSyncWikiPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/Help%2FSystemInfoPlugin
trunk/pgsrc/Help%2FTeX2pngPlugin
trunk/pgsrc/Help%2FTemplatePlugin
trunk/pgsrc/Help%2FTexToPngPlugin
trunk/pgsrc/Help%2FTextFormattingRules
trunk/pgsrc/Help%2FTitleSearchPlugin
trunk/pgsrc/Help%2FTranscludePlugin
trunk/pgsrc/Help%2FTranslateTextPlugin
trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
trunk/pgsrc/Help%2FUpLoadPlugin
trunk/pgsrc/Help%2FUserPreferencesPlugin
trunk/pgsrc/Help%2FUserRatingsPlugin
trunk/pgsrc/Help%2FVisualWikiPlugin
trunk/pgsrc/Help%2FWabiSabi
trunk/pgsrc/Help%2FWantedPagesOldPlugin
trunk/pgsrc/Help%2FWantedPagesPlugin
trunk/pgsrc/Help%2FWatchPagePlugin
trunk/pgsrc/Help%2FWhoIsOnlinePlugin
trunk/pgsrc/Help%2FWikiAdminChmodPlugin
trunk/pgsrc/Help%2FWikiAdminChownPlugin
trunk/pgsrc/Help%2FWikiAdminMarkupPlugin
trunk/pgsrc/Help%2FWikiAdminRemovePlugin
trunk/pgsrc/Help%2FWikiAdminRenamePlugin
trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
trunk/pgsrc/Help%2FWikiAdminSelectPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
trunk/pgsrc/Help%2FWikiBlogPlugin
trunk/pgsrc/Help%2FWikiFormPlugin
trunk/pgsrc/Help%2FWikiFormRichPlugin
trunk/pgsrc/Help%2FWikiForumPlugin
trunk/pgsrc/Help%2FWikiPlugin
trunk/pgsrc/Help%2FWikiPollPlugin
trunk/pgsrc/Help%2FYouTubePlugin
trunk/pgsrc/Help%2F_AuthInfoPlugin
trunk/pgsrc/Help%2F_BackendInfoPlugin
trunk/pgsrc/Help%2F_GroupInfoPlugin
trunk/pgsrc/Help%2F_PreferencesInfoPlugin
trunk/pgsrc/Help%2F_WikiTranslationPlugin
trunk/pgsrc/Help%2Ftext2pngPlugin
trunk/pgsrc/HomePage
trunk/pgsrc/HomePageAlias
trunk/pgsrc/InterWiki
trunk/pgsrc/InterWikiMap
trunk/pgsrc/InterWikiSearch
trunk/pgsrc/LdapSearch
trunk/pgsrc/LeastPopular
trunk/pgsrc/LikePages
trunk/pgsrc/LinkDatabase
trunk/pgsrc/LinkSearch
trunk/pgsrc/LisaNova
trunk/pgsrc/ListRelations
trunk/pgsrc/LockedPages
trunk/pgsrc/ModeratedPage
trunk/pgsrc/MostPopular
trunk/pgsrc/MyRecentChanges
trunk/pgsrc/MyRecentEdits
trunk/pgsrc/OrphanedPages
trunk/pgsrc/PageDump
trunk/pgsrc/PageHistory
trunk/pgsrc/PageInfo
trunk/pgsrc/PasswordReset
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
trunk/pgsrc/PhpWiki
trunk/pgsrc/PhpWikiAdministration
trunk/pgsrc/PhpWikiAdministration%2FChmod
trunk/pgsrc/PhpWikiAdministration%2FChown
trunk/pgsrc/PhpWikiAdministration%2FRemove
trunk/pgsrc/PhpWikiAdministration%2FRename
trunk/pgsrc/PhpWikiAdministration%2FReplace
trunk/pgsrc/PhpWikiAdministration%2FSetAcl
trunk/pgsrc/PhpWikiDocumentation
trunk/pgsrc/PhpWikiPoll
trunk/pgsrc/PhpWikiRecentChanges
trunk/pgsrc/PluginManager
trunk/pgsrc/ProjectSummary
trunk/pgsrc/RandomPage
trunk/pgsrc/RateIt
trunk/pgsrc/RecentChanges
trunk/pgsrc/RecentChangesMyPages
trunk/pgsrc/RecentComments
trunk/pgsrc/RecentEdits
trunk/pgsrc/RecentNewPages
trunk/pgsrc/RecentReleases
trunk/pgsrc/RecentVisitors
trunk/pgsrc/RelatedChanges
trunk/pgsrc/ReleaseNotes
trunk/pgsrc/San%20Diego
trunk/pgsrc/SandBox
trunk/pgsrc/SearchHighlight
trunk/pgsrc/SemanticRelations
trunk/pgsrc/SemanticSearch
trunk/pgsrc/SpecialPages
trunk/pgsrc/SpellCheck
trunk/pgsrc/SteveWainstead
trunk/pgsrc/Template%2FAttribute
trunk/pgsrc/Template%2FCategory
trunk/pgsrc/Template%2FExample
trunk/pgsrc/Template%2FLinkto
trunk/pgsrc/Template%2FNewPlugin
trunk/pgsrc/Template%2FRelation
trunk/pgsrc/TemplateTalk
trunk/pgsrc/TitleSearch
trunk/pgsrc/TranslateText
trunk/pgsrc/UpLoad
trunk/pgsrc/UriResolver
trunk/pgsrc/UserContribs
trunk/pgsrc/UserPreferences
trunk/pgsrc/WantedPages
trunk/pgsrc/WatchPage
trunk/pgsrc/WhoIsOnline
trunk/pgsrc/WikiAdminSelect
trunk/pgsrc/WikiBlog
trunk/pgsrc/WikiWikiWeb
trunk/pgsrc/area
trunk/pgsrc/is_a
trunk/pgsrc/located_in
trunk/pgsrc/population
trunk/pgsrc/samplepage
Property Changed:
----------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.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/Google.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/Theme.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/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_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/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/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/XMLRPC/utils.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/courier.php
trunk/lib/fpdf/helvetica.php
trunk/lib/fpdf/helveticab.php
trunk/lib/fpdf/helveticabi.php
trunk/lib/fpdf/helveticai.php
trunk/lib/fpdf/japanese.php
trunk/lib/fpdf/symbol.php
trunk/lib/fpdf/times.php
trunk/lib/fpdf/timesb.php
trunk/lib/fpdf/timesbi.php
trunk/lib/fpdf/timesi.php
trunk/lib/fpdf/zapfdingbats.php
trunk/lib/fpdf.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pdf.php
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/lib/pear/File_Passwd.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/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.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/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/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/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/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/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/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/pgsrc/AllPages
trunk/pgsrc/AllPagesCreatedByMe
trunk/pgsrc/AllPagesLastEditedByMe
trunk/pgsrc/AllPagesOwnedByMe
trunk/pgsrc/AllUsers
trunk/pgsrc/AppendText
trunk/pgsrc/AuthorHistory
trunk/pgsrc/BackLinks
trunk/pgsrc/BlogArchives
trunk/pgsrc/BlogJo...
[truncated message content] |
|
From: <var...@us...> - 2008-08-26 09:14:26
|
Revision: 6198
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6198&view=rev
Author: vargenau
Date: 2008-08-26 09:14:36 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Activated Id substitution for Subversion
Modified Paths:
--------------
trunk/INSTALL
trunk/Makefile
trunk/RPC2.php
trunk/UPGRADING
trunk/configurator.php
trunk/index.php
trunk/passencrypt.php
Property Changed:
----------------
trunk/INSTALL
trunk/Makefile
trunk/RPC2.php
trunk/UPGRADING
trunk/configurator.php
trunk/index.php
trunk/passencrypt.php
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/INSTALL 2008-08-26 09:14:36 UTC (rev 6198)
@@ -156,4 +156,4 @@
FIN
-$Id: INSTALL,v 1.26 2006-09-06 05:40:02 rurban Exp $
+$Id$
Property changes on: trunk/INSTALL
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/Makefile 2008-08-26 09:14:36 UTC (rev 6198)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.15 2008-07-27 21:47:30 rurban Exp $
+# $Id$
# user-definable settings:
VERSION=
# for mysqladmin
Property changes on: trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/RPC2.php 2008-08-26 09:14:36 UTC (rev 6198)
@@ -1,5 +1,5 @@
<?php
-// $Id: RPC2.php,v 1.7 2007-02-17 14:14:27 rurban Exp $
+// $Id$
/*
* The guts of this code have been moved to lib/XmlRpcServer.php.
*
Property changes on: trunk/RPC2.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/UPGRADING
===================================================================
--- trunk/UPGRADING 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/UPGRADING 2008-08-26 09:14:36 UTC (rev 6198)
@@ -157,4 +157,4 @@
An older note on the same subject can be found at:
http://sourceforge.net/forum/message.php?msg_id=107858
-$Id: UPGRADING,v 1.10 2006-02-22 21:03:01 rurban Exp $
+$Id$
Property changes on: trunk/UPGRADING
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/configurator.php 2008-08-26 09:14:36 UTC (rev 6198)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: configurator.php,v 1.50 2007-01-20 15:54:03 rurban Exp $
+<?php // -*-php-*- $Id$
/*
* Copyright 2002,2003,2005 $ThePhpWikiProgrammingTeam
* Copyright 2002 Martin Geisler <gim...@gi...>
@@ -162,7 +162,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<!-- $Id: configurator.php,v 1.50 2007-01-20 15:54:03 rurban Exp $ -->
+<!-- $Id$ -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
<style type="text/css" media="screen">
Property changes on: trunk/configurator.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/index.php 2008-08-26 09:14:36 UTC (rev 6198)
@@ -30,7 +30,7 @@
*/
require_once (dirname(__FILE__).'/lib/prepend.php');
-rcs_id('$Id: index.php,v 1.148 2005-10-30 16:38:13 rurban Exp $');
+rcs_id('$Id$');
require_once(dirname(__FILE__).'/lib/IniConfig.php');
IniConfig(dirname(__FILE__)."/config/config.ini");
Property changes on: trunk/index.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php 2008-08-25 12:33:05 UTC (rev 6197)
+++ trunk/passencrypt.php 2008-08-26 09:14:36 UTC (rev 6198)
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<!-- $Id: passencrypt.php,v 1.6 2005-09-18 11:14:56 rurban Exp $ -->
+<!-- $Id$ -->
<title>Password Encryption Tool</title>
<!--
Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
Property changes on: trunk/passencrypt.php
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-08-26 13:02:24
|
Revision: 6201
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6201&view=rev
Author: vargenau
Date: 2008-08-26 13:02:33 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Activated Id substitution for Subversion
Modified Paths:
--------------
trunk/.htaccess
trunk/admin/.htaccess
trunk/config/.htaccess
trunk/lib/.htaccess
trunk/locale/.htaccess
trunk/locale/ja/pgsrc/.htaccess
trunk/pgsrc/.htaccess
trunk/schemas/.htaccess
trunk/tests/.htaccess
Property Changed:
----------------
trunk/.htaccess
trunk/admin/.htaccess
trunk/config/.htaccess
trunk/lib/.htaccess
trunk/locale/.htaccess
trunk/locale/ja/pgsrc/.htaccess
trunk/pgsrc/.htaccess
trunk/schemas/.htaccess
trunk/tests/.htaccess
Modified: trunk/.htaccess
===================================================================
--- trunk/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,4 +1,4 @@
-# $Id: .htaccess,v 1.8 2004-11-03 18:21:16 rurban Exp $
+# $Id$
<IfModule mod_php4.c>
Property changes on: trunk/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/admin/.htaccess
===================================================================
--- trunk/admin/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/admin/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.1 2004/05/14 10:14:58 rurban Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/admin/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/config/.htaccess
===================================================================
--- trunk/config/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/config/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.1 2004-05-14 10:14:58 rurban Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/config/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/lib/.htaccess
===================================================================
--- trunk/lib/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/lib/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.2 2001-11-08 16:35:05 dairiki Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/lib/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/locale/.htaccess
===================================================================
--- trunk/locale/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/locale/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.2 2001-11-08 16:35:05 dairiki Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/locale/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/locale/ja/pgsrc/.htaccess
===================================================================
--- trunk/locale/ja/pgsrc/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/locale/ja/pgsrc/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.1 2004-02-16 00:19:41 rurban Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/locale/ja/pgsrc/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/pgsrc/.htaccess
===================================================================
--- trunk/pgsrc/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/pgsrc/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.2 2001-11-08 16:35:05 dairiki Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/pgsrc/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/schemas/.htaccess
===================================================================
--- trunk/schemas/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/schemas/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,3 +1,3 @@
-# $Id: .htaccess,v 1.2 2001-11-08 16:35:05 dairiki Exp $
+# $Id$
order allow,deny
Deny from all
Property changes on: trunk/schemas/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/tests/.htaccess
===================================================================
--- trunk/tests/.htaccess 2008-08-26 12:57:28 UTC (rev 6200)
+++ trunk/tests/.htaccess 2008-08-26 13:02:33 UTC (rev 6201)
@@ -1,4 +1,4 @@
-# $Id: .htaccess,v 1.2 2007-01-21 23:30:46 rurban Exp $
+# $Id$
Order Deny,Allow
Deny from all
Allow from localhost 192.168.1.0/24
Property changes on: trunk/tests/.htaccess
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-08-26 15:12:14
|
Revision: 6204
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6204&view=rev
Author: vargenau
Date: 2008-08-26 15:12:03 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Activated Id substitution for Subversion
Modified Paths:
--------------
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/Hawaiian-heavy.css
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/MacOSX-heavy.css
trunk/themes/MacOSX/MacOSX-topbottombars.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/MacOSX/buttons/README
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/monobook.css
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/info.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/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/portland.css
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/jscalendar/calendar-setup.js
trunk/themes/Sidebar/jscalendar/calendar.js
trunk/themes/Sidebar/sidebar.css
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Sidebar/templates/browse-footer.tmpl
trunk/themes/Sidebar/templates/calendar.tmpl
trunk/themes/Sidebar/templates/frame-footer.tmpl
trunk/themes/Sidebar/templates/frame-header.tmpl
trunk/themes/Sidebar/templates/frame-left.tmpl
trunk/themes/Sidebar/templates/frameset.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/SpaceWiki-gravimetric.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/Wordpress.css
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/pgsrc/About
trunk/themes/blog/pgsrc/Blog
trunk/themes/blog/pgsrc/BlogArchives
trunk/themes/blog/pgsrc/CategoryHowTo
trunk/themes/blog/pgsrc/HomePage
trunk/themes/blog/pgsrc/HowTo
trunk/themes/blog/pgsrc/PhotoAlbum
trunk/themes/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/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/phpwiki-heavy.css
trunk/themes/default/phpwiki-modern-heavy.css
trunk/themes/default/phpwiki-modern.css
trunk/themes/default/phpwiki-printer.css
trunk/themes/default/phpwiki-topbottombars.css
trunk/themes/default/phpwiki.css
trunk/themes/default/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/frame-footer.tmpl
trunk/themes/default/templates/frame-header.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/default/toolbar.js
trunk/themes/shamino_com/shamino_com.css
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/signin.tmpl
trunk/themes/shamino_com/templates/top.tmpl
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/phpwiki.css
trunk/themes/smaller/templates/actionbar.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/top.tmpl
trunk/themes/wikilens/themeinfo.php
trunk/themes/wikilens/wikilens.css
trunk/uploads/index.php
Property Changed:
----------------
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/Hawaiian-heavy.css
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/MacOSX-heavy.css
trunk/themes/MacOSX/MacOSX-topbottombars.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/MacOSX/buttons/README
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/monobook.css
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/info.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/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/portland.css
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/jscalendar/calendar-setup.js
trunk/themes/Sidebar/jscalendar/calendar.js
trunk/themes/Sidebar/sidebar.css
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Sidebar/templates/browse-footer.tmpl
trunk/themes/Sidebar/templates/calendar.tmpl
trunk/themes/Sidebar/templates/frame-footer.tmpl
trunk/themes/Sidebar/templates/frame-header.tmpl
trunk/themes/Sidebar/templates/frame-left.tmpl
trunk/themes/Sidebar/templates/frameset.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/SpaceWiki-gravimetric.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/Wordpress.css
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/pgsrc/About
trunk/themes/blog/pgsrc/Blog
trunk/themes/blog/pgsrc/BlogArchives
trunk/themes/blog/pgsrc/CategoryHowTo
trunk/themes/blog/pgsrc/HomePage
trunk/themes/blog/pgsrc/HowTo
trunk/themes/blog/pgsrc/PhotoAlbum
trunk/themes/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/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/phpwiki-heavy.css
trunk/themes/default/phpwiki-modern-heavy.css
trunk/themes/default/phpwiki-modern.css
trunk/themes/default/phpwiki-printer.css
trunk/themes/default/phpwiki-topbottombars.css
trunk/themes/default/phpwiki.css
trunk/themes/default/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/frame-footer.tmpl
trunk/themes/default/templates/frame-header.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/default/toolbar.js
trunk/themes/shamino_com/shamino_com.css
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/signin.tmpl
trunk/themes/shamino_com/templates/top.tmpl
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/phpwiki.css
trunk/themes/smaller/templates/actionbar.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/top.tmpl
trunk/themes/wikilens/themeinfo.php
trunk/themes/wikilens/wikilens.css
trunk/uploads/index.php
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
- rcs_id('$Id: actionbar.tmpl,v 1.6 2007-02-22 20:12:53 rurban Exp $');
+ rcs_id('$Id$');
if (!$page->get('locked') || $user->isAdmin() and $revision)
$EditB = Button("edit",
$revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
Property changes on: trunk/themes/Crao/templates/actionbar.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/body.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
-rcs_id('$Id: body.tmpl,v 1.5 2005-01-25 07:23:31 rurban Exp $');
+rcs_id('$Id$');
?>
<body<?= $WikiTheme->getMoreAttr('body') ?>>
<div id="header"><?php // for top toolbars style sheet ?>
Property changes on: trunk/themes/Crao/templates/body.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/bottom.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
- rcs_id('$Id: bottom.tmpl,v 1.1 2004-05-12 19:42:16 rurban Exp $');
+ rcs_id('$Id$');
?>
<!-- Add your Disclaimer here -->
Property changes on: trunk/themes/Crao/templates/bottom.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/browse.tmpl
===================================================================
--- trunk/themes/Crao/templates/browse.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/browse.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*- ?>
-<!-- $Id: browse.tmpl,v 1.4 2007-01-02 13:29:14 rurban Exp $ -->
+<!-- $Id$ -->
<?php if ($revision and !$revision->isCurrent()) { ?>
<p><strong><?=_("Note:")?></strong>
Property changes on: trunk/themes/Crao/templates/browse.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/editpage.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<!-- -*-html-*- -->
-<!-- $Id: editpage.tmpl,v 1.10 2007-01-07 18:42:10 rurban Exp $ -->
+<!-- $Id$ -->
<?php if (isset($PREVIEW_CONTENT)) { ?>
<p><strong><?=_("Preview only! Changes not saved.")?></strong>
<!-- FIXME: it would be nice to put a link to the #editarea anchor below,
Property changes on: trunk/themes/Crao/templates/editpage.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/head.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
- rcs_id('$Id: head.tmpl,v 1.4 2004-06-18 08:40:39 rurban Exp $');
+ rcs_id('$Id$');
?>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
Property changes on: trunk/themes/Crao/templates/head.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/htmldump.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
-rcs_id('$Id: htmldump.tmpl,v 1.2 2004-06-18 08:40:39 rurban Exp $');
+rcs_id('$Id$');
/*
* This template is used only for html file dumps, and is responsible
* mainly for the outer level <html> stuff and the and <head>.
Property changes on: trunk/themes/Crao/templates/htmldump.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/navbar.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*- ?>
-<!-- $Id: navbar.tmpl,v 1.4 2005-02-27 18:36:29 rurban Exp $ -->
+<!-- $Id$ -->
<!-- The top navigation/search bar -->
<form action="<?= WikiURL(_("TitleSearch"))?>" target="_top"
method="get" accept-charset="<?=$charset?>" id="searchform" name="searchform">
Property changes on: trunk/themes/Crao/templates/navbar.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/signin.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
-rcs_id('$Id: signin.tmpl,v 1.4 2007-01-02 13:29:23 rurban Exp $');
+rcs_id('$Id$');
if (empty($FORMNAME))
$FORMNAME = 'signin';
Property changes on: trunk/themes/Crao/templates/signin.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/top.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
-rcs_id('$Id: top.tmpl,v 1.1 2004-05-12 19:42:17 rurban Exp $');
+rcs_id('$Id$');
global $HIDE_TOOLBARS;
if (!$HIDE_TOOLBARS) {
Property changes on: trunk/themes/Crao/templates/top.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/templates/wikiblog.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,4 +1,4 @@
-<!-- $Id: wikiblog.tmpl,v 1.2 2004-06-18 08:40:39 rurban Exp $ -->
+<!-- $Id$ -->
<?php
$CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
Property changes on: trunk/themes/Crao/templates/wikiblog.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Crao/themeinfo.php
===================================================================
--- trunk/themes/Crao/themeinfo.php 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Crao/themeinfo.php 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php
-rcs_id('$Id: themeinfo.php,v 1.4 2007-07-01 09:36:10 rurban Exp $');
+rcs_id('$Id$');
/*
* This file defines the default appearance ("theme") of PhpWiki.
Property changes on: trunk/themes/Crao/themeinfo.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Hawaiian/Hawaiian-heavy.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian-heavy.css 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Hawaiian/Hawaiian-heavy.css 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
/*
- * $Id: Hawaiian-heavy.css,v 1.9 2002-02-11 02:30:10 carstenklapp Exp $
+ * $Id$
*
* Hawaiian-heavy.css
*
Property changes on: trunk/themes/Hawaiian/Hawaiian-heavy.css
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Hawaiian/Hawaiian.css 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
/**
- * $Id: Hawaiian.css,v 1.28 2007-01-20 18:20:41 rurban Exp $
+ * $Id$
*
* This incarnation of this stylesheet is a complete rewrite from the
* ground up. It has not yet been tested against NS4.
Property changes on: trunk/themes/Hawaiian/Hawaiian.css
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Hawaiian/lib/random.php 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: random.php,v 1.11 2004-06-14 11:26:49 rurban Exp $');
+<?php rcs_id('$Id$');
/**
*/
class randomImage {
Property changes on: trunk/themes/Hawaiian/lib/random.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/Hawaiian/themeinfo.php 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,6 +1,6 @@
<?php
-rcs_id('$Id: themeinfo.php,v 1.27 2007-07-01 09:36:10 rurban Exp $');
+rcs_id('$Id$');
/**
* WikiWiki Hawaiian theme for PhpWiki.
Property changes on: trunk/themes/Hawaiian/themeinfo.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MacOSX/MacOSX-heavy.css
===================================================================
--- trunk/themes/MacOSX/MacOSX-heavy.css 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MacOSX/MacOSX-heavy.css 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
/*
- * $Id: MacOSX-heavy.css,v 1.9 2002-02-19 21:36:19 carstenklapp Exp $
+ * $Id$
*
* phpwiki-heavy.css
*
Property changes on: trunk/themes/MacOSX/MacOSX-heavy.css
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MacOSX/MacOSX-topbottombars.css
===================================================================
--- trunk/themes/MacOSX/MacOSX-topbottombars.css 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MacOSX/MacOSX-topbottombars.css 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,6 +1,6 @@
/*@charset "iso-8859-1";*/
/**
- * $Id: MacOSX-topbottombars.css,v 1.1 2003-12-01 15:16:07 carstenklapp Exp $
+ * $Id$
*
*/
@import url("MacOSX.css");
Property changes on: trunk/themes/MacOSX/MacOSX-topbottombars.css
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MacOSX/MacOSX.css 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
/*
- $Id: MacOSX.css,v 1.41 2007-02-17 14:16:07 rurban Exp $
+ $Id$
Classes:
Property changes on: trunk/themes/MacOSX/MacOSX.css
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MacOSX/buttons/README
===================================================================
--- trunk/themes/MacOSX/buttons/README 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MacOSX/buttons/README 2008-08-26 15:12:03 UTC (rev 6204)
@@ -151,4 +151,4 @@
Verwijder+Pagina.png
ZoekPagina.png
-$Id: README,v 1.4 2004-06-19 12:13:56 rurban Exp $
+$Id$
Property changes on: trunk/themes/MacOSX/buttons/README
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MacOSX/lib/RecentChanges.php
===================================================================
--- trunk/themes/MacOSX/lib/RecentChanges.php 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MacOSX/lib/RecentChanges.php 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: RecentChanges.php,v 1.4 2002-01-28 21:49:24 carstenklapp Exp $');
+<?php rcs_id('$Id$');
/*
* Extensions/modifications to the stock RecentChanges (and PageHistory) format.
*/
Property changes on: trunk/themes/MacOSX/lib/RecentChanges.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MacOSX/themeinfo.php 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php //-*-php-*-
-rcs_id('$Id: themeinfo.php,v 1.56 2007-07-01 09:36:10 rurban Exp $');
+rcs_id('$Id$');
/**
* A PhpWiki theme inspired by the Aqua appearance of Mac OS X.
Property changes on: trunk/themes/MacOSX/themeinfo.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MonoBook/monobook.css 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
/**
- * $Id: monobook.css,v 1.1 2004-06-11 09:01:50 rurban Exp $
+ * $Id$
* We have two possibilities to override the default:
* 1. import is ns4 incompatible
* 2. add a 2nd css in themeinfo.php
Property changes on: trunk/themes/MonoBook/monobook.css
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-php-*- ?>
-<!-- $Id: actionbar.tmpl,v 1.18 2008-08-20 05:54:50 vargenau Exp $ -->
+<!-- $Id$ -->
<?php
//$p = $WikiTheme->tooltipAccessKeyPrefix();
$dbh = $request->getDbh();
Property changes on: trunk/themes/MonoBook/templates/actionbar.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2008-08-26 13:23:56 UTC (rev 6203)
+++ trunk/themes/MonoBook/templates/body.tmpl 2008-08-26 15:12:03 UTC (rev 6204)
@@ -1,5 +1,5 @@
<?php // -*-html-*-
-rcs_id('$Id: body.tmpl,v 1.7 2007-03-18 17:36:05 rurban Exp $');
+rcs_id('$Id$');
// Todo: set the body attr dynamically. here class="ns-2" for mozilla
?>
<body <?= $WikiTheme->getMoreAttr('body') ?>>
Property changes on: trunk/themes/MonoBook/templates/body.tmpl
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/themes/MonoBook/templates/browse...
[truncated message content] |
|
From: <var...@us...> - 2008-09-05 15:18:41
|
Revision: 6234
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6234&view=rev
Author: vargenau
Date: 2008-09-05 15:18:45 +0000 (Fri, 05 Sep 2008)
Log Message:
-----------
Implemented action=purge
Modified Paths:
--------------
trunk/lib/main.php
trunk/lib/removepage.php
trunk/themes/gforge/templates/actionbar.tmpl
Added Paths:
-----------
trunk/lib/purgepage.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2008-09-05 09:48:17 UTC (rev 6233)
+++ trunk/lib/main.php 2008-09-05 15:18:45 UTC (rev 6234)
@@ -560,6 +560,7 @@
'create' => _("create this page"),
'loadfile' => _("load files into this wiki"),
'lock' => _("lock this page"),
+ 'purge' => _("purge this page"),
'remove' => _("remove this page"),
'unlock' => _("unlock this page"),
'upload' => _("upload a zip dump"),
@@ -601,6 +602,7 @@
'create' => _("Creating pages"),
'loadfile' => _("Loading files"),
'lock' => _("Locking pages"),
+ 'purge' => _("Purging pages"),
'remove' => _("Removing pages"),
'unlock' => _("Unlocking pages"),
'upload' => _("Uploading zip dumps"),
@@ -702,6 +704,7 @@
case 'upload':
case 'loadfile':
+ case 'purge':
case 'remove':
case 'lock':
case 'unlock':
@@ -1162,6 +1165,16 @@
$this->action_browse();
}
+ function action_purge () {
+ $pagename = $this->getArg('pagename');
+ if (strstr($pagename, _("PhpWikiAdministration"))) {
+ $this->action_browse();
+ } else {
+ include('lib/purgepage.php');
+ PurgePage($this);
+ }
+ }
+
function action_remove () {
// This check is now redundant.
//$user->requireAuth(WIKIAUTH_ADMIN);
@@ -1396,656 +1409,6 @@
if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)
main();
-
-// $Log: not supported by cvs2svn $
-// Revision 1.244 2008/06/22 09:51:14 rurban
-//
-// Fix user_theme handling on login. pref store ->default_value
-// Fallback to default if '0'.
-//
-// Revision 1.243 2008/03/22 21:49:18 rurban
-// Improve pref handling
-// clone the user object before destroying the important but lengthy fields.
-// (overlong session data)
-//
-// Revision 1.242 2008/02/14 18:27:49 rurban
-// signin fixes for !ENABLE_USER_NEW (to overcome php-5.2 recursion login
-// problems)
-//
-// Revision 1.241 2007/09/22 12:39:32 rurban
-// fix unknown variable WikiTheme
-//
-// Revision 1.240 2007/09/19 18:02:12 rurban
-// htmldump optimization: continue dump on access denied
-//
-// Revision 1.239 2007/09/12 19:41:01 rurban
-// revise INSECURE_ACTIONS_LOCALHOST_ONLY actions
-//
-// Revision 1.238 2007/09/01 13:24:23 rurban
-// add INSECURE_ACTIONS_LOCALHOST_ONLY. advanced security settings
-//
-// Revision 1.237 2007/08/25 18:03:34 rurban
-// change rename action from access perm change to edit: allow the signed in user to rename.
-//
-// Revision 1.236 2007/07/21 18:08:49 rurban
-// more searchtypes
-//
-// Revision 1.235 2007/07/14 12:04:19 rurban
-// support searchtype=external (mediawiki like search buttons: Text, Title, External)
-//
-// Revision 1.234 2007/07/01 09:36:10 rurban
-// themes are now easier derivable classes from other themes.
-// removed global code setters, switched to $WikiTheme->load() in main
-//
-// Revision 1.233 2007/06/02 21:07:21 rurban
-// _isActionPage ($pagename, $verbose = true)
-//
-// Revision 1.232 2007/05/13 18:13:20 rurban
-// improve prefs: only save with userid
-//
-// Revision 1.231 2007/02/17 14:16:44 rurban
-// action_soap, action_setpref, anon perms for wikitohtml, setpref
-//
-// Revision 1.230 2007/01/27 21:52:15 rurban
-// Improved login header for !ALLOW_ANON_USER
-//
-// Revision 1.229 2007/01/07 18:44:30 rurban
-// Fix typo for moderation
-//
-// Revision 1.228 2007/01/02 13:22:17 rurban
-// allow application/xml for xmlrpc detection: acdropdown uses this type. silence findActionPage warnings
-//
-// Revision 1.227 2006/12/22 17:53:55 rurban
-// Remove action from edited url
-// move wikitohtml to lib/WysiwygEdit/Wikiwyg.php
-//
-// Revision 1.226 2006/09/06 06:01:45 rurban
-// minor cleanup
-//
-// Revision 1.225 2006/05/31 19:59:57 jeannicolas
-//
-//
-// Added wysiwyg_editor 1.1b
-//
-// Revision 1.224 2006/05/13 19:59:55 rurban
-// added wysiwyg_editor-1.3a feature by Jean-Nicolas GEREONE <jea...@st...>
-// converted wysiwyg_editor-1.3a js to WysiwygEdit framework
-// changed default ENABLE_WYSIWYG = true and added WYSIWYG_BACKEND = Wikiwyg
-//
-// Revision 1.223 2006/03/19 15:01:00 rurban
-// sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host
-//
-// Revision 1.222 2006/03/19 14:53:12 rurban
-// sf.net patch #1438392 by Matt Brown: Bogo Login is broken when ENABLE_PAGEPERM=false
-//
-// Revision 1.221 2006/03/19 14:23:51 rurban
-// sf.net patch #1377011 by Matt Brown: add DATABASE_OPTIMISE_FREQUENCY
-//
-// Revision 1.220 2006/03/07 21:04:15 rurban
-// wikihash for php-5.1
-//
-// Revision 1.219 2005/10/30 14:20:42 rurban
-// move Captcha specific vars and methods into a Captcha object
-// randomize Captcha chars positions and angles (smoothly)
-//
-// Revision 1.218 2005/10/29 14:18:06 rurban
-// fix typo
-//
-// Revision 1.217 2005/09/18 12:44:00 rurban
-// novatrope patch to let only _AUTHENTICATED view pages
-//
-// Revision 1.216 2005/08/27 09:40:46 rurban
-// fix login with HttpAuth
-//
-// Revision 1.215 2005/08/07 10:50:27 rurban
-// postpone guard
-//
-// Revision 1.214 2005/08/07 09:14:03 rurban
-// fix cookie logout; let the WIKI_ID cookie get deleted
-//
-// Revision 1.213 2005/06/10 06:10:35 rurban
-// ensure Update Preferences gets through
-//
-// Revision 1.212 2005/04/25 20:17:14 rurban
-// captcha feature by Benjamin Drieu. Patch #1110699
-//
-// Revision 1.211 2005/04/11 19:42:54 rurban
-// reformatting, SESSION_SAVE_PATH check
-//
-// Revision 1.210 2005/04/07 06:06:34 rurban
-// add _SERVER[REMOTE_USER] check for pubcookie et al, Bug #1177259 (iamjpr)
-//
-// Revision 1.209 2005/04/06 06:19:30 rurban
-// Revert the previous wrong bugfix #1175761: USECACHE was mixed with WIKIDB_NOCACHE_MARKUP.
-// Fix WIKIDB_NOCACHE_MARKUP in main (always set it) and clarify it in WikiDB
-//
-// Revision 1.208 2005/02/28 21:24:32 rurban
-// ignore forbidden ini_set warnings. Bug #1117254 by Xavier Roche
-//
-// Revision 1.207 2005/02/10 19:03:37 rurban
-// try to avoid duoplicate lang/theme init
-//
-// Revision 1.206 2005/02/04 11:30:10 rurban
-// remove old comments
-//
-// Revision 1.205 2005/01/29 20:41:47 rurban
-// some minor php5 strictness fixes
-//
-// Revision 1.204 2005/01/25 07:35:42 rurban
-// add TODO comment
-//
-// Revision 1.203 2005/01/21 14:11:23 rurban
-// better moderation class tag
-//
-// Revision 1.202 2005/01/21 12:02:32 rurban
-// deduce username for xmlrpc also
-//
-// Revision 1.201 2005/01/20 10:18:17 rurban
-// reformatting
-//
-// Revision 1.200 2004/12/26 17:08:36 rurban
-// php5 fixes: case-sensitivity, no & new
-//
-// Revision 1.199 2004/12/19 00:58:01 rurban
-// Enforce PASSWORD_LENGTH_MINIMUM in almost all PassUser checks,
-// Provide an errormessage if so. Just PersonalPage and BogoLogin not.
-// Simplify httpauth logout handling and set sessions for all methods.
-// fix main.php unknown index "x" getLevelDescription() warning.
-//
-// Revision 1.198 2004/12/17 16:49:51 rurban
-// avoid Invalid username message on Sign In button click
-//
-// Revision 1.197 2004/12/17 16:39:55 rurban
-// enable sessions for HttpAuth
-//
-// Revision 1.196 2004/12/10 02:36:43 rurban
-// More help with the new native xmlrpc lib. no warnings, no user cookie on xmlrpc.
-//
-// Revision 1.195 2004/12/09 22:24:44 rurban
-// optimize on _DEBUG_SQL only. but now again on every 50th request, not just save.
-//
-// Revision 1.194 2004/11/30 17:46:49 rurban
-// added ModeratedPage POST action hook (part 2/3)
-//
-// Revision 1.193 2004/11/30 07:51:08 rurban
-// fixed SESSION_SAVE_PATH warning msg
-//
-// Revision 1.192 2004/11/21 11:59:20 rurban
-// remove final \n to be ob_cache independent
-//
-// Revision 1.191 2004/11/19 19:22:03 rurban
-// ModeratePage part1: change status
-//
-// Revision 1.190 2004/11/15 15:56:40 rurban
-// don't load PagePerm on ENABLE_PAGEPERM = false to save memory. Move mayAccessPage() to main.php
-//
-// Revision 1.189 2004/11/09 17:11:16 rurban
-// * revert to the wikidb ref passing. there's no memory abuse there.
-// * use new wikidb->_cache->_id_cache[] instead of wikidb->_iwpcache, to effectively
-// store page ids with getPageLinks (GleanDescription) of all existing pages, which
-// are also needed at the rendering for linkExistingWikiWord().
-// pass options to pageiterator.
-// use this cache also for _get_pageid()
-// This saves about 8 SELECT count per page (num all pagelinks).
-// * fix passing of all page fields to the pageiterator.
-// * fix overlarge session data which got broken with the latest ACCESS_LOG_SQL changes
-//
-// Revision 1.188 2004/11/07 16:02:52 rurban
-// new sql access log (for spam prevention), and restructured access log class
-// dbh->quote (generic)
-// pear_db: mysql specific parts seperated (using replace)
-//
-// Revision 1.187 2004/11/05 22:08:52 rurban
-// Ok: Fix loading all required userclasses beforehand. This is much slower than before but safes a few bytes RAM
-//
-// Revision 1.186 2004/11/05 20:53:35 rurban
-// login cleanup: better debug msg on failing login,
-// checked password less immediate login (bogo or anon),
-// checked olduser pref session error,
-// better PersonalPage without password warning on minimal password length=0
-// (which is default now)
-//
-// Revision 1.185 2004/11/01 13:55:05 rurban
-// fix against switching user new/old between sessions
-//
-// Revision 1.184 2004/11/01 10:43:57 rurban
-// seperate PassUser methods into seperate dir (memory usage)
-// fix WikiUser (old) overlarge data session
-// remove wikidb arg from various page class methods, use global ->_dbi instead
-// ...
-//
-// Revision 1.183 2004/10/14 19:23:58 rurban
-// remove debugging prints
-//
-// Revision 1.182 2004/10/12 13:13:19 rurban
-// php5 compatibility (5.0.1 ok)
-//
-// Revision 1.181 2004/10/07 16:08:58 rurban
-// fixed broken FileUser session handling.
-// thanks to Arnaud Fontaine for detecting this.
-// enable file user Administrator membership.
-//
-// Revision 1.180 2004/10/04 23:39:34 rurban
-// just aesthetics
-//
-// Revision 1.179 2004/09/25 18:57:42 rurban
-// better ACL error message: view not browse, change not setacl, ...
-//
-// Revision 1.178 2004/09/25 16:27:36 rurban
-// better not allowed description: on global disallowed, and on missing pageperms
-//
-// Revision 1.177 2004/09/14 10:31:09 rurban
-// exclude E_STRICT for php5: untested. I believe this must be set earlier because the parsing step is already strict, and this is called at run-time
-//
-// Revision 1.176 2004/08/05 17:33:22 rurban
-// aesthetic typo
-//
-// Revision 1.175 2004/07/13 13:08:25 rurban
-// fix PEAR memory waste issues
-//
-// Revision 1.174 2004/07/08 13:50:32 rurban
-// various unit test fixes: print error backtrace on _DEBUG_TRACE; allusers fix; new PHPWIKI_NOMAIN constant for omitting the mainloop
-//
-// Revision 1.173 2004/07/05 12:57:54 rurban
-// add mysql timeout
-//
-// Revision 1.172 2004/07/03 08:04:19 rurban
-// fixed implicit PersonalPage login (e.g. on edit), fixed to check against create ACL on create, not edit
-//
-// Revision 1.171 2004/06/29 09:30:42 rurban
-// force string hash
-//
-// Revision 1.170 2004/06/25 14:29:20 rurban
-// WikiGroup refactoring:
-// global group attached to user, code for not_current user.
-// improved helpers for special groups (avoid double invocations)
-// new experimental config option ENABLE_XHTML_XML (fails with IE, and document.write())
-// fixed a XHTML validation error on userprefs.tmpl
-//
-// Revision 1.169 2004/06/20 14:42:54 rurban
-// various php5 fixes (still broken at blockparser)
-//
-// Revision 1.168 2004/06/17 10:39:18 rurban
-// fix reverse translation of possible actionpage
-//
-// Revision 1.167 2004/06/16 13:21:16 rurban
-// stabilize on failing ldap queries or bind
-//
-// Revision 1.166 2004/06/15 09:15:52 rurban
-// IMPORTANT: fixed passwd handling for passwords stored in prefs:
-// fix encrypted usage, actually store and retrieve them from db
-// fix bogologin with passwd set.
-// fix php crashes with call-time pass-by-reference (references wrongly used
-// in declaration AND call). This affected mainly Apache2 and IIS.
-// (Thanks to John Cole to detect this!)
-//
-// Revision 1.165 2004/06/14 11:31:37 rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-// inherit PageList default options from PageList
-// default sortby=pagename
-// use options in PageList_Selectable (limit, sortby, ...)
-// added action revert, with button at action=diff
-// added option regex to WikiAdminSearchReplace
-//
-// Revision 1.164 2004/06/13 13:54:25 rurban
-// Catch fatals on the four dump calls (as file and zip, as html and mimified)
-// FoafViewer: Check against external requirements, instead of fatal.
-// Change output for xhtmldumps: using file:// urls to the local fs.
-// Catch SOAP fatal by checking for GOOGLE_LICENSE_KEY
-// Import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini.
-//
-// Revision 1.163 2004/06/13 11:35:32 rurban
-// check for create action on action=edit not to fool PagePerm checks
-//
-// Revision 1.162 2004/06/08 10:05:11 rurban
-// simplified admin action shortcuts
-//
-// Revision 1.161 2004/06/07 22:58:40 rurban
-// simplified chown, setacl, dump actions
-//
-// Revision 1.160 2004/06/07 22:44:14 rurban
-// added simplified chown, setacl actions
-//
-// Revision 1.159 2004/06/06 16:58:51 rurban
-// added more required ActionPages for foreign languages
-// install now english ActionPages if no localized are found. (again)
-// fixed default anon user level to be 0, instead of -1
-// (wrong "required administrator to view this page"...)
-//
-// Revision 1.158 2004/06/04 20:32:53 rurban
-// Several locale related improvements suggested by Pierrick Meignen
-// LDAP fix by John Cole
-// reanable admin check without ENABLE_PAGEPERM in the admin plugins
-//
-// Revision 1.157 2004/06/04 12:40:21 rurban
-// Restrict valid usernames to prevent from attacks against external auth or compromise
-// possible holes.
-// Fix various WikiUser old issues with default IMAP,LDAP,POP3 configs. Removed these.
-// Fxied more warnings
-//
-// Revision 1.156 2004/06/03 17:58:16 rurban
-// support immediate LANG and THEME switch inside a session
-//
-// Revision 1.155 2004/06/03 10:18:19 rurban
-// fix FileUser locking issues, new config ENABLE_PAGEPERM
-//
-// Revision 1.154 2004/06/02 18:01:46 rurban
-// init global FileFinder to add proper include paths at startup
-// adds PHPWIKI_DIR if started from another dir, lib/pear also
-// fix slashify for Windows
-// fix USER_AUTH_POLICY=old, use only USER_AUTH_ORDER methods (besides HttpAuth)
-//
-// Revision 1.153 2004/06/01 15:28:00 rurban
-// AdminUser only ADMIN_USER not member of Administrators
-// some RateIt improvements by dfrankow
-// edit_toolbar buttons
-//
-// Revision 1.152 2004/05/27 17:49:06 rurban
-// renamed DB_Session to DbSession (in CVS also)
-// added WikiDB->getParam and WikiDB->getAuthParam method to get rid of globals
-// remove leading slash in error message
-// added force_unlock parameter to File_Passwd (no return on stale locks)
-// fixed adodb session AffectedRows
-// added FileFinder helpers to unify local filenames and DATA_PATH names
-// editpage.php: new edit toolbar javascript on ENABLE_EDIT_TOOLBAR
-//
-// Revision 1.151 2004/05/25 12:40:48 rurban
-// trim the pagename
-//
-// Revision 1.150 2004/05/25 10:18:44 rurban
-// Check for UTF-8 URLs; Internet Explorer produces these if you
-// type non-ASCII chars in the URL bar or follow unescaped links.
-// Fixes sf.net bug #953949
-// src: languages/Language.php:checkTitleEncoding() from mediawiki
-//
-// Revision 1.149 2004/05/18 13:31:19 rurban
-// hold warnings until headers are sent. new Error-style with collapsed output of repeated messages
-//
-// Revision 1.148 2004/05/17 17:43:29 rurban
-// CGI: no PATH_INFO fix
-//
-// Revision 1.147 2004/05/15 19:48:33 rurban
-// fix some too loose PagePerms for signed, but not authenticated users
-// (admin, owner, creator)
-// no double login page header, better login msg.
-// moved action_pdf to lib/pdf.php
-//
-// Revision 1.146 2004/05/15 18:31:01 rurban
-// some action=pdf Request fixes: With MSIE it works now. Now the work with the page formatting begins.
-//
-// Revision 1.145 2004/05/12 10:49:55 rurban
-// require_once fix for those libs which are loaded before FileFinder and
-// its automatic include_path fix, and where require_once doesn't grok
-// dirname(__FILE__) != './lib'
-// upgrade fix with PearDB
-// navbar.tmpl: remove spaces for IE button alignment
-//
-// Revision 1.144 2004/05/06 19:26:16 rurban
-// improve stability, trying to find the InlineParser endless loop on sf.net
-//
-// remove end-of-zip comments to fix sf.net bug #777278 and probably #859628
-//
-// Revision 1.143 2004/05/06 17:30:38 rurban
-// CategoryGroup: oops, dos2unix eol
-// improved phpwiki_version:
-// pre -= .0001 (1.3.10pre: 1030.099)
-// -p1 += .001 (1.3.9-p1: 1030.091)
-// improved InstallTable for mysql and generic SQL versions and all newer tables so far.
-// abstracted more ADODB/PearDB methods for action=upgrade stuff:
-// backend->backendType(), backend->database(),
-// backend->listOfFields(),
-// backend->listOfTables(),
-//
-// Revision 1.142 2004/05/04 22:34:25 rurban
-// more pdf support
-//
-// Revision 1.141 2004/05/03 13:16:47 rurban
-// fixed UserPreferences update, esp for boolean and int
-//
-// Revision 1.140 2004/05/02 21:26:38 rurban
-// limit user session data (HomePageHandle and auth_dbi have to invalidated anyway)
-// because they will not survive db sessions, if too large.
-// extended action=upgrade
-// some WikiTranslation button work
-// revert WIKIAUTH_UNOBTAINABLE (need it for main.php)
-// some temp. session debug statements
-//
-// Revision 1.139 2004/05/02 15:10:07 rurban
-// new finally reliable way to detect if /index.php is called directly
-// and if to include lib/main.php
-// new global AllActionPages
-// SetupWiki now loads all mandatory pages: HOME_PAGE, action pages, and warns if not.
-// WikiTranslation what=buttons for Carsten to create the missing MacOSX buttons
-// PageGroupTestOne => subpages
-// renamed PhpWikiRss to PhpWikiRecentChanges
-// more docs, default configs, ...
-//
-// Revision 1.138 2004/05/01 15:59:29 rurban
-// more php-4.0.6 compatibility: superglobals
-//
-// Revision 1.137 2004/04/29 19:39:44 rurban
-// special support for formatted plugins (one-liners)
-// like <small><plugin BlaBla ></small>
-// iter->asArray() helper for PopularNearby
-// db_session for older php's (no &func() allowed)
-//
-// Revision 1.136 2004/04/29 17:18:19 zorloc
-// Fixes permission failure issues. With PagePermissions and Disabled
-// Actions when user did not have permission WIKIAUTH_FORBIDDEN was
-// returned. In WikiUser this was ok because WIKIAUTH_FORBIDDEN had a
-// value of 11 -- thus no user could perform that action. But
-// WikiUserNew has a WIKIAUTH_FORBIDDEN value of -1 -- thus a user
-// without sufficent permission to do anything. The solution is a new
-// high value permission level (WIKIAUTH_UNOBTAINABLE) to be the
-// default level for access failure.
-//
-// Revision 1.135 2004/04/26 12:15:01 rurban
-// check default config values
-//
-// Revision 1.134 2004/04/23 06:46:37 zorloc
-// Leave DB connection open when USE_DB_SESSION is true so that session info can be written to the DB.
-//
-// Revision 1.133 2004/04/20 18:10:31 rurban
-// config refactoring:
-// FileFinder is needed for WikiFarm scripts calling index.php
-// config run-time calls moved to lib/IniConfig.php:fix_configs()
-// added PHPWIKI_DIR smart-detection code (Theme finder)
-// moved FileFind to lib/FileFinder.php
-// cleaned lib/config.php
-//
-// Revision 1.132 2004/04/19 21:51:41 rurban
-// php5 compatibility: it works!
-//
-// Revision 1.131 2004/04/19 18:27:45 rurban
-// Prevent from some PHP5 warnings (ref args, no :: object init)
-// php5 runs now through, just one wrong XmlElement object init missing
-// Removed unneccesary UpgradeUser lines
-// Changed WikiLink to omit version if current (RecentChanges)
-//
-// Revision 1.130 2004/04/18 00:25:53 rurban
-// allow "0" pagename
-//
-// Revision 1.129 2004/04/07 23:13:19 rurban
-// fixed pear/File_Passwd for Windows
-// fixed FilePassUser sessions (filehandle revive) and password update
-//
-// Revision 1.128 2004/04/02 15:06:55 rurban
-// fixed a nasty ADODB_mysql session update bug
-// improved UserPreferences layout (tabled hints)
-// fixed UserPreferences auth handling
-// improved auth stability
-// improved old cookie handling: fixed deletion of old cookies with paths
-//
-// Revision 1.127 2004/03/25 17:00:31 rurban
-// more code to convert old-style pref array to new hash
-//
-// Revision 1.126 2004/03/24 19:39:03 rurban
-// php5 workaround code (plus some interim debugging code in XmlElement)
-// php5 doesn't work yet with the current XmlElement class constructors,
-// WikiUserNew does work better than php4.
-// rewrote WikiUserNew user upgrading to ease php5 update
-// fixed pref handling in WikiUserNew
-// added Email Notification
-// added simple Email verification
-// removed emailVerify userpref subclass: just a email property
-// changed pref binary storage layout: numarray => hash of non default values
-// print optimize message only if really done.
-// forced new cookie policy: delete pref cookies, use only WIKI_ID as plain string.
-// prefs should be stored in db or homepage, besides the current session.
-//
-// Revision 1.125 2004/03/14 16:30:52 rurban
-// db-handle session revivification, dba fixes
-//
-// Revision 1.124 2004/03/12 15:48:07 rurban
-// fixed explodePageList: wrong sortby argument order in UnfoldSubpages
-// simplified lib/stdlib.php:explodePageList
-//
-// Revision 1.123 2004/03/10 15:41:27 rurban
-// use default pref mysql table
-//
-// Revision 1.122 2004/03/08 18:17:09 rurban
-// added more WikiGroup::getMembersOf methods, esp. for special groups
-// fixed $LDAP_SET_OPTIONS
-// fixed _AuthInfo group methods
-//
-// Revision 1.121 2004/03/01 13:48:45 rurban
-// rename fix
-// p[] consistency fix
-//
-// Revision 1.120 2004/03/01 10:22:41 rurban
-// initializeTheme optimize
-//
-// Revision 1.119 2004/02/26 20:45:06 rurban
-// check for ALLOW_ANON_USER = false
-//
-// Revision 1.118 2004/02/26 01:32:03 rurban
-// fixed session login with old WikiUser object.
-// strangely, the errormask gets corrupted to 1, Pear???
-//
-// Revision 1.117 2004/02/24 17:19:37 rurban
-// debugging helpers only
-//
-// Revision 1.116 2004/02/24 15:17:14 rurban
-// improved auth errors with individual pages. the fact that you may
-// not browse a certain admin page does not conclude that you may not
-// browse the whole wiki. renamed browse => view
-//
-// Revision 1.115 2004/02/15 21:34:37 rurban
-// PageList enhanced and improved.
-// fixed new WikiAdmin... plugins
-// editpage, Theme with exp. htmlarea framework
-// (htmlarea yet committed, this is really questionable)
-// WikiUser... code with better session handling for prefs
-// enhanced UserPreferences (again)
-// RecentChanges for show_deleted: how should pages be deleted then?
-//
-// Revision 1.114 2004/02/15 17:30:13 rurban
-// workaround for lost db connnection handle on session restauration (->_auth_dbi)
-// fixed getPreferences() (esp. from sessions)
-// fixed setPreferences() (update and set),
-// fixed AdoDb DB statements,
-// update prefs only at UserPreferences POST (for testing)
-// unified db prefs methods (but in external pref classes yet)
-//
-// Revision 1.113 2004/02/12 13:05:49 rurban
-// Rename functional for PearDB backend
-// some other minor changes
-// SiteMap comes with a not yet functional feature request: includepages (tbd)
-//
-// Revision 1.112 2004/02/09 03:58:12 rurban
-// for now default DB_SESSION to false
-// PagePerm:
-// * not existing perms will now query the parent, and not
-// return the default perm
-// * added pagePermissions func which returns the object per page
-// * added getAccessDescription
-// WikiUserNew:
-// * added global ->prepare (not yet used) with smart user/pref/member table prefixing.
-// * force init of authdbh in the 2 db classes
-// main:
-// * fixed session handling (not triple auth request anymore)
-// * don't store cookie prefs with sessions
-// stdlib: global obj2hash helper from _AuthInfo, also needed for PagePerm
-//
-// Revision 1.111 2004/02/07 10:41:25 rurban
-// fixed auth from session (still double code but works)
-// fixed GroupDB
-// fixed DbPassUser upgrade and policy=old
-// added GroupLdap
-//
-// Revision 1.110 2004/02/03 09:45:39 rurban
-// LDAP cleanup, start of new Pref classes
-//
-// Revision 1.109 2004/01/30 19:57:58 rurban
-// fixed DBAuthParams['pref_select']: wrong _auth_dbi object used.
-//
-// Revision 1.108 2004/01/28 14:34:14 rurban
-// session table takes the common prefix
-// + various minor stuff
-// reallow password changing
-//
-// Revision 1.107 2004/01/27 23:23:39 rurban
-// renamed ->Username => _userid for consistency
-// renamed mayCheckPassword => mayCheckPass
-// fixed recursion problem in WikiUserNew
-// fixed bogo login (but not quite 100% ready yet, password storage)
-//
-// Revision 1.106 2004/01/26 09:17:49 rurban
-// * changed stored pref representation as before.
-// the array of objects is 1) bigger and 2)
-// less portable. If we would import packed pref
-// objects and the object definition was changed, PHP would fail.
-// This doesn't happen with an simple array of non-default values.
-// * use $prefs->retrieve and $prefs->store methods, where retrieve
-// understands the interim format of array of objects also.
-// * simplified $prefs->get() and fixed $prefs->set()
-// * added $user->_userid and class '_WikiUser' portability functions
-// * fixed $user object ->_level upgrading, mostly using sessions.
-// this fixes yesterdays problems with loosing authorization level.
-// * fixed WikiUserNew::checkPass to return the _level
-// * fixed WikiUserNew::isSignedIn
-// * added explodePageList to class PageList, support sortby arg
-// * fixed UserPreferences for WikiUserNew
-// * fixed WikiPlugin for empty defaults array
-// * UnfoldSubpages: added pagename arg, renamed pages arg,
-// removed sort arg, support sortby arg
-//
-// Revision 1.105 2004/01/25 03:57:15 rurban
-// WikiUserNew support (temp. ENABLE_USER_NEW constant)
-//
-// Revision 1.104 2003/12/26 06:41:16 carstenklapp
-// Bugfix: Try to defer OS errors about session.save_path and ACCESS_LOG,
-// so they don't prevent IE from partially (or not at all) rendering the
-// page. This should help a little for the IE user who encounters trouble
-// when setting up a new PhpWiki for the first time.
-//
-// Revision 1.103 2003/12/02 00:10:00 carstenklapp
-// Bugfix: Ongoing work to untangle UserPreferences/WikiUser/request code
-// mess: UserPreferences should take effect immediately now upon signing
-// in.
-//
-// Revision 1.102 2003/11/25 22:55:32 carstenklapp
-// Localization bugfix: For wikis where English is not the default system
-// language, make sure that the authority error message (i.e. "You must
-// sign in to edit pages in this wiki" etc.) is displayed in the wiki's
-// default language. Previously it would always display in English.
-// (Added call to update_locale() before displaying any messages prior to
-// the login prompt.)
-//
-// Revision 1.101 2003/11/25 21:49:44 carstenklapp
-// Bugfix: For a non-english wiki or when the user's preference is not
-// english, the wiki would always use the english ActionPage first if it
-// was present rather than the appropriate localised variant. (PhpWikis
-// running only in english or Wikis running ONLY without any english
-// ActionPages would not notice this bug, only when both english and
-// localised ActionPages were in the DB.) Now we check for the localised
-// variant first.
-//
-// Revision 1.100 2003/11/18 16:54:18 carstenklapp
-// Reformatting only: Tabs to spaces, added rcs log.
-//
-
-
// Local Variables:
// mode: php
// tab-width: 8
Added: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php (rev 0)
+++ trunk/lib/purgepage.php 2008-09-05 15:18:45 UTC (rev 6234)
@@ -0,0 +1,70 @@
+<?php
+rcs_id('$Id: purgepage.php,v 1.26 2004/12/20 12:12:31 rurban Exp $');
+require_once('lib/Template.php');
+
+function PurgePage (&$request) {
+ global $WikiTheme;
+
+ $page = $request->getPage();
+ $pagelink = WikiLink($page);
+
+ if ($request->getArg('cancel')) {
+ $request->redirect(WikiURL($page)); // noreturn
+ }
+
+ $current = $page->getCurrentRevision();
+
+ if (!$current or !($version = $current->getVersion())) {
+ $html = HTML::p(array('class' => 'error'), _("Sorry, this page does not exist."));
+ }
+ elseif (!$request->isPost() || !$request->getArg('verify')) {
+
+ $purgeB = Button('submit:verify', _("Purge Page"), 'wikiadmin');
+ $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
+
+ $html = HTML(HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
+ ...
[truncated message content] |
|
From: <var...@us...> - 2008-09-07 15:13:48
|
Revision: 6248
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6248&view=rev
Author: vargenau
Date: 2008-09-07 15:13:56 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Renamed class Theme to WikiTheme to avoid Gforge name clash
Modified Paths:
--------------
trunk/doc/THEMES
trunk/lib/HtmlElement.php
trunk/lib/PageList.php
trunk/lib/config.php
trunk/lib/editpage.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/plugin/FrameInclude.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/stdlib.php
trunk/pgsrc/ReleaseNotes
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/themeinfo.php
trunk/themes/default/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/themeinfo.php
trunk/themes/wikilens/themeinfo.php
Added Paths:
-----------
trunk/lib/WikiTheme.php
Removed Paths:
-------------
trunk/lib/Theme.php
Modified: trunk/doc/THEMES
===================================================================
--- trunk/doc/THEMES 2008-09-07 15:06:20 UTC (rev 6247)
+++ trunk/doc/THEMES 2008-09-07 15:13:56 UTC (rev 6248)
@@ -1,4 +1,4 @@
-! Brief Example of Creating Your Own Theme
+! Brief Example of Creating Your Own WikiTheme
To create or modify one of the existing themes:
* Make a copy of one of the themes.
@@ -7,11 +7,11 @@
same directory structure and modify them there instead of the
originals.
* Fix the name in themeinfo.php:
- $Theme = new Theme('NewName');
-* or if you have to override some default Theme methods
- class Theme_NewName extends Theme;
+ $WikiTheme = new WikiTheme('NewName');
+* or if you have to override some default WikiTheme methods
+ class WikiTheme_NewName extends WikiTheme;
...
- $Theme = new Theme_NewName('NewName');
+ $WikiTheme = new WikiTheme_NewName('NewName');
Note:
@@ -32,7 +32,7 @@
Only one template is called, ususally the "html.tmpl" template,
which includes all other templates then.
-Theme templates are regular xhtml, but the php parts within "<?" and "?>"
+WikiTheme templates are regular xhtml, but the php parts within "<?" 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.
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2008-09-07 15:06:20 UTC (rev 6247)
+++ trunk/lib/HtmlElement.php 2008-09-07 15:13:56 UTC (rev 6248)
@@ -559,122 +559,6 @@
return HTML($html);
}
-/**
- $Log: not supported by cvs2svn $
- Revision 1.49 2007/06/02 18:23:49 rurban
- Added accesskeys
-
- Revision 1.48 2007/05/24 18:51:35 rurban
- add param (for YouTube)
-
- Revision 1.47 2005/08/06 12:53:36 rurban
- beautify SCRIPT lines
-
- Revision 1.46 2005/01/25 06:50:33 rurban
- added label
-
- Revision 1.45 2005/01/10 18:05:56 rurban
- php5 case-sensitivity
-
- Revision 1.44 2005/01/08 20:58:19 rurban
- ending space after colgroup breaks _setTagProperty
-
- Revision 1.43 2004/11/21 11:59:14 rurban
- remove final \n to be ob_cache independent
-
- Revision 1.42 2004/09/26 17:09:23 rurban
- add SVG support for Ploticus (and hopefully all WikiPluginCached types)
- SWF not yet.
-
- Revision 1.41 2004/08/05 17:31:50 rurban
- more xhtml conformance fixes
-
- Revision 1.40 2004/06/25 14:29:17 rurban
- WikiGroup refactoring:
- global group attached to user, code for not_current user.
- improved helpers for special groups (avoid double invocations)
- new experimental config option ENABLE_XHTML_XML (fails with IE, and document.write())
- fixed a XHTML validation error on userprefs.tmpl
-
- Revision 1.39 2004/05/17 13:36:49 rurban
- Apply RFE #952323 "ExternalSearchPlugin improvement", but
- with <button><img></button>
-
- Revision 1.38 2004/05/12 10:49:54 rurban
- require_once fix for those libs which are loaded before FileFinder and
- its automatic include_path fix, and where require_once doesn't grok
- dirname(__FILE__) != './lib'
- upgrade fix with PearDB
- navbar.tmpl: remove spaces for IE button alignment
-
- Revision 1.37 2004/04/26 20:44:34 rurban
- locking table specific for better databases
-
- Revision 1.36 2004/04/19 21:51:41 rurban
- php5 compatibility: it works!
-
- Revision 1.35 2004/04/19 18:27:45 rurban
- Prevent from some PHP5 warnings (ref args, no :: object init)
- php5 runs now through, just one wrong XmlElement object init missing
- Removed unneccesary UpgradeUser lines
- Changed WikiLink to omit version if current (RecentChanges)
-
- Revision 1.34 2004/03/24 19:39:02 rurban
- php5 workaround code (plus some interim debugging code in XmlElement)
- php5 doesn't work yet with the current XmlElement class constructors,
- WikiUserNew does work better than php4.
- rewrote WikiUserNew user upgrading to ease php5 update
- fixed pref handling in WikiUserNew
- added Email Notification
- added simple Email verification
- removed emailVerify userpref subclass: just a email property
- changed pref binary storage layout: numarray => hash of non default values
- print optimize message only if really done.
- forced new cookie policy: delete pref cookies, use only WIKI_ID as plain string.
- prefs should be stored in db or homepage, besides the current session.
-
- Revision 1.33 2004/03/18 22:32:33 rurban
- work to make it php5 compatible
-
- Revision 1.32 2004/02/15 21:34:37 rurban
- PageList enhanced and improved.
- fixed new WikiAdmin... plugins
- editpage, Theme with exp. htmlarea framework
- (htmlarea yet committed, this is really questionable)
- WikiUser... code with better session handling for prefs
- enhanced UserPreferences (again)
- RecentChanges for show_deleted: how should pages be deleted then?
-
- Revision 1.31 2003/02/27 22:47:26 dairiki
- New functions in HtmlElement:
-
- JavaScript($js)
- Helper for generating javascript.
-
- IfJavaScript($if_content, $else_content)
- Helper for generating
- <script>document.write('...')</script><noscript>...</noscript>
- constructs.
-
- Revision 1.30 2003/02/17 06:02:25 dairiki
- Remove functions HiddenGets() and HiddenPosts().
-
- These functions were evil. They didn't check the request method,
- so they often resulted in GET args being converted to POST args,
- etc...
-
- One of these is still used in lib/plugin/WikiAdminSelect.php,
- but, so far as I can tell, that code is both broken _and_ it
- doesn't do anything.
-
- Revision 1.29 2003/02/15 01:54:19 dairiki
- Added HTML::meta() for <meta> tag.
-
- Revision 1.28 2003/01/04 02:32:30 carstenklapp
- Added 'col' and 'colgroup' table elements used by PluginManager.
-
- */
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2008-09-07 15:06:20 UTC (rev 6247)
+++ trunk/lib/PageList.php 2008-09-07 15:13:56 UTC (rev 6248)
@@ -334,12 +334,12 @@
function _PageList_Column_time ($field, $default_heading) {
$this->_PageList_Column($field, $default_heading, 'right');
global $WikiTheme;
- $this->Theme = &$WikiTheme;
+ $this->WikiTheme = &$WikiTheme;
}
function _getValue ($page_handle, &$revision_handle) {
$time = _PageList_Column::_getValue($page_handle, $revision_handle);
- return $this->Theme->formatDateTime($time);
+ return $this->WikiTheme->formatDateTime($time);
}
function _getSortableValue ($page_handle, &$revision_handle) {
@@ -1694,302 +1694,6 @@
}
}
-// $Log: not supported by cvs2svn $
-// Revision 1.154 2008/03/17 19:07:51 rurban
-// No sort links on dumped pages.
-// checked="CHECKED"
-// Add defaults for all supported Columns, like locked, minor, ...
-//
-// Revision 1.153 2008/02/15 19:52:04 vargenau
-// Corrected bug #1847961: In AllPages with a limit, last page is incorrectly numbered
-//
-// Revision 1.152 2008/02/15 19:46:12 vargenau
-// Allow sorting by hits; test method_exists
-//
-// Revision 1.151 2008/02/14 18:42:53 rurban
-// ref to a class does not work with php-4, add ratingvalue
-//
-// Revision 1.150 2008/01/31 20:28:47 vargenau
-// Valid HTML code: tfoot must be before tbody
-//
-// Revision 1.149 2008/01/26 14:13:29 vargenau
-// XHTML is case-sensitive; use correct case
-//
-// Revision 1.148 2007/09/19 18:00:49 rurban
-// enable "^A or ^B" pages argument for PageLists: e.g. large htmldump-s
-//
-// Revision 1.147 2007/09/15 12:26:25 rurban
-// add explodePageList comments
-//
-// Revision 1.146 2007/09/12 19:33:29 rurban
-// allow array to be exploded (comma problem)
-//
-// Revision 1.145 2007/08/25 17:58:14 rurban
-// more limit fixes: limit earlier, fix COUNT slice
-//
-// Revision 1.143 2007/07/14 12:03:19 rurban
-// support listtype=dl and ranked search
-//
-// Revision 1.142 2007/07/01 09:09:19 rurban
-// fix PageList with multiple lists: added id, fixed sortby REQUEST logic
-//
-// Revision 1.141 2007/05/24 18:40:55 rurban
-// display list with tokens problem
-//
-// Revision 1.140 2007/05/13 18:12:55 rurban
-// force adding a options[type] column: fixes LinkDatabase
-//
-// Revision 1.139 2007/01/25 07:42:01 rurban
-// Support nopage
-//
-// Revision 1.138 2007/01/20 11:24:15 rurban
-// Support paging limit if ->_pages is not yet limited by the backend (AllPagesByMe)
-//
-// Revision 1.137 2007/01/07 18:43:08 rurban
-// Honor predefined ->_rows: hack to (re-)allow non-pagenames, used by WikiAdminUtils
-//
-// Revision 1.136 2007/01/02 13:18:46 rurban
-// filter pageNames through limit, needed for xmlrpc. publish col->current_row and col->current_column counters during iteration. use table width=100% with captions. Clarify API: sortby,limit and exclude are strings.
-//
-// Revision 1.135 2005/09/14 05:59:03 rurban
-// optimized explodePageList to use SQL when available
-// (titleSearch instead of getAllPages)
-//
-// Revision 1.134 2005/09/11 14:55:05 rurban
-// implement fulltext stoplist
-//
-// Revision 1.133 2005/08/27 09:41:37 rurban
-// new helper method
-//
-// Revision 1.132 2005/04/09 09:16:15 rurban
-// fix recursive PageList azhead+cols listing
-//
-// Revision 1.131 2005/02/04 10:48:06 rurban
-// fix usort ref warning. Thanks to Charles Corrigan
-//
-// Revision 1.130 2005/01/28 12:07:36 rurban
-// reformatting
-//
-// Revision 1.129 2005/01/25 06:58:21 rurban
-// reformatting
-//
-// Revision 1.128 2004/12/26 17:31:35 rurban
-// fixed prev link logic
-//
-// Revision 1.127 2004/12/26 17:19:28 rurban
-// dont break sideeffecting sortby flips on paging urls (MostPopular)
-//
-// Revision 1.126 2004/12/16 18:26:57 rurban
-// Avoid double calculation
-//
-// Revision 1.125 2004/11/25 17:20:49 rurban
-// and again a couple of more native db args: backlinks
-//
-// Revision 1.124 2004/11/23 15:17:14 rurban
-// better support for case_exact search (not caseexact for consistency),
-// plugin args simplification:
-// handle and explode exclude and pages argument in WikiPlugin::getArgs
-// and exclude in advance (at the sql level if possible)
-// handle sortby and limit from request override in WikiPlugin::getArgs
-// ListSubpages: renamed pages to maxpages
-//
-// Revision 1.123 2004/11/23 13:35:31 rurban
-// add case_exact search
-//
-// Revision 1.122 2004/11/21 11:59:15 rurban
-// remove final \n to be ob_cache independent
-//
-// Revision 1.121 2004/11/20 17:35:47 rurban
-// improved WantedPages SQL backends
-// PageList::sortby new 3rd arg valid_fields (override db fields)
-// WantedPages sql pager inexact for performance reasons:
-// assume 3 wantedfrom per page, to be correct, no getTotal()
-// support exclude argument for get_all_pages, new _sql_set()
-//
-// Revision 1.120 2004/11/20 11:28:49 rurban
-// fix a yet unused PageList customPageListColumns bug (merge class not decl to _types)
-// change WantedPages to use PageList
-// change WantedPages to print the list of referenced pages, not just the count.
-// the old version was renamed to WantedPagesOld
-// fix and add handling of most standard PageList arguments (limit, exclude, ...)
-// TODO: pagename sorting, dumb/WantedPagesIter and SQL optimization
-//
-// Revision 1.119 2004/11/11 14:34:11 rurban
-// minor clarifications
-//
-// Revision 1.118 2004/11/01 10:43:55 rurban
-// seperate PassUser methods into seperate dir (memory usage)
-// fix WikiUser (old) overlarge data session
-// remove wikidb arg from various page class methods, use global ->_dbi instead
-// ...
-//
-// Revision 1.117 2004/10/14 21:06:01 rurban
-// fix dumphtml with USE_PATH_INFO (again). fix some PageList refs
-//
-// Revision 1.116 2004/10/14 19:19:33 rurban
-// loadsave: check if the dumped file will be accessible from outside.
-// and some other minor fixes. (cvsclient native not yet ready)
-//
-// Revision 1.115 2004/10/14 17:15:05 rurban
-// remove class _PageList_Page, fix sortby=0 (start with 1, use strings), fix _PageList_Column_content for old phps, hits as int
-//
-// Revision 1.114 2004/10/12 13:13:19 rurban
-// php5 compatibility (5.0.1 ok)
-//
-// Revision 1.113 2004/10/05 17:00:03 rurban
-// support paging for simple lists
-// fix RatingDb sql backend.
-// remove pages from AllPages (this is ListPages then)
-//
-// Revision 1.112 2004/10/04 23:39:58 rurban
-// list of page objects
-//
-// Revision 1.111 2004/09/24 18:50:45 rurban
-// fix paging of SqlResult
-//
-// Revision 1.110 2004/09/17 14:43:31 rurban
-// typo
-//
-// Revision 1.109 2004/09/17 14:22:10 rurban
-// update comments
-//
-// Revision 1.108 2004/09/17 12:46:22 rurban
-// seperate pagingTokens()
-// support new default args: comma (1 and 2), commasep, ordered, cols,
-// azhead (1 only)
-//
-// Revision 1.107 2004/09/14 10:29:08 rurban
-// exclude pages already in addPages to simplify plugins
-//
-// Revision 1.106 2004/09/06 10:22:14 rurban
-// oops, forgot global request
-//
-// Revision 1.105 2004/09/06 08:38:30 rurban
-// modularize paging helper (for SqlResult)
-//
-// Revision 1.104 2004/08/18 11:01:55 rurban
-// fixed checkbox list Select button:
-// no GET request on click,
-// only select the list checkbox entries, no other options.
-//
-// Revision 1.103 2004/07/09 10:06:49 rurban
-// Use backend specific sortby and sortable_columns method, to be able to
-// select between native (Db backend) and custom (PageList) sorting.
-// Fixed PageList::AddPageList (missed the first)
-// Added the author/creator.. name to AllPagesBy...
-// display no pages if none matched.
-// Improved dba and file sortby().
-// Use &$request reference
-//
-// Revision 1.102 2004/07/08 21:32:35 rurban
-// Prevent from more warnings, minor db and sort optimizations
-//
-// Revision 1.101 2004/07/08 19:04:41 rurban
-// more unittest fixes (file backend, metadata RatingsDb)
-//
-// Revision 1.100 2004/07/07 15:02:26 dfrankow
-// Take out if that prevents column sorting
-//
-// Revision 1.99 2004/07/02 18:49:02 dfrankow
-// Change one line so that if addPageList() is passed null, it is still
-// okay. The unit tests do this (ask to list AllUsers where there are no
-// users, or something like that).
-//
-// Revision 1.98 2004/07/01 08:51:22 rurban
-// dumphtml: added exclude, print pagename before processing
-//
-// Revision 1.97 2004/06/29 09:11:10 rurban
-// More memory optimization:
-// don't cache unneeded _cached_html and %content for content and size columns
-// (only if sortable, which will fail for too many pages)
-//
-// Revision 1.96 2004/06/29 08:47:42 rurban
-// Memory optimization (reference to parent, smart bool %content)
-// Fixed class grouping in table
-//
-// Revision 1.95 2004/06/28 19:00:01 rurban
-// removed non-portable LIMIT 1 (it's getOne anyway)
-// removed size from info=most: needs to much memory
-//
-// Revision 1.94 2004/06/27 10:26:02 rurban
-// oci8 patch by Philippe Vanhaesendonck + some ADODB notes+fixes
-//
-// Revision 1.93 2004/06/25 14:29:17 rurban
-// WikiGroup refactoring:
-// global group attached to user, code for not_current user.
-// improved helpers for special groups (avoid double invocations)
-// new experimental config option ENABLE_XHTML_XML (fails with IE, and document.write())
-// fixed a XHTML validation error on userprefs.tmpl
-//
-// Revision 1.92 2004/06/21 17:01:39 rurban
-// fix typo and rating method call
-//
-// Revision 1.91 2004/06/21 16:22:29 rurban
-// add DEFAULT_DUMP_DIR and HTML_DUMP_DIR constants, for easier cmdline dumps,
-// fixed dumping buttons locally (images/buttons/),
-// support pages arg for dumphtml,
-// optional directory arg for dumpserial + dumphtml,
-// fix a AllPages warning,
-// show dump warnings/errors on DEBUG,
-// don't warn just ignore on wikilens pagelist columns, if not loaded.
-// RateIt pagelist column is called "rating", not "ratingwidget" (Dan?)
-//
-// Revision 1.90 2004/06/18 14:38:21 rurban
-// adopt new PageList style
-//
-// Revision 1.89 2004/06/17 13:16:08 rurban
-// apply wikilens work to PageList: all columns are sortable (slightly fixed)
-//
-// Revision 1.88 2004/06/14 11:31:35 rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-// inherit PageList default options from PageList
-// default sortby=pagename
-// use options in PageList_Selectable (limit, sortby, ...)
-// added action revert, with button at action=diff
-// added option regex to WikiAdminSearchReplace
-//
-// Revision 1.87 2004/06/13 16:02:12 rurban
-// empty list of pages if user=[] and not authenticated.
-//
-// Revision 1.86 2004/06/13 15:51:37 rurban
-// Support pagelist filter for current author,owner,creator by []
-//
-// Revision 1.85 2004/06/13 15:33:19 rurban
-// new support for arguments owner, author, creator in most relevant
-// PageList plugins. in WikiAdmin* via preSelectS()
-//
-// Revision 1.84 2004/06/08 13:51:56 rurban
-// some comments only
-//
-// Revision 1.83 2004/05/18 13:35:39 rurban
-// improve Pagelist layout by equal pagename width for limited lists
-//
-// Revision 1.82 2004/05/16 22:07:35 rurban
-// check more config-default and predefined constants
-// various PagePerm fixes:
-// fix default PagePerms, esp. edit and view for Bogo and Password users
-// implemented Creator and Owner
-// BOGOUSERS renamed to BOGOUSER
-// fixed syntax errors in signin.tmpl
-//
-// Revision 1.81 2004/05/13 12:30:35 rurban
-// fix for MacOSX border CSS attr, and if sort buttons are not found
-//
-// Revision 1.80 2004/04/20 00:56:00 rurban
-// more paging support and paging fix for shorter lists
-//
-// Revision 1.79 2004/04/20 00:34:16 rurban
-// more paging support
-//
-// Revision 1.78 2004/04/20 00:06:03 rurban
-// themable paging support
-//
-// Revision 1.77 2004/04/18 01:11:51 rurban
-// more numeric pagename fixes.
-// fixed action=upload with merge conflict warnings.
-// charset changed from constant to global (dynamic utf-8 switching)
-//
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
Deleted: trunk/lib/Theme.php
===================================================================
--- trunk/lib/Theme.php 2008-09-07 15:06:20 UTC (rev 6247)
+++ trunk/lib/Theme.php 2008-09-07 15:13:56 UTC (rev 6248)
@@ -1,2203 +0,0 @@
-<?php rcs_id('$Id$');
-/* Copyright (C) 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
- *
- * 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
- */
-
-/**
- * Customize output by themes: templates, css, special links functions,
- * and more formatting.
- */
-
-require_once(dirname(__FILE__).'/HtmlElement.php');
-
-/**
- * Make a link to a wiki page (in this wiki).
- *
- * This is a convenience function.
- *
- * @param mixed $page_or_rev
- * Can be:<dl>
- * <dt>A string</dt><dd>The page to link to.</dd>
- * <dt>A WikiDB_Page object</dt><dd>The page to link to.</dd>
- * <dt>A WikiDB_PageRevision object</dt><dd>A specific version of the page to link to.</dd>
- * </dl>
- *
- * @param string $type
- * One of:<dl>
- * <dt>'unknown'</dt><dd>Make link appropriate for a non-existant page.</dd>
- * <dt>'known'</dt><dd>Make link appropriate for an existing page.</dd>
- * <dt>'auto'</dt><dd>Either 'unknown' or 'known' as appropriate.</dd>
- * <dt>'button'</dt><dd>Make a button-style link.</dd>
- * <dt>'if_known'</dt><dd>Only linkify if page exists.</dd>
- * </dl>
- * Unless $type of of the latter form, the link will be of class 'wiki', 'wikiunknown',
- * 'named-wiki', or 'named-wikiunknown', as appropriate.
- *
- * @param mixed $label (string or XmlContent object)
- * Label for the link. If not given, defaults to the page name.
- *
- * @return XmlContent The link
- */
-function WikiLink ($page_or_rev, $type = 'known', $label = false) {
- global $WikiTheme, $request;
-
- if ($type == 'button') {
- return $WikiTheme->makeLinkButton($page_or_rev, $label);
- }
-
- $version = false;
-
- if (isa($page_or_rev, 'WikiDB_PageRevision')) {
- $version = $page_or_rev->getVersion();
- if ($page_or_rev->isCurrent())
- $version = false;
- $page = $page_or_rev->getPage();
- $pagename = $page->getName();
- $wikipage = $pagename;
- $exists = true;
- }
- elseif (isa($page_or_rev, 'WikiDB_Page')) {
- $page = $page_or_rev;
- $pagename = $page->getName();
- $wikipage = $pagename;
- }
- elseif (isa($page_or_rev, 'WikiPageName')) {
- $wikipage = $page_or_rev;
- $pagename = $wikipage->name;
- if (!$wikipage->isValid('strict'))
- return $WikiTheme->linkBadWikiWord($wikipage, $label);
- }
- else {
- $wikipage = new WikiPageName($page_or_rev, $request->getPage());
- $pagename = $wikipage->name;
- if (!$wikipage->isValid('strict'))
- return $WikiTheme->linkBadWikiWord($wikipage, $label);
- }
-
- if ($type == 'auto' or $type == 'if_known') {
- if (isset($page)) {
- $exists = $page->exists();
- }
- else {
- $dbi =& $request->_dbi;
- $exists = $dbi->isWikiPage($wikipage->name);
- }
- }
- elseif ($type == 'unknown') {
- $exists = false;
- }
- else {
- $exists = true;
- }
-
- // FIXME: this should be somewhere else, if really needed.
- // WikiLink makes A link, not a string of fancy ones.
- // (I think that the fancy split links are just confusing.)
- // Todo: test external ImageLinks http://some/images/next.gif
- if (isa($wikipage, 'WikiPageName') and
- ! $label and
- strchr(substr($wikipage->shortName,1), SUBPAGE_SEPARATOR))
- {
- $parts = explode(SUBPAGE_SEPARATOR, $wikipage->shortName);
- $last_part = array_pop($parts);
- $sep = '';
- $link = HTML::span();
- foreach ($parts as $part) {
- $path[] = $part;
- $parent = join(SUBPAGE_SEPARATOR, $path);
- if ($WikiTheme->_autosplitWikiWords)
- $part = " " . $part;
- if ($part)
- $link->pushContent($WikiTheme->linkExistingWikiWord($parent, $sep . $part));
- $sep = $WikiTheme->_autosplitWikiWords
- ? ' ' . SUBPAGE_SEPARATOR : SUBPAGE_SEPARATOR;
- }
- if ($exists)
- $link->pushContent($WikiTheme->linkExistingWikiWord($wikipage, $sep . $last_part,
- $version));
- else
- $link->pushContent($WikiTheme->linkUnknownWikiWord($wikipage, $sep . $last_part));
- return $link;
- }
-
- if ($exists) {
- return $WikiTheme->linkExistingWikiWord($wikipage, $label, $version);
- }
- elseif ($type == 'if_known') {
- if (!$label && isa($wikipage, 'WikiPageName'))
- $label = $wikipage->shortName;
- return HTML($label ? $label : $pagename);
- }
- else {
- return $WikiTheme->linkUnknownWikiWord($wikipage, $label);
- }
-}
-
-
-
-/**
- * Make a button.
- *
- * This is a convenience function.
- *
- * @param $action string
- * One of <dl>
- * <dt>[action]</dt><dd>Perform action (e.g. 'edit') on the selected page.</dd>
- * <dt>[ActionPage]</dt><dd>Run the actionpage (e.g. 'BackLinks') on the selected page.</dd>
- * <dt>'submit:'[name]</dt><dd>Make a form submission button with the given name.
- * ([name] can be blank for a nameless submit button.)</dd>
- * <dt>a hash</dt><dd>Query args for the action. E.g.<pre>
- * array('action' => 'diff', 'previous' => 'author')
- * </pre></dd>
- * </dl>
- *
- * @param $label string
- * A label for the button. If ommited, a suitable default (based on the valued of $action)
- * will be picked.
- *
- * @param $page_or_rev mixed
- * Which page (& version) to perform the action on.
- * Can be one of:<dl>
- * <dt>A string</dt><dd>The pagename.</dd>
- * <dt>A WikiDB_Page object</dt><dd>The page.</dd>
- * <dt>A WikiDB_PageRevision object</dt><dd>A specific version of the page.</dd>
- * </dl>
- * ($Page_or_rev is ignored for submit buttons.)
- */
-function Button ($action, $label = false, $page_or_rev = false, $options = false) {
- global $WikiTheme;
-
- if (!is_array($action) && preg_match('/^submit:(.*)/', $action, $m))
- return $WikiTheme->makeSubmitButton($label, $m[1], $page_or_rev, $options);
- else
- return $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options);
-}
-
-class Theme {
- var $HTML_DUMP_SUFFIX = '';
- var $DUMP_MODE = false, $dumped_images, $dumped_css;
-
- /**
- * noinit: Do not initialize unnecessary items in default_theme fallback twice.
- */
- function Theme ($theme_name = 'default', $noinit = false) {
- $this->_name = $theme_name;
- $this->_themes_dir = NormalizeLocalFileName("themes");
- $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";
- $this->_theme = "themes/$theme_name";
-
- if ($theme_name != 'default')
- $this->_default_theme = new Theme('default',true);
- if ($noinit) return;
-
- $script_url = deduce_script_name();
- if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
- $script_url .= ("?start_debug=".$_GET['start_debug']);
- $this->addMoreHeaders(JavaScript("var data_path = '". javascript_quote_string(DATA_PATH) ."';\n"
- ."var pagename = '". javascript_quote_string($GLOBALS['request']->getArg('pagename')) ."';\n"
- ."var script_url= '". javascript_quote_string($script_url) ."';\n"
- ."var stylepath = '". javascript_quote_string(DATA_PATH) . '/'.$this->_theme."/';\n"));
- // by pixels
- if ((is_object($GLOBALS['request']) // guard against unittests
- and $GLOBALS['request']->getPref('doubleClickEdit'))
- or ENABLE_DOUBLECLICKEDIT)
- $this->initDoubleClickEdit();
-
- // will be replaced by acDropDown
- if (ENABLE_LIVESEARCH) { // by bitflux.ch
- $this->initLiveSearch();
- }
- // replaces external LiveSearch
- if (defined("ENABLE_ACDROPDOWN") and ENABLE_ACDROPDOWN) {
- $this->initMoAcDropDown();
- }
- $this->_css = array();
- }
-
- function file ($file) {
- return $this->_path . "$this->_theme/$file";
- }
-
- function _findFile ($file, $missing_okay = false) {
- if (file_exists($this->file($file)))
- return "$this->_theme/$file";
-
- // FIXME: this is a short-term hack. Delete this after all files
- // get moved into themes/...
- if (file_exists($this->_path . $file))
- return $file;
-
- if (isset($this->_default_theme)) {
- return $this->_default_theme->_findFile($file, $missing_okay);
- }
- else if (!$missing_okay) {
- if (DEBUG & function_exists('debug_backtrace')) { // >= 4.3.0
- echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
- }
- trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
- }
- return false;
- }
-
- function _findData ($file, $missing_okay = false) {
- $path = $this->_findFile($file, $missing_okay);
- if (!$path)
- return false;
-
- if (defined('DATA_PATH'))
- return DATA_PATH . "/$path";
- return $path;
- }
-
- ////////////////////////////////////////////////////////////////
- //
- // Date and Time formatting
- //
- ////////////////////////////////////////////////////////////////
-
- // Note: Windows' implemetation of strftime does not include certain
- // format specifiers, such as %e (for date without leading zeros). In
- // general, see:
- // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
- // As a result, we have to use %d, and strip out leading zeros ourselves.
-
- var $_dateFormat = "%B %d, %Y";
- var $_timeFormat = "%I:%M %p";
-
- var $_showModTime = true;
-
- /**
- * Set format string used for dates.
- *
- * ...
[truncated message content] |
|
From: <var...@us...> - 2008-09-16 22:14:30
|
Revision: 6265
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6265&view=rev
Author: vargenau
Date: 2008-09-16 22:14:40 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
New action page: AllUserPages
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/plugin/AllPages.php
trunk/pgsrc/SpecialPages
Added Paths:
-----------
trunk/pgsrc/AllUserPages
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2008-09-16 18:39:14 UTC (rev 6264)
+++ trunk/lib/PageList.php 2008-09-16 22:14:40 UTC (rev 6265)
@@ -1085,6 +1085,22 @@
return $allPages;
}
+ // UserPages are pages NOT created by "The PhpWiki programming team"
+ function allUserPages($include_empty=false, $sortby='',
+ $limit='', $exclude='') {
+ $dbi = $GLOBALS['request']->getDbh();
+ $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude);
+ $allPages = array();
+ while ($pagehandle = $allPagehandles->next()) {
+ $name = $pagehandle->getName();
+ $creator = $pagehandle->getCreator();
+ if ($creator !== _("The PhpWiki programming team")) {
+ $allPages[] = $name;
+ }
+ }
+ return $allPages;
+ }
+
////////////////////
// private
////////////////////
@@ -1414,7 +1430,7 @@
and isset($col->_field)
and $col->_field == 'pagename'
and ($maxlen = $this->maxLen())) {
- $heading->setAttr('width', $maxlen * 7);
+ // $heading->setAttr('width', $maxlen * 7);
}
$row->pushContent($heading);
if (is_string($col->getHeading()))
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2008-09-16 18:39:14 UTC (rev 6264)
+++ trunk/lib/plugin/AllPages.php 2008-09-16 22:14:40 UTC (rev 6265)
@@ -52,7 +52,8 @@
'include_empty' => false,
//'pages' => false, // DONT, this would be ListPages then.
'info' => '',
- 'debug' => false
+ 'debug' => false,
+ 'userpages' => false
));
}
@@ -70,7 +71,13 @@
$timer = new DebugTimer;
$caption = _("All pages in this wiki (%d total):");
- if ( !empty($args['owner']) ) {
+ if ( !empty($args['userpages']) ) {
+ $pages = PageList::allUserPages($args['include_empty'],
+ $args['sortby'], ''
+ );
+ $caption = fmt("List of user-created pages (%d total):", count($pages));
+ $args['count'] = $request->getArg('count');
+ } elseif ( !empty($args['owner']) ) {
$pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
$args['sortby'], ''
);
Added: trunk/pgsrc/AllUserPages
===================================================================
--- trunk/pgsrc/AllUserPages (rev 0)
+++ trunk/pgsrc/AllUserPages 2008-09-16 22:14:40 UTC (rev 6265)
@@ -0,0 +1,16 @@
+Date: Mon, 16 Sep 2008 14:15:24 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id: AllPages 6184 2008-08-22 10:33:41Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=AllPages;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=iso-8859-1
+Content-Transfer-Encoding: binary
+
+Here is the list of all user pages on this Wiki (pages that were not created at initialisation of the wiki).
+
+<?plugin AllPages userpages=1 info||=mtime,author,hits limit||=1000 sortby=+pagename ?>
+
+----
+[CategoryActionPage]
Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages 2008-09-16 18:39:14 UTC (rev 6264)
+++ trunk/pgsrc/SpecialPages 2008-09-16 22:14:40 UTC (rev 6265)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 16 Sep 2008 14:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -13,6 +13,7 @@
* [AllPagesCreatedByMe]
* [AllPagesOwnedByMe]
* [AllPagesLastEditedByMe]
+* [AllUserPages]
* [LockedPages]
* [OrphanedPages]
* [WantedPages]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-09-25 08:21:51
|
Revision: 6280
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6280&view=rev
Author: vargenau
Date: 2008-09-25 08:19:09 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
New action pages: LdapSearch, SpellCheck, UriResolver, UserContribs and WikiBlog
Modified Paths:
--------------
trunk/lib/IniConfig.php
trunk/pgsrc/LdapSearch
trunk/pgsrc/SpellCheck
trunk/pgsrc/UriResolver
trunk/pgsrc/UserContribs
trunk/pgsrc/WikiBlog
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2008-09-25 08:14:05 UTC (rev 6279)
+++ trunk/lib/IniConfig.php 2008-09-25 08:19:09 UTC (rev 6280)
@@ -610,15 +610,15 @@
.'EditMetaData:'
.'FindPage:FullTextSearch:FuzzyPages:'
.'InterWikiSearch:'
- .'LikePages:LinkDatabase:LinkSearch:ListRelations:'
+ .'LdapSearch:LikePages:LinkDatabase:LinkSearch:ListRelations:'
.'ModeratedPage:MostPopular:'
.'OrphanedPages:'
.'PageDump:PageHistory:PageInfo:PasswordReset:PluginManager:'
.'RandomPage:RateIt:RecentChanges:RecentComments:RelatedChanges:'
- .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:'
+ .'SearchHighlight:SemanticRelations:SemanticSearch:SpellCheck:SystemInfo:'
.'TitleSearch:TranslateText:'
- .'UpLoad:UserPreferences:'
- .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:'
+ .'UpLoad:UriResolver:UserPreferences:'
+ .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog'
// plus some derivations
.'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:'
.'DebugInfo:'
@@ -632,7 +632,8 @@
.'PhpWikiAdministration/Rename:'
.'PhpWikiAdministration/Replace:'
.'PhpWikiAdministration/SetAcl:'
- .'RecentChangesMyPages:RecentEdits:RecentNewPages');
+ .'RecentChangesMyPages:RecentEdits:RecentNewPages:
+ .'UserContribs');
// If user has not defined PHPWIKI_DIR, and we need it
if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) {
$themes_dir = FindFile("themes");
Modified: trunk/pgsrc/LdapSearch
===================================================================
--- trunk/pgsrc/LdapSearch 2008-09-25 08:14:05 UTC (rev 6279)
+++ trunk/pgsrc/LdapSearch 2008-09-25 08:19:09 UTC (rev 6280)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 25 Sep 2008 4:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -9,3 +9,6 @@
Content-Transfer-Encoding: binary
<?plugin LdapSearch ?>
+
+----
+[CategoryActionPage]
Modified: trunk/pgsrc/SpellCheck
===================================================================
--- trunk/pgsrc/SpellCheck 2008-09-25 08:14:05 UTC (rev 6279)
+++ trunk/pgsrc/SpellCheck 2008-09-25 08:19:09 UTC (rev 6280)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 25 Sep 2008 4:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,4 +8,7 @@
charset=iso-8859-1
Content-Transfer-Encoding: binary
-<?plugin SpellCheck ?>
\ No newline at end of file
+<?plugin SpellCheck ?>
+
+----
+[CategoryActionPage]
Modified: trunk/pgsrc/UriResolver
===================================================================
--- trunk/pgsrc/UriResolver 2008-09-25 08:14:05 UTC (rev 6279)
+++ trunk/pgsrc/UriResolver 2008-09-25 08:19:09 UTC (rev 6280)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 25 Sep 2008 4:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -9,3 +9,6 @@
Content-Transfer-Encoding: binary
<?plugin UriResolver ?>
+
+----
+[CategoryActionPage]
Modified: trunk/pgsrc/UserContribs
===================================================================
--- trunk/pgsrc/UserContribs 2008-09-25 08:14:05 UTC (rev 6279)
+++ trunk/pgsrc/UserContribs 2008-09-25 08:19:09 UTC (rev 6280)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 25 Sep 2008 4:15:24 +0000
X-Rcs-Id: $Id$
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
Content-Type: application/x-phpwiki;
@@ -10,3 +10,6 @@
<?plugin RecentChanges days||=90 daylist=1,3,7,30,90,360,0 show_deleted||=1
format=contribs author||=[] ?>
+
+----
+[CategoryActionPage]
Modified: trunk/pgsrc/WikiBlog
===================================================================
--- trunk/pgsrc/WikiBlog 2008-09-25 08:14:05 UTC (rev 6279)
+++ trunk/pgsrc/WikiBlog 2008-09-25 08:19:09 UTC (rev 6280)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 25 Sep 2008 4:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -16,4 +16,7 @@
The most beautiful is copying this page to a new page Blog and have your admin blogs under /Blog only.
See the blog theme.
?>
-<?plugin WikiBlog user='' ?>
\ No newline at end of file
+<?plugin WikiBlog user='' ?>
+
+----
+[CategoryActionPage]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-10-20 16:47:26
|
Revision: 6310
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6310&view=rev
Author: vargenau
Date: 2008-10-20 16:47:13 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Implemented 'quiet' argument in Transclude plugin, like in IncludePage plugin
Modified Paths:
--------------
trunk/lib/plugin/Transclude.php
trunk/pgsrc/Help%2FTranscludePlugin
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php 2008-10-17 09:27:28 UTC (rev 6309)
+++ trunk/lib/plugin/Transclude.php 2008-10-20 16:47:13 UTC (rev 6310)
@@ -62,7 +62,8 @@
function getDefaultArguments() {
return array( 'src' => false, // the src url to include
- 'height' => 450 // height of the iframe
+ 'height' => 450, // height of the iframe
+ 'quiet' => false // if set, frame appears as normal content
);
}
@@ -114,9 +115,13 @@
$iframe = new HtmlElement('ilayer', array('src' => $src), $iframe);
*/
- return HTML(HTML::p(array('class' => 'transclusion-title'),
- fmt("Transcluded from %s", LinkURL($src))),
- $this->_js(), $iframe);
+ if ($quiet) {
+ return HTML($this->_js(), $iframe);
+ } else {
+ return HTML(HTML::p(array('class' => 'transclusion-title'),
+ fmt("Transcluded from %s", LinkURL($src))),
+ $this->_js(), $iframe);
+ }
}
/**
@@ -157,46 +162,6 @@
}
};
-// $Log: not supported by cvs2svn $
-// Revision 1.9 2004/06/14 11:31:39 rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-// inherit PageList default options from PageList
-// default sortby=pagename
-// use options in PageList_Selectable (limit, sortby, ...)
-// added action revert, with button at action=diff
-// added option regex to WikiAdminSearchReplace
-//
-// Revision 1.8 2004/02/17 12:11:36 rurban
-// added missing 4th basepage arg at plugin->run() to almost all plugins. This caused no harm so far, because it was silently dropped on normal usage. However on plugin internal ->run invocations it failed. (InterWikiSearch, IncludeSiteMap, ...)
-//
-// Revision 1.7 2003/02/27 22:47:27 dairiki
-// New functions in HtmlElement:
-//
-// JavaScript($js)
-// Helper for generating javascript.
-//
-// IfJavaScript($if_content, $else_content)
-// Helper for generating
-// <script>document.write('...')</script><noscript>...</noscript>
-// constructs.
-//
-// Revision 1.6 2003/02/25 05:45:34 carstenklapp
-// Added "See: " in front of url, so for browsers that do not support
-// <iframe> at least there is an indication to the user that this
-// plugin is actually doing something while at the same time without
-// being (subjectively) too disruptive to page content.
-//
-// Revision 1.5 2003/02/24 14:34:44 carstenklapp
-// Added iframe title (bobby.org accessibility guidelines).
-// Simplified output for non-iframe and non-visual browsers (as suggested
-// by http://www.uwosh.edu/programs/accessibility/tutorial.html).
-//
-// Revision 1.4 2003/01/18 22:08:01 carstenklapp
-// Code cleanup:
-// Reformatting & tabs to spaces;
-// Added copyleft, getVersion, getDescription, rcs_id.
-//
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
Modified: trunk/pgsrc/Help%FTranscludePlugin
===================================================================
--- trunk/pgsrc/Help%2FTranscludePlugin 2008-10-17 09:27:28 UTC (rev 6309)
+++ trunk/pgsrc/Help%2FTranscludePlugin 2008-10-20 16:47:13 UTC (rev 6310)
@@ -1,4 +1,4 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 20 Oct 2008 14:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -13,19 +13,30 @@
!!! Arguments
-=src= |
- The URL of the page to transclude
-=height= |
- The (initial) height of the transclusion frame.
- If, possible, after the transcluded page is loaded,
- the frame is resized via javascript so that it
- fits the entire transcluded page. (See below for more.)
+{| class="bordered"
+|-
+| Argument
+| Description
+| Default value
+|-
+| src
+| The URL of the page to transclude
+| ''none''
+|-
+| height
+| The (initial) height of the transclusion frame. If, possible, after the transcluded page is loaded, the frame is resized via Javascript so that it fits the entire transcluded page. (See below for more.)
+| 450
+|-
+| quiet
+| If set, frame appears as normal content
+| false
+|}
!!! Bugs / Caveats
o Pages are transcluded using =<iframe>= tags. Older browsers do not
support ''iframe''s. In that case the user will be presented with a
- link to the trancluded material.
+ link to the transcluded material.
o When possible, JavaScript code is used to adjust the height of the
_iframe_ so that it fits the entire transcluded page.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-10-24 13:03:10
|
Revision: 6331
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6331&view=rev
Author: vargenau
Date: 2008-10-24 13:03:03 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Add ENABLE_MARKUP_MEDIAWIKI_TABLE in configurator.php and config/config-dist.ini
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/configurator.php
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2008-10-22 12:59:34 UTC (rev 6330)
+++ trunk/config/config-dist.ini 2008-10-24 13:03:03 UTC (rev 6331)
@@ -1014,14 +1014,18 @@
; faster and more stable.
;TOC_FULL_SYNTAX = true
-; If false the %color=... %% syntax will be disabled. Since 1.3.11
+; If false the %color=... %% syntax will be disabled.
; Default: true
;ENABLE_MARKUP_COLOR = false
-; Enable mediawiki-style {{TemplatePage|vars=value|...}} syntax. Since 1.3.11
+; Enable Mediawiki-style {{TemplatePage|vars=value|...}} syntax.
; Default: undefined. Enabled automatically on the MonoBook theme if undefined.
;ENABLE_MARKUP_TEMPLATE = true
+; Enable Mediawiki-style table syntax.
+; Default: undefined. Enabled automatically on the MonoBook theme if undefined.
+;ENABLE_MARKUP_MEDIAWIKI_TABLE = true
+
; Disable automatic linking of camelcase (wiki-)words to pages.
; Internal page links must be forced with [ pagename ] then.
; Default: false
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2008-10-22 12:59:34 UTC (rev 6330)
+++ trunk/configurator.php 2008-10-24 13:03:03 UTC (rev 6331)
@@ -1441,6 +1441,9 @@
$properties["ENABLE_MARKUP_TEMPLATE"] =
new boolean_define_optional('ENABLE_MARKUP_TEMPLATE');
+$properties["ENABLE_MARKUP_MEDIAWIKI_TABLE"] =
+new boolean_define_optional('ENABLE_MARKUP_MEDIAWIKI_TABLE');
+
$properties["DISABLE_MARKUP_WIKIWORD"] =
new boolean_define_optional('DISABLE_MARKUP_WIKIWORD');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-10-24 13:23:39
|
Revision: 6332
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6332&view=rev
Author: vargenau
Date: 2008-10-24 13:23:31 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Add TOOLBAR_IMAGE_PULLDOWN in configurator.php and lib/IniConfig.php
Modified Paths:
--------------
trunk/configurator.php
trunk/lib/IniConfig.php
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2008-10-24 13:03:03 UTC (rev 6331)
+++ trunk/configurator.php 2008-10-24 13:23:31 UTC (rev 6332)
@@ -1581,6 +1581,8 @@
new _define_commented_optional('TOOLBAR_PAGELINK_PULLDOWN');
$properties["TOOLBAR_TEMPLATE_PULLDOWN"] =
new _define_commented_optional('TOOLBAR_TEMPLATE_PULLDOWN');
+$properties["TOOLBAR_IMAGE_PULLDOWN"] =
+ new _define_commented_optional('TOOLBAR_IMAGE_PULLDOWN');
$properties["FULLTEXTSEARCH_STOPLIST"] =
new _define_commented_optional('FULLTEXTSEARCH_STOPLIST');
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2008-10-24 13:03:03 UTC (rev 6331)
+++ trunk/lib/IniConfig.php 2008-10-24 13:23:31 UTC (rev 6332)
@@ -172,7 +172,8 @@
'AUTH_USER_FILE', 'AUTH_GROUP_FILE', 'AUTH_SESS_USER', 'AUTH_SESS_LEVEL',
'GOOGLE_LICENSE_KEY','FORTUNE_DIR',
'DISABLE_GETIMAGESIZE','DBADMIN_USER','DBADMIN_PASSWD',
- 'SESSION_SAVE_PATH', 'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN',
+ 'SESSION_SAVE_PATH',
+ 'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN', 'TOOLBAR_IMAGE_PULLDOWN',
'EXTERNAL_LINK_TARGET', 'ACCESS_LOG_SQL', 'USE_EXTERNAL_HTML2PDF',
'LOGIN_LOG','LDAP_SEARCH_FILTER'
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-11-07 14:12:40
|
Revision: 6343
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6343&view=rev
Author: vargenau
Date: 2008-11-07 14:12:27 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
New parameter "title" for Transclude plugin
Modified Paths:
--------------
trunk/lib/plugin/Transclude.php
trunk/pgsrc/Help%2FTranscludePlugin
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php 2008-10-31 14:29:13 UTC (rev 6342)
+++ trunk/lib/plugin/Transclude.php 2008-11-07 14:12:27 UTC (rev 6343)
@@ -62,8 +62,9 @@
function getDefaultArguments() {
return array( 'src' => false, // the src url to include
+ 'title' => _("Transcluded page"), // title of the iframe
'height' => 450, // height of the iframe
- 'quiet' => false // if set, frame appears as normal content
+ 'quiet' => false // if set, iframe appears as normal content
);
}
@@ -95,7 +96,7 @@
return $this->error(_("Bad url in src: remove all of <, >, \""));
}
- $params = array('title' => _("Transcluded page"),
+ $params = array('title' => $title,
'src' => $src,
'width' => "100%",
'height' => $height,
Modified: trunk/pgsrc/Help%FTranscludePlugin
===================================================================
--- trunk/pgsrc/Help%2FTranscludePlugin 2008-10-31 14:29:13 UTC (rev 6342)
+++ trunk/pgsrc/Help%2FTranscludePlugin 2008-11-07 14:12:27 UTC (rev 6343)
@@ -23,6 +23,10 @@
| The URL of the page to transclude
| ''none''
|-
+| title
+| The title of the page to transclude
+| ''Transcluded page''
+|-
| height
| The (initial) height of the transclusion frame. If, possible, after the transcluded page is loaded, the frame is resized via Javascript so that it fits the entire transcluded page. (See below for more.)
| 450
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2008-11-19 08:53:10
|
Revision: 6347
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6347&view=rev
Author: rurban
Date: 2008-11-19 08:53:06 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
add new feature ENABLE_PAGE_PUBLIC
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/lib/IniConfig.php
trunk/lib/editpage.php
trunk/themes/default/templates/editpage.tmpl
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2008-11-18 10:43:26 UTC (rev 6346)
+++ trunk/config/config-default.ini 2008-11-19 08:53:06 UTC (rev 6347)
@@ -33,6 +33,7 @@
; UNITS_EXE = /usr/bin/units
ENABLE_SEARCHHIGHLIGHT = true
ENABLE_RECENTCHANGESBOX = false
+ENABLE_PAGE_PUBLIC = false
WIKI_NAME = PhpWiki
ENABLE_REVERSE_DNS = true
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2008-11-18 10:43:26 UTC (rev 6346)
+++ trunk/config/config-dist.ini 2008-11-19 08:53:06 UTC (rev 6347)
@@ -161,6 +161,11 @@
; Default: false
;ENABLE_RECENTCHANGESBOX = true
+; You can enable an admin checkbox to set a "public" page attribute, to
+; be used by external tools to generate a seperate public wiki.
+; Default: false
+;ENABLE_PAGE_PUBLIC = true
+
;==========================================================================
; Part One: Authentication and security settings.
;
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2008-11-18 10:43:26 UTC (rev 6346)
+++ trunk/lib/IniConfig.php 2008-11-19 08:53:06 UTC (rev 6347)
@@ -201,7 +201,7 @@
'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS',
'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
- 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX'
+ 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC'
);
$rs = @parse_ini_file($file);
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2008-11-18 10:43:26 UTC (rev 6346)
+++ trunk/lib/editpage.php 2008-11-19 08:53:06 UTC (rev 6347)
@@ -233,19 +233,35 @@
}
function updateLock() {
- if ((bool)$this->page->get('locked') == (bool)$this->locked)
- return false; // Not changed.
+ $changed = false;
+ if (!ENABLE_PAGE_PUBLIC) {
+ if ((bool)$this->page->get('locked') == (bool)$this->locked)
+ return false; // Not changed.
+ }
if (!$this->user->isAdmin()) {
// FIXME: some sort of message
return false; // not allowed.
}
- $this->page->set('locked', (bool)$this->locked);
- $this->tokens['LOCK_CHANGED_MSG']
- = $this->locked ? _("Page now locked.") : _("Page now unlocked.");
+ if (ENABLE_PAGE_PUBLIC) {
+ if ((bool)$this->page->get('public') != (bool)$this->public) {
+ $this->page->set('public', (bool)$this->public);
+ $this->tokens['LOCK_CHANGED_MSG']
+ = ($this->public
+ ? _("Page now public.")
+ : _("Page now not-public.")) . " ";
+ $changed = true;
+ }
- return true; // lock changed.
+ $this->page->set('locked', (bool)$this->locked);
+ $this->tokens['LOCK_CHANGED_MSG']
+ .= $this->locked
+ ? _("Page now locked.")
+ : _("Page now unlocked.");
+ $changed = true;
+ }
+ return $changed; // lock changed.
}
function savePage () {
@@ -654,6 +670,14 @@
'disabled' => (bool) !$this->user->isadmin(),
'checked' => (bool) $this->locked));
+ if (ENABLE_PAGE_PUBLIC) {
+ $el['PUBLIC_CB']
+ = HTML::input(array('type' => 'checkbox',
+ 'name' => 'edit[public]',
+ 'id' => 'edit-public',
+ 'disabled' => (bool) !$this->user->isAdmin(),
+ 'checked' => (bool) $this->page->get('public')));
+ }
if (ENABLE_WYSIWYG) {
if (($this->version == 0) and ($request->getArg('mode') != 'wysiwyg')) {
$el['WYSIWYG_B'] = Button(array("action" => "edit", "mode" => "wysiwyg"), "Wysiwyg Editor");
@@ -746,6 +770,8 @@
$this->meta = array_merge($this->meta, $meta);
$this->locked = !empty($posted['locked']);
+ if (ENABLE_PAGE_PUBLIC)
+ $this->public = !empty($posted['public']);
foreach (array('preview','save','edit_convert',
'keep_old','overwrite','diff','upload') as $o)
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2008-11-18 10:43:26 UTC (rev 6346)
+++ trunk/themes/default/templates/editpage.tmpl 2008-11-19 08:53:06 UTC (rev 6347)
@@ -60,12 +60,11 @@
<tr valign="middle">
<td>
<?=$MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?=_("This is a minor change.")?></label><br />
- <?=$OLD_MARKUP_CB?> <label for="useOldMarkup"><?=_("Use old markup")?></label> <?=$OLD_MARKUP_CONVERT?>
+ <?=$OLD_MARKUP_CB ?> <label for="useOldMarkup"><?=_("Use old markup")?></label> <?=$OLD_MARKUP_CONVERT?>
</td>
<td align="center">
<?php if (!empty($WYSIWYG_B)){ ?>
- <?=$WYSIWYG_B?>
- <?=$SEP?>
+ <?=$WYSIWYG_B?><?=$SEP?>
<?php } ?>
<?= $PREVIEW_B ?>
<?php if ($SAVE_B) { ?>
@@ -78,8 +77,10 @@
<tr>
<td>
<?php if ($user->isAdmin()) { ?>
- <?= $LOCKED_CB ?> <label for="edit-locked"><?=_("Locked")?></label>
- <?php } ?>
+ <?= $LOCKED_CB ?> <label for="edit-locked" title="<?=_("Make the page read-only?")?>"><?=_("Locked")?></label>
+ <?php if (ENABLE_PAGE_PUBLIC) { ?>
+ <?= $PUBLIC_CB ?> <label for="edit-public" title="<?=_("Export to a seperate public area?")?>"><?=_("Public")?></label>
+ <?php }} ?>
</td>
<td colspan="2" align="right">
<?php if (!$user->isAuthenticated()) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-12-13 19:19:21
|
Revision: 6355
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6355&view=rev
Author: vargenau
Date: 2008-12-13 19:19:17 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
Added "align" parameter to PrevNext plugin
Modified Paths:
--------------
trunk/lib/plugin/PrevNext.php
trunk/pgsrc/Help%2FPrevNextPlugin
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2008-12-04 07:51:53 UTC (rev 6354)
+++ trunk/lib/plugin/PrevNext.php 2008-12-13 19:19:17 UTC (rev 6355)
@@ -2,6 +2,7 @@
rcs_id('$Id$');
/**
Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
+ Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
This file is part of PhpWiki.
@@ -52,6 +53,7 @@
'last' => '',
'order' => '',
'style' => 'button', // or 'text'
+ 'align' => 'left', // or 'right', or 'center'
'class' => 'wikiaction'
);
}
@@ -79,11 +81,27 @@
global $WikiTheme;
$sep = $WikiTheme->getButtonSeparator();
- $links = HTML();
+ if ($align == 'center') {
+ $tr = HTML::tr();
+ $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), $tr);
+ } else if ($align == 'right') {
+ $td = HTML::td(array('align' => $align));
+ $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), HTML::tr($td));
+ } else {
+ $links = HTML();
+ }
+
if ($style == 'text') {
- if (!$sep)
+ if (!$sep) {
$sep = " | "; // force some kind of separator
- $links->pushcontent(" [ ");
+ }
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), " [ "));
+ } else if ($align == 'right') {
+ $td->pushcontent(" [ ");
+ } else {
+ $links->pushcontent(" [ ");
+ }
}
$last_is_text = false;
$this_is_first = true;
@@ -94,35 +112,92 @@
if ($style == 'button') {
// localized version: _("Previous").gif
if ($imgurl = $WikiTheme->getButtonURL($label)) {
- if ($last_is_text)
- $links->pushContent($sep);
- $links->pushcontent(new ImageButton($label, $url,
- false, $imgurl));
+ if ($last_is_text) {
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), $sep));
+ } else if ($align == 'right') {
+ $td->pushcontent($sep);
+ } else {
+ $links->pushcontent($sep);
+ }
+ }
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
+ } else if ($align == 'right') {
+ $td->pushContent(new ImageButton($label, $url, false, $imgurl));
+ } else {
+ $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
+ }
$last_is_text = false;
// generic version: prev.gif
} elseif ($imgurl = $WikiTheme->getButtonURL($dir)) {
- if ($last_is_text)
- $links->pushContent($sep);
- $links->pushContent(new ImageButton($label, $url,
- false, $imgurl));
+ if ($last_is_text) {
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), $sep));
+ } else if ($align == 'right') {
+ $td->pushcontent($sep);
+ } else {
+ $links->pushcontent($sep);
+ }
+ }
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
+ } else if ($align == 'right') {
+ $td->pushContent(new ImageButton($label, $url, false, $imgurl));
+ } else {
+ $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
+ }
$last_is_text = false;
} else { // text only
- if (! $this_is_first)
- $links->pushContent($sep);
- $links->pushContent(new Button($label, $url, $class));
+ if (! $this_is_first) {
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), $sep));
+ } else if ($align == 'right') {
+ $td->pushcontent($sep);
+ } else {
+ $links->pushcontent($sep);
+ }
+ }
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
+ } else if ($align == 'right') {
+ $td->pushContent(new Button($label, $url, $class));
+ } else {
+ $links->pushcontent(new Button($label, $url, $class));
+ }
$last_is_text = true;
}
} else {
- if (! $this_is_first)
- $links->pushContent($sep);
- $links->pushContent(new Button($label, $url, $class));
+ if (! $this_is_first) {
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), $sep));
+ } else if ($align == 'right') {
+ $td->pushcontent($sep);
+ } else {
+ $links->pushcontent($sep);
+ }
+ }
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
+ } else if ($align == 'right') {
+ $td->pushContent(new Button($label, $url, $class));
+ } else {
+ $links->pushcontent(new Button($label, $url, $class));
+ }
$last_is_text = true;
}
$this_is_first = false;
}
}
- if ($style == 'text')
- $links->pushcontent(" ] ");
+ if ($style == 'text') {
+ if ($align == 'center') {
+ $tr->pushContent(HTML::td(array('align' => $align), " ] "));
+ } else if ($align == 'right') {
+ $td->pushcontent(" ] ");
+ } else {
+ $links->pushcontent(" ] ");
+ }
+ }
return $links;
}
}
Modified: trunk/pgsrc/Help%FPrevNextPlugin
===================================================================
--- trunk/pgsrc/Help%2FPrevNextPlugin 2008-12-04 07:51:53 UTC (rev 6354)
+++ trunk/pgsrc/Help%2FPrevNextPlugin 2008-12-13 19:19:17 UTC (rev 6355)
@@ -1,4 +1,4 @@
-Date: Mon, 9 Aug 2008 12:19:24 +0000
+Date: Mon, 12 Dec 2008 12:19:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -55,6 +55,10 @@
| Reorder the buttons: comma-delimited
| empty
|-
+| <b>order</b>
+| Can be ''left'', ''right'' or ''center''
+| left
+|-
| <b>style</b>
| Can be ''button'' or ''text''
| button
@@ -87,6 +91,34 @@
<verbatim>
<?plugin PrevNext prev="Help/CreateTocPlugin"
next="Help/MediawikiTablePlugin"
+ contents="Help"
+ align="right"
+?>
+</verbatim>
+
+<?plugin PrevNext prev="Help/CreateTocPlugin"
+ next="Help/MediawikiTablePlugin"
+ contents="Help"
+ align="right"
+?>
+
+<verbatim>
+<?plugin PrevNext prev="Help/CreateTocPlugin"
+ next="Help/MediawikiTablePlugin"
+ contents="Help"
+ align="center"
+?>
+</verbatim>
+
+<?plugin PrevNext prev="Help/CreateTocPlugin"
+ next="Help/MediawikiTablePlugin"
+ contents="Help"
+ align="center"
+?>
+
+<verbatim>
+<?plugin PrevNext prev="Help/CreateTocPlugin"
+ next="Help/MediawikiTablePlugin"
up="Help"
style="text"
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-01 19:38:23
|
Revision: 6357
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6357&view=rev
Author: vargenau
Date: 2009-01-01 19:37:23 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
New plugin: CurrentTime
Added Paths:
-----------
trunk/lib/plugin/CurrentTime.php
trunk/pgsrc/Help%2FCurrentTimePlugin
Added: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php (rev 0)
+++ trunk/lib/plugin/CurrentTime.php 2009-01-01 19:37:23 UTC (rev 6357)
@@ -0,0 +1,100 @@
+<?php // -*-php-*-
+rcs_id('$Id: CurrentTime.php 6185 2008-08-22 11:40:14Z vargenau $');
+/*
+ * Copyright 2008 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
+ */
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The CurrentTimePlugin ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/**
+ * A simple plugin that displays current time and date.
+ *
+ * Usage:
+ * <?plugin CurrentTime?>
+ * <?plugin CurrentTime format=XXX ?>
+ */
+
+class WikiPlugin_CurrentTime
+extends WikiPlugin
+{
+ // Five required functions in a WikiPlugin.
+
+ function getName () {
+ return _("CurrentTime");
+ }
+
+ function getDescription () {
+ return _("A simple plugin that displays current time and date");
+
+ }
+
+ function getVersion() {
+ return preg_replace("/[Revision: $]/", '',
+ "\$Revision: 6185 $");
+ }
+
+ // Establish default values for each of this plugin's arguments.
+ function getDefaultArguments() {
+ return array('timezone' => '',
+ 'format' => '%Y-%m-%d %T');
+ }
+
+ function run($dbi, $argstr, &$request, $basepage) {
+ extract($this->getArgs($argstr, $request));
+
+ if ($format == 'date') {
+ $format = '%Y-%m-%d';
+ }
+ if ($format == 'time') {
+ $format = '%T';
+ }
+
+ return HTML::span(strftime($format, time()));
+ }
+};
+
+// For emacs users
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
Added: trunk/pgsrc/Help%FCurrentTimePlugin
===================================================================
--- trunk/pgsrc/Help%2FCurrentTimePlugin (rev 0)
+++ trunk/pgsrc/Help%2FCurrentTimePlugin 2009-01-01 19:37:23 UTC (rev 6357)
@@ -0,0 +1,63 @@
+Date: Mon, 22 Dec 2008 13:19:24 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id: Help%2FCurrentTime 6355 2008-12-13 19:19:17Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=Help%2FCurrentTime;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=iso-8859-1
+Content-Transfer-Encoding: binary
+
+The *~CurrentTime* [plugin|Help:WikiPlugin] displays current time and date (when page was saved).
+
+!!! Usage
+<verbatim>
+<?plugin CurrentTime format=xxx ?>
+</verbatim>
+
+!!! Arguments
+
+{| class="bordered"
+|-
+| Argument
+| Description
+| Default value
+|-
+| <b>format</b>
+| Display format (strftime format, or 'date' or 'time')
+| Date and time in ISO 8601:2004 format
+|}
+
+!!! Examples
+
+<verbatim>
+<?plugin CurrentTime ?>
+</verbatim>
+
+<?plugin CurrentTime ?>
+
+<verbatim>
+<?plugin CurrentTime format=date ?>
+</verbatim>
+
+<?plugin CurrentTime format=date ?>
+
+<verbatim>
+<?plugin CurrentTime format=time ?>
+</verbatim>
+
+<?plugin CurrentTime format=time ?>
+
+<verbatim>
+<?plugin CurrentTime format='%d %h %Y %H h %M m %S s %Z' ?>
+</verbatim>
+
+<?plugin CurrentTime format='%d %h %Y %H h %M m %S s %Z' ?>
+
+!!! Author
+* Marc-Etienne Vargenau, Alcatel-Lucent
+
+!!! See Also
+
+----
+[PhpWikiDocumentation] [CategoryWikiPlugin]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-01 20:15:38
|
Revision: 6361
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6361&view=rev
Author: vargenau
Date: 2009-01-01 20:15:34 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
Add summary syntax to Mediawiki tables
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
trunk/pgsrc/Help%2FMediawikiTablePlugin
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-01-01 19:52:28 UTC (rev 6360)
+++ trunk/lib/plugin/MediawikiTable.php 2009-01-01 20:15:34 UTC (rev 6361)
@@ -136,6 +136,12 @@
continue;
}
+ // Table summary
+ if (substr($line,0,2) == "|=") {
+ $line = substr($line,2);
+ $table->setAttr("summary", trim($line));
+ }
+
// Table caption
if (substr($line,0,2) == "|+") {
Modified: trunk/pgsrc/Help%FMediawikiTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FMediawikiTablePlugin 2009-01-01 19:52:28 UTC (rev 6360)
+++ trunk/pgsrc/Help%2FMediawikiTablePlugin 2009-01-01 20:15:34 UTC (rev 6361)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Aug 2008 14:15:24 +0000
+Date: Mon, 22 Dec 2008 14:15:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,14 +8,19 @@
charset=iso-8859-1
Content-Transfer-Encoding: binary
-The *~MediawikiTable* [plugin|Help:WikiPlugin] takes off from the [RichTablePlugin|Help:RichTablePlugin]. It allows a user to specify a <tt><table></tt> with (a subset of) the syntax used by Mediawiki.
+The *~MediawikiTable* [plugin|Help:WikiPlugin] takes off from the [RichTable|Help:RichTablePlugin] plugin. It allows a user to specify a <tt><table></tt> with (a subset of) the syntax used by Mediawiki.
* The table starts with a line <b>{~|</b> and ends with a line <b>|~}</b>.
* An optional table caption is made with a line starting with a pipe and a plus sign <b>|+</b> followed by the caption.
+* An optional table summary is made with a line starting with a pipe and an equal sign <b>|=</b> followed by the summary.
* A table row starts with a pipe and a hyphen: <b>|-</b>.
* A table cell starts with a pipe on a new line, or a double bar <b>||</b> on the same line.
* A header table cell starts with an exclamation mark, or a double exclamation mark <b>!!</b> on the same line (works only with an explicit plugin call).
+The summary syntax is an extension to the Mediawiki syntax.
+You can also simply put the summary as an attribute to the table.
+The summary is necessary to be able to create accessible tables.
+
!!! HTML attributes
<?plugin RichTable
@@ -53,6 +58,7 @@
{| border="1", style="width: 100%"
|+ style="font-weight: bold; font-size: 150%;" | This is the table caption
+|= This is the table summary
|- style="white-space: nowrap"
| <b>Header 1</b>
| <b>Header 2</b>
@@ -70,6 +76,7 @@
<verbatim>
{| border="1", style="width: 100%"
|+ style="font-weight: bold; font-size: 150%;" | This is the table caption
+|= This is the table summary
|- style="white-space: nowrap"
| <b>Header 1</b>
| <b>Header 2</b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-12 16:48:59
|
Revision: 6395
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6395&view=rev
Author: vargenau
Date: 2009-01-12 16:48:53 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
New plugin: Chart
Added Paths:
-----------
trunk/lib/plugin/Chart.php
trunk/pgsrc/Help%2FChartPlugin
Added: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php (rev 0)
+++ trunk/lib/plugin/Chart.php 2009-01-12 16:48:53 UTC (rev 6395)
@@ -0,0 +1,172 @@
+<?php // -*-php-*-
+rcs_id('$Id$');
+/*
+ * Copyright 2007 $ThePhpWikiProgrammingTeam
+ * Copyright 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
+ */
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The ChartPlugin ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+class WikiPlugin_Chart
+extends WikiPlugin
+{
+ function getName() {
+ return _("Chart");
+ }
+
+ function getDescription() {
+ return _("Render SVG charts");
+ }
+
+ function getVersion() {
+ return preg_replace("/[Revision: $]/", '',
+ "\$Revision: 6185 $");
+ }
+
+ function getDefaultArguments() {
+ return array('width' => 200,
+ 'height' => 200,
+ 'type' => 'line', // or 'area', 'bar', 'pie'
+ // 'xlabel' => 'x', // TODO
+ // 'ylabel' => 'y', // TODO
+ 'color' => 'green',
+ // 'legend' => false, // TODO
+ 'data' => false // mandatory
+ );
+ }
+ function handle_plugin_args_cruft(&$argstr, &$args) {
+ $this->source = $argstr;
+ }
+
+ function run($dbi, $argstr, &$request, $basepage) {
+
+ global $WikiTheme;
+ $args = $this->getArgs($argstr, $request);
+ extract($args);
+ $html = HTML();
+ $js = JavaScript('', array ('src' => $WikiTheme->_findData('ASCIIsvg.js')));
+ $html->pushContent($js);
+
+ $values = explode(",", $data);
+
+ // x_min = 0
+ // x_max = number of elements in data
+ // y_min = 0
+ // y_max = biggest element in data
+
+ $x_max = sizeof($values);
+ $y_max = max($values);
+ $sum = 0;
+ foreach ($values as $value) {
+ $sum += $value;
+ }
+
+ $source = 'initPicture(0,'.$x_max.',0,'.$y_max.'); axes(); stroke = "'.$color.'"; strokewidth = 5;';
+
+ if ($type == "bar") {
+ $abscisse = 1;
+ $source .= 'strokewidth = 10; ';
+ foreach ($values as $value) {
+ $source .= 'point1 = ['.$abscisse.', 0];'
+ . 'point2 = ['.$abscisse.','.$value.'];'
+ . 'line(point1, point2);';
+ $abscisse += 1;
+ }
+ } else if ($type == "line") {
+ $abscisse = 0;
+ $source .= 'strokewidth = 3; p = []; ';
+ foreach ($values as $value) {
+ $source .= 'for (t = 1; t < 1.01; t += 1) p[p.length] = ['
+ . $abscisse
+ . ', t*'
+ . trim($value)
+ . '];';
+ $abscisse += 1;
+ }
+ $source .= 'path(p);';
+ } else if ($type == "pie") {
+ $source = 'initPicture(-1.1,1.1,-1.1,1.1); stroke = "'.$color.'"; strokewidth = 1;'
+ . 'center = [0, 0]; circle(center, 1);'
+ . 'point = [1, 0]; line(center, point);';
+ $angle = 0;
+ foreach ($values as $value) {
+ $angle += $value/$sum;
+ $source .= 'point = [cos(2*pi*'.$angle.'), sin(2*pi*'.$angle.')]; line(center, point);';
+ }
+ }
+
+ $embedargs = array('width' => $args['width'],
+ 'height' => $args['height'],
+ 'script' => $source);
+ $embed = new SVG_HTML("embed", $embedargs);
+ $html->pushContent($embed);
+ return $html;
+ }
+};
+
+class SVG_HTML extends HtmlElement {
+ function startTag() {
+ $start = "<" . $this->_tag;
+ $this->_setClasses();
+ foreach ($this->_attr as $attr => $val) {
+ if (is_bool($val)) {
+ if (!$val)
+ continue;
+ $val = $attr;
+ }
+ $qval = str_replace("\"", '"', $this->_quote((string)$val));
+ if ($attr == 'script')
+ // note the ' not "
+ $start .= " $attr='$qval'";
+ else
+ $start .= " $attr=\"$qval\"";
+ }
+ $start .= ">";
+ return $start;
+ }
+}
+
+// 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/Chart.php
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/pgsrc/Help%FChartPlugin
===================================================================
--- trunk/pgsrc/Help%2FChartPlugin (rev 0)
+++ trunk/pgsrc/Help%2FChartPlugin 2009-01-12 16:48:53 UTC (rev 6395)
@@ -0,0 +1,32 @@
+Date: Mon, 12 Jan 2009 8:18:24 +0100
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=Help%2FSpreadsheet;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=iso-8859-1
+Content-Transfer-Encoding: binary
+
+Chart plugin allows to easily draw simple graphs.
+
+== Line chart ==
+
+<<Chart type=line
+ data="5, 7, 11, 3, 15"
+>>
+
+== Bar chart ==
+
+<<Chart type=bar
+ color=red
+ data="5, 7, 11, 3, 15"
+>>
+
+== Pie chart ==
+
+<<Chart type=pie
+ color=blue
+ data="5, 7, 11, 3, 15"
+>>
+
Property changes on: trunk/pgsrc/Help%2FChartPlugin
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-13 18:18:42
|
Revision: 6399
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6399&view=rev
Author: vargenau
Date: 2009-01-13 18:18:36 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
<noinclude> and </noinclude> should not appear even when not included
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/HtmlParser.php
trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2009-01-12 20:23:09 UTC (rev 6398)
+++ trunk/lib/BlockParser.php 2009-01-13 18:18:36 UTC (rev 6399)
@@ -919,7 +919,7 @@
class Block_pre extends BlockMarkup
{
- var $_re = '<(?:pre|verbatim|nowiki)>';
+ var $_re = '<(?:pre|verbatim|nowiki|noinclude)>';
function _match (&$input, $m) {
$endtag = '</' . substr($m->match, 1);
@@ -943,9 +943,13 @@
// FIXME: no <img>, <big>, <small>, <sup>, or <sub>'s allowed
// in a <pre>.
- if ($m->match == '<pre>')
+ if ($m->match == '<pre>') {
$text = TransformInline($text);
- if ($m->match == '<nowiki>') {
+ }
+ if ($m->match == '<noinclude>') {
+ $text = TransformText($text);
+ $this->_element = new Block_HtmlElement('div', false, $text);
+ } else if ($m->match == '<nowiki>') {
$text = TransformInlineNowiki($text);
$this->_element = new Block_HtmlElement('p', false, $text);
} else {
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2009-01-12 20:23:09 UTC (rev 6398)
+++ trunk/lib/HtmlParser.php 2009-01-13 18:18:36 UTC (rev 6399)
@@ -267,6 +267,7 @@
'sub' => "wikify_default",
'nowiki' => "wikify_verbatim",
'verbatim' => "wikify_default",
+ 'noinclude' => "wikify_noinclude",
);
}
@@ -328,6 +329,10 @@
return "\n<verbatim>\n$contents\n</verbatim>";
}
+ function wikify_noinclude( $node ) {
+ return $this->elem_contents( $node );
+ }
+
function wikify_img( $node ) {
$image_url = $this->absolute_url( $node->getAttr('src') );
$file = basename( $image_url );
@@ -429,4 +434,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2009-01-12 20:23:09 UTC (rev 6398)
+++ trunk/pgsrc/ReleaseNotes 2009-01-13 18:18:36 UTC (rev 6399)
@@ -67,6 +67,7 @@
* UserPreferences: specific message when only one preference is updated (vargenau)
* renamed class Theme to ~WikiTheme to avoid Gforge name clash (vargenau)
* numeric cells in tables are now right-aligned by default
+* <noinclude> and </noinclude> should not appear even when not included
!! New
* ~PageList supports listtype=ul,ol,dl. dl used by FullTextSearch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-15 10:21:43
|
Revision: 6403
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6403&view=rev
Author: vargenau
Date: 2009-01-15 10:21:34 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
RecentChanges: option bars for everything, not only days
Modified Paths:
--------------
trunk/lib/plugin/RecentChanges.php
trunk/themes/MonoBook/main.css
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2009-01-15 10:10:45 UTC (rev 6402)
+++ trunk/lib/plugin/RecentChanges.php 2009-01-15 10:21:34 UTC (rev 6403)
@@ -45,13 +45,23 @@
function title () {
global $request;
extract($this->_args);
- if ($author == '[]') $author = $request->_user->getID();
- if ($owner == '[]') $owner = $request->_user->getID();
- if ($author) $title = _("UserContribs").":$author";
- elseif ($owner) $title = _("UserContribs").":$owner";
- elseif ($only_new) $title = _("RecentNewPages");
- elseif ($show_minor) $title = _("RecentEdits");
- else $title = _("RecentChanges");
+ if ($author) {
+ $title = $author;
+ if ($title == '[]') {
+ $title = $request->_user->getID();
+ }
+ $title = _("UserContribs").": $title";
+ } elseif ($owner) {
+ $title = $owner;
+ if ($title == '[]') {
+ $title = $request->_user->getID();
+ }
+ $title = _("UserContribs").": $title";
+ } elseif ($only_new) {
+ $title = _("RecentNewPages");
+ } elseif ($show_minor) {
+ $title = _("RecentEdits");
+ } else $title = _("RecentChanges");
if (!empty($category))
$title = $category;
@@ -408,8 +418,9 @@
if (($desc = $this->description()))
$html->pushContent($desc);
- if ($this->_args['daylist'])
- $html->pushContent(new DayButtonBar($this->_args));
+ if ($this->_args['daylist']) {
+ $html->pushContent(new OptionsButtonBars($this->_args));
+ }
$last_date = '';
$lines = false;
@@ -528,8 +539,9 @@
$this->_args['limit'] = $count;
if (($desc = $this->description()))
$html->pushContent($desc);
- if ($this->_args['daylist'])
- $html->pushContent(new DayButtonBar($this->_args));
+ if ($this->_args['daylist']) {
+ $html->pushContent(new OptionsButtonBars($this->_args));
+ }
if ($first)
$html->pushContent(HTML::p(array('class' => 'rc-empty'),
$this->empty_message()));
@@ -855,10 +867,9 @@
if (mayAccessPage('view', $rev->_pagename)) {
$rss->addItem($this->item_properties($rev),
$this->pageURI($rev));
- if ($first) {
+ if ($first)
$this->setValidators($rev);
- $first = false;
- }
+ $first = false;
}
}
@@ -1323,42 +1334,70 @@
};
+class OptionsButtonBars extends HtmlElement {
-class DayButtonBar extends HtmlElement {
+ function OptionsButtonBars ($plugin_args) {
+ $this->__construct('fieldset', array('class' => 'wiki-rc-action'));
- function DayButtonBar ($plugin_args) {
- $this->__construct('p', array('class' => 'wiki-rc-action'));
-
- // Display days selection buttons
+ // Display selection buttons
extract($plugin_args);
// Custom caption
if (! $caption) {
- if ($show_minor)
- $caption = _("Show minor edits for:");
- elseif ($show_all)
- $caption = _("Show all changes for:");
- else
- $caption = _("Show changes for:");
- if ($only_new)
- $caption = _("All new pages since:");
+ $caption = _("Show changes for:");
}
- $this->pushContent($caption, ' ');
+ $this->pushContent(HTML::legend($caption));
+ $table = HTML::table();
- global $WikiTheme;
- $sep = $WikiTheme->getButtonSeparator();
-
- $n = 0;
+ $first = true;
foreach (explode(",", $daylist) as $days) {
- if ($n++)
- $this->pushContent($sep);
- $this->pushContent($this->_makeDayButton($days));
+ if ($first) {
+ $td = $this->_makeDayButton($days);
+ $first = false;
+ } else {
+ $td->pushContent($this->_makeDayButton($days));
+ }
}
+ $tr = HTML::tr();
+ $tr->pushContent($td);
+ $table->pushContent($tr);
+
+ $td = $this->_makeUsersButton(0);
+ $td->pushContent($this->_makeUsersButton(1));
+ $tr = HTML::tr();
+ $tr->pushContent($td);
+ $table->pushContent($tr);
+
+ $td = $this->_makePagesButton(0);
+ $td->pushContent($this->_makePagesButton(1));
+ $tr = HTML::tr();
+ $tr->pushContent($td);
+ $table->pushContent($tr);
+
+ $td = $this->_makeMinorButton(1);
+ $td->pushContent($this->_makeMinorButton(0));
+ $tr = HTML::tr();
+ $tr->pushContent($td);
+ $table->pushContent($tr);
+
+ $td = $this->_makeShowAllButton(1);
+ $td->pushContent($this->_makeShowAllButton(0));
+ $tr = HTML::tr();
+ $tr->pushContent($td);
+ $table->pushContent($tr);
+
+ $td = $this->_makeNewPagesButton(0);
+ $td->pushContent($this->_makeNewPagesButton(1));
+ $tr = HTML::tr();
+ $tr->pushContent($td);
+ $table->pushContent($tr);
+
+ $this->pushContent($table);
}
function _makeDayButton ($days) {
- global $WikiTheme, $request;
+ global $request;
if ($days == 1)
$label = _("1 day");
@@ -1367,10 +1406,109 @@
else
$label = sprintf(_("%s days"), abs($days));
+ $selfurl = $request->getURLtoSelf(array('action' => $request->getArg('action')));
$url = $request->getURLtoSelf(array('action' => $request->getArg('action'), 'days' => $days));
+ if ($url == $selfurl) {
+ return HTML::td(array('class'=>'tdselected'), $label);
+ }
+ return HTML::td(array('class'=>'tdunselected'),
+ HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
+ }
- return $WikiTheme->makeButton($label, $url, 'wiki-rc-action');
+ function _makeUsersButton ($users) {
+ global $request;
+
+ if ($users == 0) {
+ $label = _("All users");
+ $author = "";
+ } else {
+ $label = _("My modifications only");
+ $author = "[]";
+ }
+
+ $selfurl = $request->getURLtoSelf(array('action' => $request->getArg('action')));
+ $url = $request->getURLtoSelf(array('action' => $request->getArg('action'), 'author' => $author));
+ if ($url == $selfurl) {
+ return HTML::td(array('colspan'=>3, 'class'=>'tdselected'), $label);
+ }
+ return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'),
+ HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
}
+
+ function _makePagesButton ($pages) {
+ global $request;
+
+ if ($pages == 0) {
+ $label = _("All pages");
+ $owner = "";
+ } else {
+ $label = _("My pages only");
+ $owner = "[]";
+ }
+
+ $selfurl = $request->getURLtoSelf(array('action' => $request->getArg('action')));
+ $url = $request->getURLtoSelf(array('action' => $request->getArg('action'), 'owner' => $owner));
+ if ($url == $selfurl) {
+ return HTML::td(array('colspan'=>3, 'class'=>'tdselected'), $label);
+ }
+ return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'),
+ HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
+ }
+
+ function _makeMinorButton ($minor) {
+ global $request;
+
+ if ($minor == 0) {
+ $label = _("Major modifications only");
+ } else {
+ $label = _("All modifications");
+ }
+
+ $selfurl = $request->getURLtoSelf(array('action' => $request->getArg('action')));
+ $url = $request->getURLtoSelf(array('action' => $request->getArg('action'), 'show_minor' => $minor));
+ if ($url == $selfurl) {
+ return HTML::td(array('colspan'=>3, 'class'=>'tdselected'), $label);
+ }
+ return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'),
+ HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
+ }
+
+ function _makeShowAllButton ($showall) {
+ global $request;
+
+ if ($showall == 0) {
+ $label = _("Page once only");
+ } else {
+ $label = _("Full changes");
+ }
+
+ $selfurl = $request->getURLtoSelf(array('action' => $request->getArg('action')));
+ $url = $request->getURLtoSelf(array('action' => $request->getArg('action'), 'show_all' => $showall));
+ if ($url == $selfurl) {
+ return HTML::td(array('colspan'=>3, 'class'=>'tdselected'), $label);
+ }
+ return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'),
+ HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
+ }
+
+ function _makeNewPagesButton ($newpages) {
+ global $request;
+
+ if ($newpages == 0) {
+ $label = _("Old and new pages");
+ } else {
+ $label = _("New pages only");
+ }
+
+ $selfurl = $request->getURLtoSelf(array('action' => $request->getArg('action')));
+ $url = $request->getURLtoSelf(array('action' => $request->getArg('action'), 'only_new' => $newpages));
+ if ($url == $selfurl) {
+ return HTML::td(array('colspan'=>3, 'class'=>'tdselected'), $label);
+ }
+
+ return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'),
+ HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
+ }
}
// (c-file-style: "gnu")
Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css 2009-01-15 10:10:45 UTC (rev 6402)
+++ trunk/themes/MonoBook/main.css 2009-01-15 10:21:34 UTC (rev 6403)
@@ -1874,6 +1874,24 @@
background-color: #d8d8d8;
}
+/* For RecentChanges plugin */
+td.tdselected, td.tdunselected {
+ text-align: center;
+ font-weight: bold;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+td.tdselected {
+ color: white;
+ background-color: #554295;
+}
+
+td.tdunselected {
+ color: black;
+ background-color: #e9e8de;
+}
+
/* Style for feedback
* Use this style to tell the user that the operation he
* requested was executed successfully, e.g:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-01-16 09:41:09
|
Revision: 6405
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6405&view=rev
Author: rurban
Date: 2009-01-16 09:41:04 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
Derive Sidebar now from Monobook.
Search all parent classes for theme files, not only default.
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/themes/Sidebar/themeinfo.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2009-01-16 06:26:31 UTC (rev 6404)
+++ trunk/lib/WikiTheme.php 2009-01-16 09:41:04 UTC (rev 6405)
@@ -200,9 +200,21 @@
$this->_themes_dir = NormalizeLocalFileName("themes");
$this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";
$this->_theme = "themes/$theme_name";
+ $this->_parents = array();
- if ($theme_name != 'default')
- $this->_default_theme = new WikiTheme('default',true);
+ if ($theme_name != 'default') {
+ $parent = $this;
+ /* derived classes should search all parent classes */
+ while ($parent = get_parent_class($parent)) {
+ if ($parent == 'WikiTheme') {
+ $this->_default_theme = new WikiTheme('default', true);
+ $this->_parents[] = $this->_default_theme;
+ } elseif ($parent) {
+ $this->_parents[] = new WikiTheme
+ (preg_replace("/^WikiTheme_/i", "", $parent), true);
+ }
+ }
+ }
if ($noinit) return;
$script_url = deduce_script_name();
@@ -242,14 +254,23 @@
if (file_exists($this->_path . $file))
return $file;
+ /* Derived classes should search all parent classes */
+ foreach ($this->_parents as $parent) {
+ $path = $parent->_findFile($file, 1);
+ if ($path) {
+ return $path;
+ } elseif (DEBUG & _DEBUG_VERBOSE) {
+ ; //trigger_error("$parent->_theme/$file: not found", E_USER_NOTICE);
+ }
+ }
if (isset($this->_default_theme)) {
return $this->_default_theme->_findFile($file, $missing_okay);
}
else if (!$missing_okay) {
- if (DEBUG & function_exists('debug_backtrace')) { // >= 4.3.0
+ trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
+ if (DEBUG & _DEBUG_TRACE && function_exists('debug_backtrace')) { // >= 4.3.0
echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
}
- trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
}
return false;
}
@@ -1143,12 +1164,11 @@
return $this->_path . $tmp;
else {
$f1 = $this->file("templates/$name.tmpl");
- //trigger_error("findTemplate($name) pwd: ".getcwd(), E_USER_ERROR);
- if (isset($this->_default_theme)) {
- $f2 = $this->_default_theme->file("templates/$name.tmpl");
- //trigger_error("$f1 nor $f2 found", E_USER_ERROR);
- } else
- trigger_error("$f1 not found", E_USER_ERROR);
+ foreach ($this->_parents as $parent) {
+ if ($tmp = $parent->_findFile("templates/$name.tmpl", 1))
+ return $this->_path . $tmp;
+ }
+ trigger_error("$f1 not found", E_USER_ERROR);
return false;
}
}
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2009-01-16 06:26:31 UTC (rev 6404)
+++ trunk/themes/Sidebar/themeinfo.php 2009-01-16 09:41:04 UTC (rev 6405)
@@ -2,22 +2,52 @@
rcs_id('$Id$');
/*
- * This file defines the Sidebar appearance ("theme") of PhpWiki,
- * which can be used as parent class for all sidebar themes. See blog.
- * This use the dynamic jscalendar, which doesn't need extra requests
- * per month/year change.
+ * This file defines the Sidebar theme of PhpWiki,
+ * which can be used as parent class for all sidebar themes. See MonoBook and blog.
+ * It is now an extension of the MonoBook theme.
+ *
+ * This uses the dynamic jscalendar, which doesn't need extra requests per month/year change.
+ *
+ * Changes to MonoBook:
+ * makeActionButton
+ * folderArrow
+ * special login, search and tags
+ * CbNewUserEdit - when a new user creates or edits a page, a Userpage template is created
+ * CbUpload - uploads are virus checked
*/
+if (!defined("CLAMDSCAN_PATH"))
+ define("CLAMDSCAN_PATH","/usr/local/bin/clamdscan");
+if (!defined("CLAMDSCAN_VIRUS"))
+ define("CLAMDSCAN_VIRUS","/var/www/virus-found");
+
require_once('lib/WikiTheme.php');
-require_once('lib/WikiPlugin.php');
+require_once('themes/MonoBook/themeinfo.php');
+//require_once('lib/WikiPlugin.php');
-class WikiTheme_Sidebar extends WikiTheme {
+class WikiTheme_Sidebar extends WikiTheme_MonoBook {
function WikiTheme_Sidebar ($theme_name='Sidebar') {
$this->WikiTheme($theme_name);
$this->calendarInit(true);
}
+ /* Display up/down button with persistent state */
+ /* persistent state per block in cookie for 30 days */
+ function folderArrow ($id, $init='Open') {
+ global $request;
+ if ($cookie = $request->cookies->get("folder_".$id)) {
+ $init = $cookie;
+ }
+ $png = $this->_findData('images/folderArrow'.$init.'.png');
+ return HTML::img(array('id' => $id.'-img',
+ 'src' => $png,
+ //'align' => 'right',
+ 'onClick' => "showHideFolder('$id')",
+ 'title' => _("Click to hide/show")));
+ }
+
+ /*
function findTemplate ($name) {
// hack for navbar.tmpl to hide the buttonseparator
if ($name == "navbar") {
@@ -28,71 +58,44 @@
}
return parent::findTemplate($name);
}
+ */
- function load() {
- // CSS file defines fonts, colors and background images for this
- // style. The companion '*-heavy.css' file isn't defined, it's just
- // expected to be in the same directory that the base style is in.
+ /* Callback when a new user creates or edits a page */
+ function CbNewUserEdit (&$request, $userid) {
+ $userid = strtoupper($userid);
+ $content = "{{Template/UserPage}}";
+ $dbi =& $request->_dbi;
+ $page = $dbi->getPage($userid);
+ $page->save($content, WIKIDB_FORCE_CREATE, array('author' => $userid));
+ $dbi->touch();
+ }
- $this->setDefaultCSS(_("Sidebar"), 'sidebar.css');
- //$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
- //$this->setDefaultCSS('PhpWiki', 'phpwiki.css');
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
- $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+ /** CbUpload (&$request, $pathname) => true or false
+ * Callback when a file is uploaded. virusscan, ...
+ * @param string $str
+ * @return bool true for success, false to abort gracefully.
+ * In case of false, the file is deleted by the caller, but the callback must
+ * inform the user why the file was deleted.
+ * Src:
+ * if (!$WikiTheme->CbUpload($request, $file_dir . $userfile_name))
+ * unlink($file_dir . $userfile_name);
+ */
+ function CbUpload (&$request, $pathname) {
+ $cmdline = CLAMDSCAN_PATH . " --nosummary --move=" . CLAMDSCAN_VIRUS;
+ $report = `$cmdline $pathname"`;
+ if (!$report) {
+ trigger_error("clamdscan failed", E_USER_WARNING);
+ return true;
+ }
+ if (!preg_match("/: OK$/", $report)) {
+ //preg_match("/: (.+)$/", $report, $m);
+ trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING);
+ return false;
+ } else {
+ return true;
+ }
+ }
- /**
- * The logo image appears on every page and links to the HomePage.
- */
- //$this->addImageAlias('logo', 'logo.png');
-
- /**
- * The Signature image is shown after saving an edited page. If this
- * is not set, any signature defined in index.php will be used. If it
- * is not defined by index.php or in here then the "Thank you for
- * editing..." screen will be omitted.
- */
-
- // Comment this next line out to enable signature.
- $this->addImageAlias('signature', false);
-
- $this->addImageAlias('search', 'search.png');
-
- /*
- * Link icons.
- */
- $this->setLinkIcon('http');
- $this->setLinkIcon('https');
- $this->setLinkIcon('ftp');
- $this->setLinkIcon('mailto');
- $this->setLinkIcon('interwiki');
- $this->setLinkIcon('*', 'url');
-
- //$this->setButtonSeparator(' | ');
-
- /**
- * WikiWords can automatically be split by inserting spaces between
- * the words. The default is to leave WordsSmashedTogetherLikeSo.
- */
- $this->setAutosplitWikiWords(true);
-
- /**
- * If true (default) show create '?' buttons on not existing pages, even if the
- * user is not signed in.
- * If false, anon users get no links and it looks cleaner, but then they
- * cannot easily fix missing pages.
- */
- $this->setAnonEditUnknownLinks(false);
-
- /*
- * You may adjust the formats used for formatting dates and times
- * below. (These examples give the default formats.)
- * Formats are given as format strings to PHP strftime() function See
- * http://www.php.net/manual/en/function.strftime.php for details.
- * Do not include the server's zone (%Z), times are converted to the
- * user's time zone.
- */
- //$this->setDateFormat("%B %d, %Y");
- }
}
$WikiTheme = new WikiTheme_Sidebar('Sidebar');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-21 09:35:46
|
Revision: 6424
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6424&view=rev
Author: vargenau
Date: 2009-01-21 09:35:42 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
CSS classes tightenable top bottom no longer used in modern themes (Monobook, Sidebar)
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/themes/Crao/crao.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/Portland/portland.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/default/phpwiki.css
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/lib/BlockParser.php 2009-01-21 09:35:42 UTC (rev 6424)
@@ -334,9 +334,6 @@
}
function setTightness($top, $bottom) {
- $this->setInClass('tightenable');
- $this->setInClass('top', $top);
- $this->setInClass('bottom', $bottom);
}
}
@@ -466,7 +463,6 @@
if (count($this->_content) == 1) {
$elem = $this->_content[0];
if (isa($elem, 'XmlElement') and $elem->getTag() == 'p') {
- assert($elem->getAttr('class') == 'tightenable top bottom');
$this->setContent($elem->getContent());
}
}
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/lib/CachedMarkup.php 2009-01-21 09:35:42 UTC (rev 6424)
@@ -756,9 +756,6 @@
}
function setTightness($top, $bottom) {
- $this->_tightenable = 0;
- if ($top) $this->_tightenable |= 1;
- if ($bottom) $this->_tightenable |= 2;
}
function isInlineElement() {
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/lib/plugin/SpellCheck.php 2009-01-21 09:35:42 UTC (rev 6424)
@@ -148,7 +148,6 @@
}
}
/*$pre = HTML::pre(HTML::raw($code));
- $pre->setAttr('class','tightenable top bottom');
$html->pushContent($pre);*/
} else {
$sugg = pspell_check($source, $lang);
Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/lib/plugin/SyntaxHighlighter.php 2009-01-21 09:35:42 UTC (rev 6424)
@@ -172,7 +172,6 @@
if (empty($code))
return $this->error(fmt("Couldn't start commandline '%s'",$commandLine));
$pre = HTML::pre(HTML::raw($code));
- $pre->setAttr('class','tightenable top bottom');
$html->pushContent($pre);
return HTML($html);
} else {
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/themes/Crao/crao.css 2009-01-21 09:35:42 UTC (rev 6424)
@@ -1,6 +1,6 @@
/**
*15 dec 2003
- *css cr\x8Ee pour le site http://www.crao.net
+ *css cree pour le site http://www.crao.net
*L Lunati
*
*/
@@ -598,15 +598,6 @@
******************************
*/
-/*
-*le lien rss HEADING
-*/
-.tightenable h2 {/* MODIFY-TXT */
- font-size: 12px;
- color: #888;
- font-weight: bold;
-}
-
/* rss feed */
div.rss {
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/themes/MacOSX/MacOSX.css 2009-01-21 09:35:42 UTC (rev 6424)
@@ -585,45 +585,6 @@
text-indent: -3em;
}
-
-/*
- * Vertical margins around block elements.
- */
-p { margin: 1em 0; } /* Normal ("loose") paragraphs */
-li p, dd p, td p { margin: 1ex 0; } /* Paragraphs within lists are a little tighter. */
-
-/* ul, ol, dl { margin: 0.2ex 0; } /* A little room around lists. */
-/* li ul, li ol, li dl,
-dd ul, dd ol, dd dl { margin: 0 0; } /* but not around sub-lists. */
-
-/* Normal ("loose") list elements */
-li.tightenable { margin: 1em 0; }
-dt.tightenable { margin-top: 1em; }
-dd.tightenable { margin-bottom: 1.5ex; }
-
-li.tightenable.top,
-dt.tightenable.top,
-dd.tightenable.top {
- margin-top: 0.2ex;
-}
-li li.tightenable.top {
- margin-top: 0;
-}
-li.tightenable.bottom,
-dd.tightenable.bottom {
- margin-bottom: 0.2ex;
-}
-li li.tightenable.bottom {
- margin-bottom: 0;
-}
-
-.tightenable.top {
- margin-top: 0;
-}
-.tightenable.bottom {
- margin-bottom: 0;
-}
-
/* IncludePage plugin */
.transclusion-title {
text-align: right;
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/themes/Portland/portland.css 2009-01-21 09:35:42 UTC (rev 6424)
@@ -28,46 +28,6 @@
}
/*
- * Vertical margins around block elements.
- */
-
-p { margin: 1em 0; } /* Normal ("loose") paragraphs */
-li p, dd p, td p { margin: 1ex 0; } /* Paragraphs within lists are a little tighter. */
-
-/* ul, ol, dl { margin: 0.2ex 0; } /* A little room around lists. */
-/* li ul, li ol, li dl,
-dd ul, dd ol, dd dl { margin: 0 0; } /* but not around sub-lists. */
-
-/* Normal ("loose") list elements */
-li.tightenable { margin: 1em 0; }
-dt.tightenable { margin-top: 1em; }
-dd.tightenable { margin-bottom: 1.5ex; }
-
-
-li.tightenable.top,
-dt.tightenable.top,
-dd.tightenable.top {
- margin-top: 0.2ex;
-}
-li li.tightenable.top {
- margin-top: 0;
-}
-li.tightenable.bottom,
-dd.tightenable.bottom {
- margin-bottom: 0.2ex;
-}
-li li.tightenable.bottom {
- margin-bottom: 0;
-}
-
-.tightenable.top {
- margin-top: 0;
-}
-.tightenable.bottom {
- margin-bottom: 0;
-}
-
-/*
* "DL tables"
*/
.wiki-dl-table {
@@ -80,12 +40,6 @@
border-left: none;
border-right: none;
}
-.wiki-dl-table tr.tightenable.top {
- border-top: 1px #444 solid;
-}
-.wiki-dl-table tr.tightenable.bottom {
- border-bottom: 1px #444 solid;
-}
.wiki-dl-table th,
.wiki-dl-table td {
padding: 0.25em 0.5em;
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/themes/Wordpress/Wordpress.css 2009-01-21 09:35:42 UTC (rev 6424)
@@ -655,46 +655,6 @@
/*
- * Vertical margins around block elements.
- */
-
-p { margin: 1em 0; } /* Normal ("loose") paragraphs */
-li p, dd p, td p { margin: 1ex 0; } /* Paragraphs within lists are a little tighter. */
-
-/* ul, ol, dl { margin: 0.2ex 0; } /* A little room around lists. */
-/* li ul, li ol, li dl,
-dd ul, dd ol, dd dl { margin: 0 0; } /* but not around sub-lists. */
-
-/* Normal ("loose") list elements */
-li.tightenable { margin: 1em 0; }
-dt.tightenable { margin-top: 1em; }
-dd.tightenable { margin-bottom: 1.5ex; }
-
-
-li.tightenable.top,
-dt.tightenable.top,
-dd.tightenable.top {
- margin-top: 0.2ex;
-}
-li li.tightenable.top {
- margin-top: 0;
-}
-li.tightenable.bottom,
-dd.tightenable.bottom {
- margin-bottom: 0.2ex;
-}
-li li.tightenable.bottom {
- margin-bottom: 0;
-}
-
-.tightenable.top {
- margin-top: 0;
-}
-.tightenable.bottom {
- margin-bottom: 0;
-}
-
-/*
* "DL tables"
*/
.wiki-dl-table {
@@ -707,12 +667,6 @@
border-left: none;
border-right: none;
}
-.wiki-dl-table tr.tightenable.top {
- border-top: 1px #444 solid;
-}
-.wiki-dl-table tr.tightenable.bottom {
- border-bottom: 1px #444 solid;
-}
.wiki-dl-table th,
.wiki-dl-table td {
padding: 0.25em 0.5em;
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2009-01-21 09:18:16 UTC (rev 6423)
+++ trunk/themes/default/phpwiki.css 2009-01-21 09:35:42 UTC (rev 6424)
@@ -681,48 +681,7 @@
padding-left: 1em;
}
-
/*
- * Vertical margins around block elements.
- */
-
-p { margin: 1em 0; } /* Normal ("loose") paragraphs */
-li p, dd p, td p { margin: 1ex 0; } /* Paragraphs within lists are a little tighter. */
-
-/* ul, ol, dl { margin: 0.2ex 0; } /* A little room around lists. */
-/* li ul, li ol, li dl,
-dd ul, dd ol, dd dl { margin: 0 0; } /* but not around sub-lists. */
-
-/* Normal ("loose") list elements */
-li.tightenable { margin: 1em 0; }
-dt.tightenable { margin-top: 1em; }
-dd.tightenable { margin-bottom: 1.5ex; }
-
-
-li.tightenable.top,
-dt.tightenable.top,
-dd.tightenable.top {
- margin-top: 0.2ex;
-}
-li li.tightenable.top {
- margin-top: 0;
-}
-li.tightenable.bottom,
-dd.tightenable.bottom {
- margin-bottom: 0.2ex;
-}
-li li.tightenable.bottom {
- margin-bottom: 0;
-}
-
-.tightenable.top {
- margin-top: 0;
-}
-.tightenable.bottom {
- margin-bottom: 0;
-}
-
-/*
* "DL tables"
*/
.wiki-dl-table {
@@ -735,12 +694,6 @@
border-left: none;
border-right: none;
}
-.wiki-dl-table tr.tightenable.top {
- border-top: 1px #444 solid;
-}
-.wiki-dl-table tr.tightenable.bottom {
- border-bottom: 1px #444 solid;
-}
.wiki-dl-table th,
.wiki-dl-table td {
padding: 0.25em 0.5em;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-14 16:39:06
|
Revision: 6500
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6500&view=rev
Author: vargenau
Date: 2009-02-14 16:39:01 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Put flipAll Javascript function in wikicommon.js
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/WikiTheme.php
Added Paths:
-----------
trunk/themes/default/wikicommon.js
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2009-02-14 16:16:40 UTC (rev 6499)
+++ trunk/lib/PageList.php 2009-02-14 16:39:01 UTC (rev 6500)
@@ -1417,12 +1417,6 @@
$table->pushContent(HTML::caption(array('align'=>'top'), $caption));
}
- //Warning: This is quite fragile. It depends solely on a private variable
- // in ->_addColumn()
- if (!empty($this->_columns_seen['checkbox'])) {
- $table->pushContent($this->_jsFlipAll());
- }
-
$row = HTML::tr();
$table_summary = array();
$i = 1; // start with 1!
@@ -1464,21 +1458,6 @@
}
}
- function _jsFlipAll() {
- return JavaScript("
-function flipAll(formObj) {
- var isFirstSet = -1;
- for (var i=0; i < formObj.length; i++) {
- fldObj = formObj.elements[i];
- if ((fldObj.type == 'checkbox') && (fldObj.name.substring(0,2) == 'p[')) {
- if (isFirstSet == -1)
- isFirstSet = (fldObj.checked) ? true : false;
- fldObj.checked = (isFirstSet) ? false : true;
- }
- }
-}");
- }
-
/* recursive stack for private sublist options (azhead, cols) */
function _saveOptions($opts) {
$stack = array('pages' => $this->_pages);
@@ -1682,7 +1661,7 @@
};
/* List pages with checkboxes to select from.
- * The [Select] button toggles via _jsFlipAll
+ * The [Select] button toggles via Javascript flipAll
*/
class PageList_Selectable
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2009-02-14 16:16:40 UTC (rev 6499)
+++ trunk/lib/WikiTheme.php 2009-02-14 16:39:01 UTC (rev 6500)
@@ -217,6 +217,7 @@
}
if ($noinit) return;
+ $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js"))));
$script_url = deduce_script_name();
if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
$script_url .= ("?start_debug=".$_GET['start_debug']);
Added: trunk/themes/default/wikicommon.js
===================================================================
--- trunk/themes/default/wikicommon.js (rev 0)
+++ trunk/themes/default/wikicommon.js 2009-02-14 16:39:01 UTC (rev 6500)
@@ -0,0 +1,14 @@
+// Common Javascript support functions.
+// $Id: toolbar.js 6204 2008-08-26 15:12:03Z vargenau $
+
+function flipAll(formObj) {
+ var isFirstSet = -1;
+ for (var i=0; i < formObj.length; i++) {
+ fldObj = formObj.elements[i];
+ if ((fldObj.type == 'checkbox') && (fldObj.name.substring(0,2) == 'p[')) {
+ if (isFirstSet == -1)
+ isFirstSet = (fldObj.checked) ? true : false;
+ fldObj.checked = (isFirstSet) ? false : true;
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-16 12:55:04
|
Revision: 6502
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6502&view=rev
Author: vargenau
Date: 2009-02-16 12:54:59 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
Sortable tables
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/themes/default/wikicommon.js
Added Paths:
-----------
trunk/themes/default/sortable.js
Property Changed:
----------------
trunk/themes/default/wikicommon.js
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2009-02-16 09:38:48 UTC (rev 6501)
+++ trunk/lib/WikiTheme.php 2009-02-16 12:54:59 UTC (rev 6502)
@@ -218,6 +218,7 @@
if ($noinit) return;
$this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js"))));
+ $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js"))));
$script_url = deduce_script_name();
if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
$script_url .= ("?start_debug=".$_GET['start_debug']);
Added: trunk/themes/default/sortable.js
===================================================================
--- trunk/themes/default/sortable.js (rev 0)
+++ trunk/themes/default/sortable.js 2009-02-16 12:54:59 UTC (rev 6502)
@@ -0,0 +1,325 @@
+/*
+Table sorting script by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
+Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
+Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
+
+Copyright (c) 1997-2007 Stuart Langridge, Joost de Valk.
+
+Version 1.5.7
+*/
+
+/* You can change these values */
+var image_path = "/images/";
+var image_up = "sort_up.gif";
+var image_down = "sort_down.gif";
+var image_none = "sort_none.gif";
+var europeandate = true;
+var alternate_row_colors = true;
+
+/* Don't change anything below this unless you know what you're doing */
+addEvent(window, "load", sortables_init);
+
+var SORT_COLUMN_INDEX;
+var thead = false;
+
+function sortables_init() {
+ // Find all tables with class sortable and make them sortable
+ if (!document.getElementsByTagName) return;
+ tbls = document.getElementsByTagName("table");
+ for (ti=0;ti<tbls.length;ti++) {
+ thisTbl = tbls[ti];
+ if (((' '+thisTbl.className+' ').indexOf("sortable") != -1) && (thisTbl.id)) {
+ ts_makeSortable(thisTbl);
+ }
+ }
+}
+
+function ts_makeSortable(t) {
+ if (t.rows && t.rows.length > 0) {
+ if (t.tHead && t.tHead.rows.length > 0) {
+ var firstRow = t.tHead.rows[t.tHead.rows.length-1];
+ thead = true;
+ } else {
+ var firstRow = t.rows[0];
+ }
+ }
+ if (!firstRow) return;
+
+ // We have a first row: assume it's the header, and make its contents clickable links
+ for (var i=0;i<firstRow.cells.length;i++) {
+ var cell = firstRow.cells[i];
+ var txt = ts_getInnerText(cell);
+ if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
+ cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this, '+i+');return false;">'+txt+'<span class="sortarrow"> <img src="'+ image_path + image_none + '" alt="↓"/></span></a>';
+ }
+ }
+ if (alternate_row_colors) {
+ alternate(t);
+ }
+}
+
+function ts_getInnerText(el) {
+ if (typeof el == "string") return el;
+ if (typeof el == "undefined") { return el };
+ if (el.innerText) return el.innerText; //Not needed but it is faster
+ var str = "";
+
+ var cs = el.childNodes;
+ var l = cs.length;
+ for (var i = 0; i < l; i++) {
+ switch (cs[i].nodeType) {
+ case 1: //ELEMENT_NODE
+ str += ts_getInnerText(cs[i]);
+ break;
+ case 3: //TEXT_NODE
+ str += cs[i].nodeValue;
+ break;
+ }
+ }
+ return str;
+}
+
+function ts_resortTable(lnk, clid) {
+ var span;
+ for (var ci=0;ci<lnk.childNodes.length;ci++) {
+ if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
+ }
+ var spantext = ts_getInnerText(span);
+ var td = lnk.parentNode;
+ var column = clid || td.cellIndex;
+ var t = getParent(td,'TABLE');
+ // Work out a type for the column
+ if (t.rows.length <= 1) return;
+ var itm = "";
+ var i = 0;
+ while (itm == "" && i < t.tBodies[0].rows.length) {
+ var itm = ts_getInnerText(t.tBodies[0].rows[i].cells[column]);
+ itm = trim(itm);
+ if (itm.substr(0,4) == "<!--" || itm.length == 0) {
+ itm = "";
+ }
+ i++;
+ }
+ if (itm == "") return;
+ sortfn = ts_sort_caseinsensitive;
+ if (itm.match(/^\d\d[\/\.-][a-zA-z][a-zA-Z][a-zA-Z][\/\.-]\d\d\d\d$/)) sortfn = ts_sort_date;
+ if (itm.match(/^\d\d[\/\.-]\d\d[\/\.-]\d\d\d{2}?$/)) sortfn = ts_sort_date;
+ if (itm.match(/^-?[\xA3$\x80ۢ\xB4]\d/)) sortfn = ts_sort_numeric;
+ // ape: added to provide numeric sort on size for the docs tools.
+ if (itm.match(/^\d+ *(B|KB|MB)$/)) sortfn = ts_sort_numeric;
+ if (itm.match(/^-?(\d+[,\.]?)+(E[-+][\d]+)?%?$/)) sortfn = ts_sort_numeric;
+ SORT_COLUMN_INDEX = column;
+ var firstRow = new Array();
+ var newRows = new Array();
+ for (k=0;k<t.tBodies.length;k++) {
+ for (i=0;i<t.tBodies[k].rows[0].length;i++) {
+ firstRow[i] = t.tBodies[k].rows[0][i];
+ }
+ }
+ for (k=0;k<t.tBodies.length;k++) {
+ if (!thead) {
+ // Skip the first row
+ for (j=1;j<t.tBodies[k].rows.length;j++) {
+ newRows[j-1] = t.tBodies[k].rows[j];
+ }
+ } else {
+ // Do NOT skip the first row
+ for (j=0;j<t.tBodies[k].rows.length;j++) {
+ newRows[j] = t.tBodies[k].rows[j];
+ }
+ }
+ }
+ newRows.sort(sortfn);
+ if (span.getAttribute("sortdir") == 'down') {
+ ARROW = ' <img src="'+ image_path + image_down + '" alt="↓"/>';
+ newRows.reverse();
+ span.setAttribute('sortdir','up');
+ } else {
+ ARROW = ' <img src="'+ image_path + image_up + '" alt="↑"/>';
+ span.setAttribute('sortdir','down');
+ }
+ // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
+ // don't do sortbottom rows
+ for (i=0; i<newRows.length; i++) {
+ if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) {
+ t.tBodies[0].appendChild(newRows[i]);
+ }
+ }
+ // do sortbottom rows only
+ for (i=0; i<newRows.length; i++) {
+ if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1))
+ t.tBodies[0].appendChild(newRows[i]);
+ }
+ // Delete any other arrows there may be showing
+ var allspans = document.getElementsByTagName("span");
+ for (var ci=0;ci<allspans.length;ci++) {
+ if (allspans[ci].className == 'sortarrow') {
+ if (getParent(allspans[ci],"table") == getParent(lnk,"table")) { // in the same table as us?
+ allspans[ci].innerHTML = ' <img src="'+ image_path + image_none + '" alt="↓"/>';
+ }
+ }
+ }
+ span.innerHTML = ARROW;
+ alternate(t);
+}
+
+function getParent(el, pTagName) {
+ if (el == null) {
+ return null;
+ } else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) {
+ return el;
+ } else {
+ return getParent(el.parentNode, pTagName);
+ }
+}
+
+function sort_date(date) {
+ // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
+ dt = "00000000";
+ if (date.length == 11) {
+ mtstr = date.substr(3,3);
+ mtstr = mtstr.toLowerCase();
+ switch(mtstr) {
+ case "jan": var mt = "01"; break;
+ case "feb": var mt = "02"; break;
+ case "mar": var mt = "03"; break;
+ case "apr": var mt = "04"; break;
+ case "may": var mt = "05"; break;
+ case "jun": var mt = "06"; break;
+ case "jul": var mt = "07"; break;
+ case "aug": var mt = "08"; break;
+ case "sep": var mt = "09"; break;
+ case "oct": var mt = "10"; break;
+ case "nov": var mt = "11"; break;
+ case "dec": var mt = "12"; break;
+ // default: var mt = "00";
+ }
+ dt = date.substr(7,4)+mt+date.substr(0,2);
+ return dt;
+ } else if (date.length == 10) {
+ if (europeandate == false) {
+ dt = date.substr(6,4)+date.substr(0,2)+date.substr(3,2);
+ return dt;
+ } else {
+ dt = date.substr(6,4)+date.substr(3,2)+date.substr(0,2);
+ return dt;
+ }
+ } else if (date.length == 8) {
+ yr = date.substr(6,2);
+ if (parseInt(yr) < 50) {
+ yr = '20'+yr;
+ } else {
+ yr = '19'+yr;
+ }
+ if (europeandate == true) {
+ dt = yr+date.substr(3,2)+date.substr(0,2);
+ return dt;
+ } else {
+ dt = yr+date.substr(0,2)+date.substr(3,2);
+ return dt;
+ }
+ }
+ return dt;
+}
+
+function ts_sort_date(a,b) {
+ dt1 = sort_date(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
+ dt2 = sort_date(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
+
+ if (dt1==dt2) {
+ return 0;
+ }
+ if (dt1<dt2) {
+ return -1;
+ }
+ return 1;
+}
+function ts_sort_numeric(a,b) {
+ var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+ aa = clean_num(aa);
+ var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+ bb = clean_num(bb);
+ return compare_numeric(aa,bb);
+}
+function compare_numeric(a,b) {
+ var a = parseFloat(a);
+ a = (isNaN(a) ? 0 : a);
+ var b = parseFloat(b);
+ b = (isNaN(b) ? 0 : b);
+ return a - b;
+}
+function ts_sort_caseinsensitive(a,b) {
+ aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
+ bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
+ if (aa==bb) {
+ return 0;
+ }
+ if (aa<bb) {
+ return -1;
+ }
+ return 1;
+}
+function ts_sort_default(a,b) {
+ aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+ bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+ if (aa==bb) {
+ return 0;
+ }
+ if (aa<bb) {
+ return -1;
+ }
+ return 1;
+}
+function addEvent(elm, evType, fn, useCapture)
+// addEvent and removeEvent
+// cross-browser event handling for IE5+, NS6 and Mozilla
+// By Scott Andrew
+{
+ if (elm.addEventListener){
+ elm.addEventListener(evType, fn, useCapture);
+ return true;
+ } else if (elm.attachEvent){
+ var r = elm.attachEvent("on"+evType, fn);
+ return r;
+ } else {
+ alert("Handler could not be removed");
+ }
+}
+function clean_num(str) {
+ str = str.replace(new RegExp(/[^-?0-9.]/g),"");
+ return str;
+}
+function trim(s) {
+ return s.replace(/^\s+|\s+$/g, "");
+}
+function alternate(table) {
+ // Take object table and get all it's tbodies.
+ var tableBodies = table.getElementsByTagName("tbody");
+ // Loop through these tbodies
+ for (var i = 0; i < tableBodies.length; i++) {
+ // Take the tbody, and get all it's rows
+ var tableRows = tableBodies[i].getElementsByTagName("tr");
+ // Loop through these rows
+ // Start at 1 because we want to leave the heading row untouched
+ for (var j = 0; j < tableRows.length; j++) {
+ // Check if j is even, and apply classes for both possible results
+ if ( (j % 2) == 0 ) {
+ if ( !(tableRows[j].className.indexOf('odd') == -1) ) {
+ tableRows[j].className = tableRows[j].className.replace('odd', 'even');
+ } else {
+ if ( tableRows[j].className.indexOf('even') == -1 ) {
+ tableRows[j].className += " even";
+ }
+ }
+ } else {
+ if ( !(tableRows[j].className.indexOf('even') == -1) ) {
+ tableRows[j].className = tableRows[j].className.replace('even', 'odd');
+ } else {
+ if ( tableRows[j].className.indexOf('odd') == -1 ) {
+ tableRows[j].className += " odd";
+ }
+ }
+ }
+ }
+ }
+}
Property changes on: trunk/themes/default/sortable.js
___________________________________________________________________
Added: svn:keywords
+ id
Modified: trunk/themes/default/wikicommon.js
===================================================================
--- trunk/themes/default/wikicommon.js 2009-02-16 09:38:48 UTC (rev 6501)
+++ trunk/themes/default/wikicommon.js 2009-02-16 12:54:59 UTC (rev 6502)
@@ -1,5 +1,5 @@
// Common Javascript support functions.
-// $Id: toolbar.js 6204 2008-08-26 15:12:03Z vargenau $
+// $Id$
function flipAll(formObj) {
var isFirstSet = -1;
Property changes on: trunk/themes/default/wikicommon.js
___________________________________________________________________
Added: svn:keywords
+ id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-20 16:20:30
|
Revision: 6521
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6521&view=rev
Author: vargenau
Date: 2009-02-20 16:20:24 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Allow multiple table of contents in a page
Modified Paths:
--------------
trunk/lib/plugin/CreateToc.php
trunk/themes/MonoBook/commonPrint.css
trunk/themes/MonoBook/main.css
trunk/themes/Sidebar/monobook.css
trunk/themes/default/wikicommon.js
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2009-02-20 14:36:19 UTC (rev 6520)
+++ trunk/lib/plugin/CreateToc.php 2009-02-20 16:20:24 UTC (rev 6521)
@@ -371,14 +371,15 @@
}
}
$content = $current->getContent();
- $html = HTML::div(array('class' => 'toc', 'id'=>'toc'));
+ $html = HTML::div(array('class' => 'toc', 'id'=> GenerateId("toc")));
if ($notoc) {
$html->setAttr('style','display:none;');
}
if (($position == "left") or ($position == "right")) {
$html->setAttr('style','float:'.$position.'; width:'.$width.';');
}
- $list = HTML::div(array('id'=>'toclist'));
+ $toclistid = GenerateId("toclist");
+ $list = HTML::div(array('id'=>$toclistid, 'class'=>toclist));
if (!strstr($headers,",")) {
$headers = array($headers);
} else {
@@ -415,33 +416,18 @@
$list->setAttr('style','display:'.($jshide?'none;':'block;'));
$open = DATA_PATH.'/'.$WikiTheme->_findFile("images/folderArrowOpen.png");
$close = DATA_PATH.'/'.$WikiTheme->_findFile("images/folderArrowClosed.png");
- $html->pushContent(Javascript("
-function toggletoc(a) {
- var toc=document.getElementById('toclist')
- //toctoggle=document.getElementById('toctoggle')
- var open='".$open."'
- var close='".$close."'
- if (toc.style.display=='none') {
- toc.style.display='block'
- a.title='"._("Click to hide the TOC")."'
- a.src = open
- } else {
- toc.style.display='none';
- a.title='"._("Click to display")."'
- a.src = close
- }
-}"));
if ($noheader) {
} else {
+ $toctoggleid = GenerateId("toctoggle");
if ($extracollapse)
$toclink = HTML(_("Table of Contents"),
" ",
HTML::a(array('name'=>'TOC')),
HTML::img(array(
- 'id'=>'toctoggle',
+ 'id'=>$toctoggleid,
'class'=>'wikiaction',
'title'=>_("Click to display to TOC"),
- 'onclick'=>"toggletoc(this)",
+ 'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')",
'border' => 0,
'alt' => 'toctoggle',
'src' => $jshide ? $close : $open )));
@@ -449,11 +435,11 @@
$toclink = HTML::a(array('name'=>'TOC',
'class'=>'wikiaction',
'title'=>_("Click to display"),
- 'onclick'=>"toggletoc(this)"),
+ 'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),
_("Table of Contents"),
HTML::span(array('style'=>'display:none',
- 'id'=>'toctoggle')," "));
- $html->pushContent(HTML::p(array('id'=>'toctitle'), $toclink));
+ 'id'=>$toctoggleid)," "));
+ $html->pushContent(HTML::p(array('class'=>'toctitle'), $toclink));
}
$html->pushContent($list);
if (count($headers) == 0) {
Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css 2009-02-20 14:36:19 UTC (rev 6520)
+++ trunk/themes/MonoBook/commonPrint.css 2009-02-20 16:20:24 UTC (rev 6521)
@@ -14,6 +14,7 @@
a.stub,
a.new{ color:#ba0000; text-decoration:none; }
+.toc,
#toc {
/*border:1px solid #2f6fab;*/
border:1px solid #aaaaaa;
Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css 2009-02-20 14:36:19 UTC (rev 6520)
+++ trunk/themes/MonoBook/main.css 2009-02-20 16:20:24 UTC (rev 6521)
@@ -350,6 +350,7 @@
clear: right;
}
#toc #toctitle,
+.toc .toctitle,
.toc #toctitle {
display: inline;
border: none;
@@ -357,6 +358,7 @@
font-size: 110%;
font-weight: bold;
}
+.toc .toclist,
.toc #toclist {
width: auto;
border: none;
Modified: trunk/themes/Sidebar/monobook.css
===================================================================
--- trunk/themes/Sidebar/monobook.css 2009-02-20 14:36:19 UTC (rev 6520)
+++ trunk/themes/Sidebar/monobook.css 2009-02-20 16:20:24 UTC (rev 6521)
@@ -372,6 +372,7 @@
font-size: 100%;
font-weight: bold;
}
+.toc .toclist,
.toc #toclist {
width: auto;
border: none;
Modified: trunk/themes/default/wikicommon.js
===================================================================
--- trunk/themes/default/wikicommon.js 2009-02-20 14:36:19 UTC (rev 6520)
+++ trunk/themes/default/wikicommon.js 2009-02-20 16:20:24 UTC (rev 6521)
@@ -12,3 +12,17 @@
}
}
}
+
+function toggletoc(a, open, close, toclist) {
+ var toc=document.getElementById(toclist)
+ if (toc.style.display=='none') {
+ toc.style.display='block'
+ a.title='"._("Click to hide the TOC")."'
+ a.src = open
+ } else {
+ toc.style.display='none';
+ a.title='"._("Click to display")."'
+ a.src = close
+ }
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X