From a8cfd381dbab9dfc28d6063922e06ad9e2d5089a Mon Sep 17 00:00:00 2001 From: vargenau Date: Sun, 7 Sep 2008 15:13:56 +0000 Subject: [PATCH] Renamed class Theme to WikiTheme to avoid Gforge name clash git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@6248 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- doc/THEMES | 12 +- lib/HtmlElement.php | 116 -------- lib/PageList.php | 300 +------------------ lib/{Theme.php => WikiTheme.php} | 396 +------------------------- lib/config.php | 204 +------------ lib/editpage.php | 271 ------------------ lib/loadsave.php | 362 +---------------------- lib/main.php | 2 +- lib/plugin/FrameInclude.php | 27 +- lib/plugin/ListPages.php | 2 +- lib/plugin/PageHistory.php | 58 +--- lib/plugin/PreferenceApp.php | 7 +- lib/plugin/RecentChanges.php | 243 +--------------- lib/plugin/UpLoad.php | 2 +- lib/plugin/UserPreferences.php | 151 +--------- lib/stdlib.php | 474 +------------------------------ pgsrc/ReleaseNotes | 3 +- themes/Crao/themeinfo.php | 6 +- themes/Hawaiian/themeinfo.php | 8 +- themes/MacOSX/themeinfo.php | 8 +- themes/MonoBook/themeinfo.php | 6 +- themes/Portland/themeinfo.php | 6 +- themes/Sidebar/themeinfo.php | 10 +- themes/SpaceWiki/themeinfo.php | 6 +- themes/Wordpress/themeinfo.php | 6 +- themes/blog/themeinfo.php | 10 +- themes/default/themeinfo.php | 4 +- themes/shamino_com/themeinfo.php | 6 +- themes/smaller/themeinfo.php | 6 +- themes/wikilens/themeinfo.php | 8 +- 30 files changed, 78 insertions(+), 2642 deletions(-) rename lib/{Theme.php => WikiTheme.php} (80%) diff --git a/doc/THEMES b/doc/THEMES index 66ab5bfff..26ef7b44e 100644 --- a/doc/THEMES +++ b/doc/THEMES @@ -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 @@ To create or modify one of the existing themes: 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 @@ Other file extensions are reserved for future use (i.e. .tpl for Smarty or 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 "" +WikiTheme templates are regular xhtml, but the php parts within "" are treated especially by phpwiki. HTML entities within the php parts should be created by our HtmlElement methods, which create well-formed HTML objects. diff --git a/lib/HtmlElement.php b/lib/HtmlElement.php index d159ff450..d6e887c1d 100644 --- a/lib/HtmlElement.php +++ b/lib/HtmlElement.php @@ -559,122 +559,6 @@ function IfJavaScript($if_content = false, $else_content = false) { 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 - - 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 - - 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 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 diff --git a/lib/PageList.php b/lib/PageList.php index 5fe4825f5..863b66565 100644 --- a/lib/PageList.php +++ b/lib/PageList.php @@ -334,12 +334,12 @@ class _PageList_Column_time extends _PageList_Column { 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 @@ extends PageList { } } -// $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 diff --git a/lib/Theme.php b/lib/WikiTheme.php similarity index 80% rename from lib/Theme.php rename to lib/WikiTheme.php index 48be87c75..36048e839 100644 --- a/lib/Theme.php +++ b/lib/WikiTheme.php @@ -188,21 +188,21 @@ function Button ($action, $label = false, $page_or_rev = false, $options = false return $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options); } -class Theme { +class WikiTheme { 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) { + function WikiTheme ($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); + $this->_default_theme = new WikiTheme('default',true); if ($noinit) return; $script_url = deduce_script_name(); @@ -495,7 +495,7 @@ class Theme { //////////////////////////////////////////////////////////////// //FIXME: PHP 4.1 Warnings - //lib/Theme.php:84: Notice[8]: The call_user_method() function is deprecated, + //lib/WikiTheme.php:84: Notice[8]: The call_user_method() function is deprecated, //use the call_user_func variety with the array(&$obj, "method") syntax instead function getFormatter ($type, $format) { @@ -1804,394 +1804,6 @@ function listAvailableLanguages() { return $available_languages; } -// $Log: not supported by cvs2svn $ -// Revision 1.146 2007/09/15 12:34:09 rurban -// allow object button text -// -// Revision 1.145 2007/09/12 19:37:26 rurban -// Add script_url to global js -// -// Revision 1.144 2007/08/25 18:31:12 rurban -// protect options, improve docs style -// -// Revision 1.143 2007/07/15 17:39:18 rurban -// No mozilla round and background for Image buttons -// -// Revision 1.142 2007/07/01 09:36:09 rurban -// themes are now easier derivable classes from other themes. -// removed global code setters, switched to $WikiTheme->load() in main -// -// Revision 1.141 2007/06/02 18:24:30 rurban -// Added accesskeys. Added js stylepath -// -// Revision 1.140 2007/03/10 18:27:20 rurban -// Patch 1677965 by Erwann Penet -// -// Revision 1.138 2007/01/07 18:43:37 rurban -// Remove fatals when no intermediate template was found. Deprecate subclasses of subthemes (blog of Sidebar). Warn about lost _MoreHeaders. $noinit: Do not initialize unnecessary items in default_theme fallback twice. Move over calendarInit from themes/Sidebar/themeinfo.php. -// -// Revision 1.137 2007/01/02 13:19:23 rurban -// add getobject2.js to acdropdown to calculate the sizes. add global xmlrpc_url for local xml requests (interface simplification). stabilize theme and language detection: require magic files there -// -// Revision 1.136 2006/12/06 22:07:31 rurban -// Add new Button argument to override any option. -// -// Revision 1.135 2006/04/17 17:28:21 rurban -// honor getWikiPageLinks change linkto=>relation -// -// Revision 1.134 2006/03/19 16:24:38 rurban -// fix syntax error with patch #1377650 -// -// Revision 1.133 2006/03/19 14:24:38 rurban -// sf.net patch #1377650 by Matt Brown: Always prefer legible author name over author_id property -// -// Revision 1.132 2005/07/24 09:51:22 rurban -// guard doubleClickEdit for unittests, add AcDropDown support -// -// Revision 1.131 2005/06/10 06:09:06 rurban -// enable getPref('doubleClickEdit') -// -// Revision 1.130 2005/05/06 16:43:35 rurban -// split long lines -// -// Revision 1.129 2005/05/05 08:57:26 rurban -// support action=revert -// -// Revision 1.128 2005/04/23 11:23:49 rurban -// improve semantics in the setAutosplitWikiWords method: switch to true if no args -// -// Revision 1.127 2005/02/11 14:45:44 rurban -// support ENABLE_LIVESEARCH, enable PDO sessions -// -// Revision 1.126 2005/02/04 11:43:18 rurban -// update comments -// -// Revision 1.125 2005/02/03 05:09:56 rurban -// livesearch.js support -// -// Revision 1.124 2005/01/27 16:28:15 rurban -// especially for Google: nofollow on unauthenticated edit,diff,create,pdf -// -// Revision 1.123 2005/01/25 07:03:02 rurban -// change addMoreAttr() to support named attr, to remove DoubleClickEdit for htmldumps -// -// Revision 1.122 2005/01/21 11:51:22 rurban -// changed (c) -// -// Revision 1.121 2005/01/20 10:14:37 rurban -// rel=nofollow on edit/create page links -// -// Revision 1.120 2004/12/20 13:20:23 rurban -// fix problem described in patch #1088131. SidebarBox may be used before lib/WikiPlugin.php -// is loaded. -// -// Revision 1.119 2004/12/14 21:38:12 rurban -// just aesthetics -// -// Revision 1.118 2004/12/13 14:34:46 rurban -// box parent method exists -// -// Revision 1.117 2004/11/30 17:44:54 rurban -// revisison neutral -// -// Revision 1.116 2004/11/21 11:59:16 rurban -// remove final \n to be ob_cache independent -// -// Revision 1.115 2004/11/17 17:24:02 rurban -// more verbose on fatal template not found -// -// Revision 1.114 2004/11/11 18:31:26 rurban -// add simple backtrace on such general failures to get at least an idea where -// -// Revision 1.113 2004/11/09 17:11:04 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.112 2004/11/03 16:50:31 rurban -// some new defaults and constants, renamed USE_DOUBLECLICKEDIT to ENABLE_DOUBLECLICKEDIT -// -// Revision 1.111 2004/10/21 20:20:53 rurban -// From patch #970004 "Double clic to edit" by pixels. -// -// Revision 1.110 2004/10/15 11:05:10 rurban -// fix yesterdays premature dumphtml fix for $default_text (thanks John Shen) -// -// Revision 1.109 2004/10/14 21:06:02 rurban -// fix dumphtml with USE_PATH_INFO (again). fix some PageList refs -// -// Revision 1.108 2004/09/26 12:24:02 rurban -// no anchor (PCRE memory), explicit ^ instead -// -// Revision 1.107 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.106 2004/06/20 14:42:54 rurban -// various php5 fixes (still broken at blockparser) -// -// Revision 1.105 2004/06/14 11:31:36 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.104 2004/06/11 09:07:30 rurban -// support theme-specific LinkIconAttr: front or after or none -// -// Revision 1.103 2004/06/07 22:44:14 rurban -// added simplified chown, setacl actions -// -// Revision 1.102 2004/06/07 18:59:28 rurban -// added Chown link to Owner in statusbar -// -// Revision 1.101 2004/06/03 12:59:40 rurban -// simplify translation -// NS4 wrap=virtual only -// -// Revision 1.100 2004/06/03 10:18:19 rurban -// fix FileUser locking issues, new config ENABLE_PAGEPERM -// -// Revision 1.99 2004/06/01 15:27:59 rurban -// AdminUser only ADMIN_USER not member of Administrators -// some RateIt improvements by dfrankow -// edit_toolbar buttons -// -// Revision 1.98 2004/05/27 17:49:05 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.97 2004/05/18 16:23:39 rurban -// rename split_pagename to SplitPagename -// -// Revision 1.96 2004/05/13 13:48:34 rurban -// doc update for the new 1.3.10 release -// -// Revision 1.94 2004/05/13 11:52:34 rurban -// search also default buttons -// -// Revision 1.93 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.92 2004/05/03 21:57:47 rurban -// locale updates: we previously lost some words because of wrong strings in -// PhotoAlbum, german rewording. -// fixed $_SESSION registering (lost session vars, esp. prefs) -// fixed ending slash in listAvailableLanguages/Themes -// -// Revision 1.91 2004/05/03 11:40:42 rurban -// put listAvailableLanguages() and listAvailableThemes() from SystemInfo and -// UserPreferences into Themes.php -// -// Revision 1.90 2004/05/02 19:12:14 rurban -// fix sf.net bug #945154 Konqueror alt css -// -// Revision 1.89 2004/04/29 21:25:45 rurban -// default theme navbar consistency: linkButtons instead of action buttons -// 3rd makeLinkButtin arg for action support -// -// Revision 1.88 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.87 2004/04/19 09:13:23 rurban -// new pref: googleLink -// -// Revision 1.86 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) -// -// Revision 1.85 2004/04/12 13:04:50 rurban -// added auth_create: self-registering Db users -// fixed IMAP auth -// removed rating recommendations -// ziplib reformatting -// -// Revision 1.84 2004/04/10 02:30:49 rurban -// Fixed gettext problem with VIRTUAL_PATH scripts (Windows only probably) -// Fixed "cannot setlocale..." (sf.net problem) -// -// Revision 1.83 2004/04/09 17:49:03 rurban -// Added PhpWiki RssFeed to Sidebar -// sidebar formatting -// some browser dependant fixes (old-browser support) -// -// Revision 1.82 2004/04/06 20:00:10 rurban -// Cleanup of special PageList column types -// Added support of plugin and theme specific Pagelist Types -// Added support for theme specific UserPreferences -// Added session support for ip-based throttling -// sql table schema change: ALTER TABLE session ADD sess_ip CHAR(15); -// Enhanced postgres schema -// Added DB_Session_dba support -// -// Revision 1.81 2004/04/01 15:57:10 rurban -// simplified Sidebar theme: table, not absolute css positioning -// added the new box methods. -// remaining problems: large left margin, how to override _autosplitWikiWords in Template only -// -// Revision 1.80 2004/03/30 02:14:03 rurban -// fixed yet another Prefs bug -// added generic PearDb_iter -// $request->appendValidators no so strict as before -// added some box plugin methods -// PageList commalist for condensed output -// -// Revision 1.79 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.78 2004/03/18 22:32:33 rurban -// work to make it php5 compatible -// -// Revision 1.77 2004/03/08 19:30:01 rurban -// fixed Theme->getButtonURL -// AllUsers uses now WikiGroup (also DB User and DB Pref users) -// PageList fix for empty pagenames -// -// Revision 1.76 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.75 2004/03/01 09:34:37 rurban -// fixed button path logic: now fallback to default also -// -// Revision 1.74 2004/02/28 21:14:08 rurban -// generally more PHPDOC docs -// see http://xarch.tu-graz.ac.at/home/rurban/phpwiki/xref/ -// fxied WikiUserNew pref handling: empty theme not stored, save only -// changed prefs, sql prefs improved, fixed password update, -// removed REPLACE sql (dangerous) -// moved gettext init after the locale was guessed -// + some minor changes -// -// Revision 1.73 2004/02/26 03:22:05 rurban -// also copy css and images with XHTML Dump -// -// Revision 1.72 2004/02/26 02:25:53 rurban -// fix empty and #-anchored links in XHTML Dumps -// -// Revision 1.71 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.70 2004/01/26 09:17:48 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.69 2003/12/05 01:32:28 carstenklapp -// New feature: Easier to run multiple wiks off of one set of code. Name -// your logo and signature image files "YourWikiNameLogo.png" and -// "YourWikiNameSignature.png" and put them all into -// themes/default/images. YourWikiName should match what is defined as -// WIKI_NAME in index.php. In case the image is not found, the default -// shipped with PhpWiki will be used. -// -// Revision 1.68 2003/03/04 01:53:30 dairiki -// Inconsequential decrufting. -// -// Revision 1.67 2003/02/26 03:40:22 dairiki -// New action=create. Essentially the same as action=edit, except that if the -// page already exists, it falls back to action=browse. -// -// This is for use in the "question mark" links for unknown wiki words -// to avoid problems and confusion when following links from stale pages. -// (If the "unknown page" has been created in the interim, the user probably -// wants to view the page before editing it.) -// -// Revision 1.66 2003/02/26 00:10:26 dairiki -// More/better/different checks for bad page names. -// -// Revision 1.65 2003/02/24 22:41:57 dairiki -// Fix stupid typo. -// -// Revision 1.64 2003/02/24 22:06:14 dairiki -// Attempts to fix auto-selection of printer CSS when printing. -// See new comments lib/Theme.php for more details. -// Also see SF patch #669563. -// -// Revision 1.63 2003/02/23 03:37:05 dairiki -// Stupid typo/bug fix. -// -// Revision 1.62 2003/02/21 04:14:52 dairiki -// New WikiLink type 'if_known'. This gives linkified name if page -// exists, otherwise, just plain text. -// -// Revision 1.61 2003/02/18 21:52:05 dairiki -// Fix so that one can still link to wiki pages with # in their names. -// (This was made difficult by the introduction of named tags, since -// '[Page #1]' is now a link to anchor '1' in page 'Page'. -// -// Now the ~ escape for page names should work: [Page ~#1]. -// -// Revision 1.60 2003/02/15 01:59:47 dairiki -// Theme::getCSS(): Add Default-Style HTTP(-eqiv) header in attempt -// to fix default stylesheet selection on some browsers. -// For details on the Default-Style header, see: -// http://home.dairiki.org/docs/html4/present/styles.html#h-14.3.2 -// -// Revision 1.59 2003/01/04 22:30:16 carstenklapp -// New: display a "Never edited." message instead of an invalid epoch date. -// - // (c-file-style: "gnu") // Local Variables: // mode: php diff --git a/lib/config.php b/lib/config.php index 118f816aa..851cef557 100644 --- a/lib/config.php +++ b/lib/config.php @@ -140,7 +140,7 @@ function guessing_lang ($languages=false) { $languages = array("en","de","es","fr","it","ja","zh","nl","sv"); // ignore possible "_" and codeset "ja.utf8" /* - require_once("lib/Theme.php"); + require_once("lib/WikiTheme.php"); $languages = listAvailableLanguages(); if (defined('DEFAULT_LANGUAGE') and in_array(DEFAULT_LANGUAGE, $languages)) { @@ -661,208 +661,6 @@ function htmlspecialchars_workaround($str, $quote=ENT_COMPAT, $charset='iso-8859 } */ -// $Log: not supported by cvs2svn $ -// Revision 1.147 2008/05/06 19:27:30 rurban -// comments only -// -// Revision 1.146 2007/09/12 19:39:46 rurban -// Ensure ending uploads slash even on user provided UPLOAD constants. Fixes plugin/UpLoad -// -// Revision 1.145 2007/06/02 18:24:39 rurban -// case-insensitive browser check. Imrpoved isBrowserSafari -// -// Revision 1.143 2007/05/24 18:36:56 rurban -// *** empty log message *** -// -// Revision 1.142 2007/03/04 14:07:17 rurban -// Added SearchHighlight comment -// -// Revision 1.141 2007/01/07 18:41:42 rurban -// Add array_diff_assoc() fallback: fixes Blog with php < 4.3.x. Support UPLOAD_FILE_PATH, UPLOAD_DATA_PATH overrides. -// -// Revision 1.140 2007/01/02 13:21:30 rurban -// added _DEBUG_REMOTE flag, omit want_content if not necessary -// -// Revision 1.139 2006/03/19 14:50:42 rurban -// sf.net patch #1438442 by Matt Brown: Unitialised variable reference in config.php -// -// Revision 1.138 2006/03/07 20:45:43 rurban -// wikihash for php-5.1 -// -// Revision 1.137 2005/08/06 14:31:10 rurban -// ensure absolute uploads path -// -// Revision 1.136 2005/05/06 16:49:24 rurban -// Safari comment -// -// Revision 1.135 2005/04/01 15:22:20 rurban -// Implement icase and regex options. -// Change checkbox case message from "Case-Sensitive" to "Case-Insensitive" -// -// Revision 1.134 2005/03/27 18:23:39 rurban -// compute locale only for setlocale and LC_ALL -// -// Revision 1.133 2005/02/08 13:26:59 rurban -// improve the locale splitter -// -// Revision 1.132 2005/02/07 15:39:02 rurban -// another locale fix -// -// Revision 1.131 2005/02/05 15:32:09 rurban -// force guessing_setlocale (again) -// -// Revision 1.130 2005/01/29 20:36:44 rurban -// very important php5 fix! clone objects -// -// Revision 1.129 2005/01/08 22:53:50 rurban -// hardcode list of langs (file access is slow) -// fix client detection -// set proper locale on empty locale -// -// Revision 1.128 2005/01/04 20:22:46 rurban -// guess $LANG based on client -// -// Revision 1.127 2004/12/26 17:15:32 rurban -// new reverse locale detection on DEFAULT_LANGUAGE="", ja default euc-jp again -// -// Revision 1.126 2004/12/20 16:05:00 rurban -// gettext msg unification -// -// Revision 1.125 2004/11/21 11:59:18 rurban -// remove final \n to be ob_cache independent -// -// Revision 1.124 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.123 2004/11/05 21:03:27 rurban -// new DEBUG flag: _DEBUG_LOGIN (64) -// verbose login debug-msg (settings and reason for failure) -// -// Revision 1.122 2004/10/14 17:49:58 rurban -// fix warning in safe_wordwrap -// -// Revision 1.121 2004/10/14 17:48:19 rurban -// typo in safe_wordwrap -// -// Revision 1.120 2004/09/22 13:46:26 rurban -// centralize upload paths. -// major WikiPluginCached feature enhancement: -// support _STATIC pages in uploads/ instead of dynamic getimg.php? subrequests. -// mainly for debugging, cache problems and action=pdf -// -// Revision 1.119 2004/09/16 07:50:37 rurban -// wordwrap() might crash between 4.1.2 and php-4.3.0RC2, fixed in 4.3.0 -// See http://bugs.php.net/bug.php?id=20927 and -// http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2002-1396 -// Improved version of wordwrap2() from the comments at http://www.php.net/wordwrap -// -// Revision 1.118 2004/07/13 14:03:31 rurban -// just some comments -// -// Revision 1.117 2004/06/21 17:29:17 rurban -// pear DB introduced a is_a requirement. so pear lost support for php < 4.2.0 -// -// Revision 1.116 2004/06/21 08:39:37 rurban -// pear/Cache update from Cache-1.5.4 (added db and trifile container) -// pear/DB update from DB-1.6.1 (mysql bugfixes, php5 compat, DB_PORTABILITY features) -// -// Revision 1.115 2004/06/20 14:42:54 rurban -// various php5 fixes (still broken at blockparser) -// -// Revision 1.114 2004/06/19 11:48:05 rurban -// moved version check forwards: already needed in XmlElement::_quote -// -// Revision 1.113 2004/06/03 12:59:41 rurban -// simplify translation -// NS4 wrap=virtual only -// -// Revision 1.112 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.111 2004/05/17 17:43:29 rurban -// CGI: no PATH_INFO fix -// -// Revision 1.110 2004/05/16 23:10:44 rurban -// update_locale wrongly resetted LANG, which broke japanese. -// japanese now correctly uses EUC_JP, not utf-8. -// more charset and lang headers to help the browser. -// -// Revision 1.109 2004/05/08 14:06:12 rurban -// new support for inlined image attributes: [image.jpg size=50x30 align=right] -// minor stability and portability fixes -// -// Revision 1.108 2004/05/08 11:25:16 rurban -// php-4.0.4 fixes -// -// Revision 1.107 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.106 2004/05/02 19:12:14 rurban -// fix sf.net bug #945154 Konqueror alt css -// -// Revision 1.105 2004/05/02 15:10:06 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.104 2004/05/01 11:26:37 rurban -// php-4.0.x support: array_key_exists (PHP 4 >= 4.1.0) -// -// Revision 1.103 2004/04/30 00:04:14 rurban -// zh (chinese language) support -// -// Revision 1.102 2004/04/29 23:25:12 rurban -// re-ordered locale init (as in 1.3.9) -// fixed loadfile with subpages, and merge/restore anyway -// (sf.net bug #844188) -// -// Revision 1.101 2004/04/26 13:22:32 rurban -// calculate bool old or dynamic constants later -// -// Revision 1.100 2004/04/26 12:15:01 rurban -// check default config values -// -// Revision 1.99 2004/04/21 14:04:24 zorloc -// 'Require lib/FileFinder.php' necessary to allow for call to FindLocalizedFile(). -// -// Revision 1.98 2004/04/20 18:10:28 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.97 2004/04/18 01:11:52 rurban -// more numeric pagename fixes. -// fixed action=upload with merge conflict warnings. -// charset changed from constant to global (dynamic utf-8 switching) -// - // For emacs users // Local Variables: // mode: php diff --git a/lib/editpage.php b/lib/editpage.php index ac117a1eb..8b1814eb7 100644 --- a/lib/editpage.php +++ b/lib/editpage.php @@ -911,277 +911,6 @@ extends PageEditor } } -/** - $Log: not supported by cvs2svn $ - Revision 1.114 2007/07/18 09:49:31 labbenes - Add a wysiwyg button in page editor form for newly created pages (revision = 0). The switch to wysiwyg will not keep the entered contents. - - Revision 1.113 2007/07/14 12:04:12 rurban - aesthetic request: remove ?action=edit after edit, add upload and diff - - Revision 1.112 2007/06/09 20:05:35 rurban - fix and optimize ENABLE_SPAMBLOCKLIST and ($newlinks > 5)) - - Revision 1.111 2007/06/03 17:12:00 rurban - convenience: only check above 5 external links for blocked domains - - Revision 1.110 2007/01/07 18:42:00 rurban - Print ModeratedPage message on edit. Use GOOGLE_LINKS_NOFOLLOW. Improve id: edit: to edit- - - Revision 1.109 2007/01/02 13:21:39 rurban - add two merge conflict buttons within loadfile: "Keep Old" and "Overwrite with new". enable edit toolbar there also. fix display of the Merge and Edit header. - - Revision 1.108 2006/12/22 17:47:34 rurban - Display Warnings only once. - Add button accesskeys - - Revision 1.107 2006/05/13 19:59:54 rurban - added wysiwyg_editor-1.3a feature by Jean-Nicolas GEREONE - converted wysiwyg_editor-1.3a js to WysiwygEdit framework - changed default ENABLE_WYSIWYG = true and added WYSIWYG_BACKEND = Wikiwyg - - Revision 1.106 2005/11/21 22:03:08 rurban - fix syntax error inside ENABLE_SPAMBLOCKLIST - - Revision 1.105 2005/11/21 20:53:59 rurban - beautify request pref lines, no antispam if admin (netznetz request), user is a member anyway - - Revision 1.104 2005/10/31 17:20:40 rurban - fix ConvertBefore - - Revision 1.103 2005/10/31 17:09:13 rurban - use better constant WYSIWYG_DEFAULT_PAGETYPE_HTML - - Revision 1.102 2005/10/31 16:47:14 rurban - enable wysiwyg html converters - - Revision 1.101 2005/10/30 16:12:28 rurban - simplify viewsource tokens - - Revision 1.100 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.99 2005/10/29 08:21:58 rurban - ENABLE_SPAMBLOCKLIST: - Check for links to blocked external tld domains in new edits, against - multi.surbl.org and bl.spamcop.net. - - Revision 1.98 2005/10/10 19:37:04 rurban - change USE_HTMLAREA to ENABLE WYSIWYG, add NUM_SPAM_LINKS=20 - - Revision 1.97 2005/09/26 06:32:22 rurban - [] is forbidden in id tags. Renamed to use : - - Revision 1.96 2005/05/06 17:54:22 rurban - silence Preview warnings for PAGE_LOCKED_MESSAGE, CONCURRENT_UPDATE_MESSAGE (thanks to schorni) - - Revision 1.95 2005/04/25 20:17:14 rurban - captcha feature by Benjamin Drieu. Patch #1110699 - - Revision 1.94 2005/02/28 20:23:31 rurban - fix error_stack - - Revision 1.93 2005/02/27 19:31:52 rurban - hack: display errorstack without sideeffects (save and restore) - - Revision 1.92 2005/01/29 20:37:21 rurban - no edit toolbar at all if ENABLE_EDITTOOLBAR = false - - Revision 1.91 2005/01/25 07:05:49 rurban - extract toolbar code, support new tags to get rid of php inside templates - - Revision 1.90 2005/01/22 12:46:15 rurban - fix oldmakrup button label - update pref[edit*] settings - - Revision 1.89 2005/01/21 14:07:49 rurban - reformatting - - Revision 1.88 2004/12/17 16:39:03 rurban - minor reformatting - - Revision 1.87 2004/12/16 18:28:05 rurban - keep wikiblog summary = page title - - Revision 1.86 2004/12/11 14:50:15 rurban - new edit_convert button, to get rid of old markup eventually - - Revision 1.85 2004/12/06 19:49:56 rurban - enable action=remove which is undoable and seeable in RecentChanges: ADODB ony for now. - renamed delete_page to purge_page. - enable action=edit&version=-1 to force creation of a new version. - added BABYCART_PATH config - fixed magiqc in adodb.inc.php - and some more docs - - Revision 1.84 2004/12/04 12:58:26 rurban - enable babycart Blog::SpamAssassin module on ENABLE_SPAMASSASSIN=true - (currently only for php >= 4.3.0) - - Revision 1.83 2004/12/04 11:55:39 rurban - First simple AntiSpam prevention: - No more than 20 new http:// links allowed - - Revision 1.82 2004/11/30 22:21:56 rurban - changed gif to optimized (pngout) png - - Revision 1.81 2004/11/29 17:57:27 rurban - translated pulldown buttons - - Revision 1.80 2004/11/25 17:20:51 rurban - and again a couple of more native db args: backlinks - - Revision 1.79 2004/11/21 11:59:20 rurban - remove final \n to be ob_cache independent - - Revision 1.78 2004/11/16 17:57:45 rurban - fix search&replace button - use new addTagButton machinery - new showPulldown for categories, TODO: in a seperate request - - Revision 1.77 2004/11/15 15:52:35 rurban - improve js stability - - Revision 1.76 2004/11/15 15:37:34 rurban - fix JS_SEARCHREPLACE - don't use document.write for replace, otherwise self.opener is not defined. - - Revision 1.75 2004/09/16 08:00:52 rurban - just some comments - - Revision 1.74 2004/07/03 07:36:28 rurban - do not get unneccessary content - - Revision 1.73 2004/06/16 21:23:44 rurban - fixed non-object fatal #215 - - Revision 1.72 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.71 2004/06/03 18:06:29 rurban - fix file locking issues (only needed on write) - fixed immediate LANG and THEME in-session updates if not stored in prefs - advanced editpage toolbars (search & replace broken) - - Revision 1.70 2004/06/02 20:47:47 rurban - dont use the wikiaction class - - Revision 1.69 2004/06/02 10:17:56 rurban - integrated search/replace into toolbar - added save+preview buttons - - Revision 1.68 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.6 2004/05/26 15:48:00 syilek - fixed problem with creating page with slashes from one true page - - Revision _1.5 2004/05/25 16:51:53 syilek - added ability to create a page from the category page and not have to edit it - - Revision 1.67 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.66 2004/04/29 23:25:12 rurban - re-ordered locale init (as in 1.3.9) - fixed loadfile with subpages, and merge/restore anyway - (sf.net bug #844188) - - Revision 1.65 2004/04/18 01:11:52 rurban - more numeric pagename fixes. - fixed action=upload with merge conflict warnings. - charset changed from constant to global (dynamic utf-8 switching) - - Revision 1.64 2004/04/06 19:48:56 rurban - temp workaround for action=edit AddComment form - - Revision 1.63 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.62 2004/03/17 18:41:05 rurban - initial_content and template support for CreatePage - - Revision 1.61 2004/03/12 20:59:17 rurban - important cookie fix by Konstantin Zadorozhny - new editpage feature: JS_SEARCHREPLACE - - Revision 1.60 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.59 2003/12/07 20:35:26 carstenklapp - Bugfix: Concurrent updates broken since after 1.3.4 release: Fatal - error: Call to undefined function: gettransformedcontent() in - /home/groups/p/ph/phpwiki/htdocs/phpwiki2/lib/editpage.php on line - 205. - - Revision 1.58 2003/03/10 18:25:22 dairiki - Bug/typo fix. If you use the edit page to un/lock a page, it - failed with: Fatal error: Call to a member function on a - non-object in editpage.php on line 136 - - Revision 1.57 2003/02/26 03:40:22 dairiki - New action=create. Essentially the same as action=edit, except that if the - page already exists, it falls back to action=browse. - - This is for use in the "question mark" links for unknown wiki words - to avoid problems and confusion when following links from stale pages. - (If the "unknown page" has been created in the interim, the user probably - wants to view the page before editing it.) - - Revision 1.56 2003/02/21 18:07:14 dairiki - Minor, nitpicky, currently inconsequential changes. - - Revision 1.55 2003/02/21 04:10:58 dairiki - Fixes for new cached markup. - Some minor code cleanups. - - Revision 1.54 2003/02/16 19:47:16 dairiki - Update WikiDB timestamp when editing or deleting pages. - - Revision 1.53 2003/02/15 23:20:27 dairiki - Redirect back to browse current version of page upon save, - even when no changes were made. - - Revision 1.52 2003/01/03 22:22:00 carstenklapp - Minor adjustments to diff block markers ("<<<<<<<"). Source reformatting. - - Revision 1.51 2003/01/03 02:43:26 carstenklapp - New class LoadFileConflictPageEditor, for merging / comparing a loaded - pgsrc file with an existing page. - - */ - // Local Variables: // mode: php // tab-width: 8 diff --git a/lib/loadsave.php b/lib/loadsave.php index fa122c93d..81b175073 100644 --- a/lib/loadsave.php +++ b/lib/loadsave.php @@ -112,7 +112,7 @@ function EndLoadDump(&$request) PrintXML(HTML::p(HTML::strong(_("Complete."))), HTML::p(fmt("Return to %s", $pagelink))); // Ugly hack to get valid XHTML code - if (isa($WikiTheme, 'Theme_gforge')) { + if (isa($WikiTheme, 'WikiTheme_gforge')) { echo "\n"; echo "\n"; echo "\n"; @@ -1564,366 +1564,6 @@ function LoadPostFile (&$request) EndLoadDump($request); } -/** - $Log: not supported by cvs2svn $ - Revision 1.159 2008/03/17 19:41:06 rurban - Windows quirks: Since dumps needs to be copied, we have to disallow "bla " dirs for all platforms. - - Revision 1.158 2008/02/14 18:36:52 rurban - use addSrcFile - - Revision 1.157 2007/09/19 18:01:27 rurban - better pageset detection: format= - - Revision 1.156 2007/09/15 12:32:50 rurban - Improve multi-page format handling: abstract _DumpHtmlToDir. get rid of non-external pdf, non-global VALID_LINKS - - Revision 1.155 2007/09/12 19:40:41 rurban - Copy locally uploaded images also - - Revision 1.154 2007/08/10 22:00:43 rurban - FilenameForPage: - We have to apply a different "/" logic for dumpserial, htmldump and - zipdump. dirs are allowed for zipdump and htmldump, not for dumpserial. - - Revision 1.153 2007/05/28 20:54:40 rurban - fix DumpToHtml creating dirs - - Revision 1.152 2007/05/01 16:22:41 rurban - lock InterWikiMap on init - - Revision 1.151 2007/02/17 14:17:34 rurban - only media=print css for htmldump and pdf - - Revision 1.150 2007/01/20 15:53:42 rurban - Use WikiPagename treatment for imported pagenames - - Revision 1.149 2007/01/03 21:25:10 rurban - Use convert_charset() - - Revision 1.148 2007/01/02 13:21:57 rurban - omit want_content if not necessary. support keep_old and overwrite buttons - - Revision 1.147 2006/12/22 17:44:15 rurban - support importing foreign charsets. e.g latin1 => utf8 - - Revision 1.146 2006/12/17 18:35:23 rurban - Create the right subdirectory name, urlencoded. - - Revision 1.145 2006/09/06 06:01:18 rurban - support loadfile multipart archives automatically - - Revision 1.144 2006/08/25 22:06:13 rurban - args fix to pass $args to the template - - Revision 1.143 2006/08/25 21:48:39 rurban - dumphtml subpages - - Revision 1.142 2006/03/19 17:16:32 rurban - remove remaining cruft - - Revision 1.141 2006/03/19 17:11:32 rurban - add verify to RevertPage, display reverted page as template - - Revision 1.140 2006/03/07 20:45:43 rurban - wikihash for php-5.1 - - Revision 1.139 2005/08/27 18:02:43 rurban - fix and expand pages - - Revision 1.138 2005/08/27 09:39:10 rurban - dumphtml when not at admin page: dump the current or given page - - Revision 1.137 2005/01/30 23:14:38 rurban - simplify page names - - Revision 1.136 2005/01/25 07:07:24 rurban - remove body tags in html dumps, add css and images to zipdumps, simplify printing - - Revision 1.135 2004/12/26 17:17:25 rurban - announce dumps - mult.requests to avoid request::finish, e.g. LinkDatabase, PdfOut, ... - - Revision 1.134 2004/12/20 16:05:01 rurban - gettext msg unification - - Revision 1.133 2004/12/08 12:57:41 rurban - page-specific timeouts for long multi-page requests - - Revision 1.132 2004/12/08 01:18:33 rurban - Disallow loading config*.ini files. Detected by Santtu Jarvi. - - Revision 1.131 2004/11/30 17:48:38 rurban - just comments - - Revision 1.130 2004/11/25 08:28:12 rurban - dont fatal on missing css or imgfiles and actually print the miss - - Revision 1.129 2004/11/25 08:11:40 rurban - pass exclude to the get_all_pages backend - - Revision 1.128 2004/11/16 16:16:44 rurban - enable Overwrite All for upgrade - - Revision 1.127 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.126 2004/10/16 15:13:39 rurban - new [Overwrite All] button - - Revision 1.125 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.124 2004/10/04 23:44:28 rurban - for older or CGI phps - - Revision 1.123 2004/09/25 16:26:54 rurban - deferr notifies (to be improved) - - Revision 1.122 2004/09/17 14:25:45 rurban - update comments - - Revision 1.121 2004/09/08 13:38:00 rurban - improve loadfile stability by using markup=2 as default for undefined markup-style. - use more refs for huge objects. - fix debug=static issue in WikiPluginCached - - Revision 1.120 2004/07/08 19:04:42 rurban - more unittest fixes (file backend, metadata RatingsDb) - - Revision 1.119 2004/07/08 15:23:59 rurban - less verbose for tests - - Revision 1.118 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.117 2004/07/02 09:55:58 rurban - more stability fixes: new DISABLE_GETIMAGESIZE if your php crashes when loading LinkIcons: failing getimagesize in old phps; blockparser stabilized - - Revision 1.116 2004/07/01 09:05:41 rurban - support pages and exclude arguments for all 4 dump methods - - Revision 1.115 2004/07/01 08:51:22 rurban - dumphtml: added exclude, print pagename before processing - - Revision 1.114 2004/06/28 12:51:41 rurban - improved dumphtml and virgin setup - - Revision 1.113 2004/06/27 10:26:02 rurban - oci8 patch by Philippe Vanhaesendonck + some ADODB notes+fixes - - Revision 1.112 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.111 2004/06/21 16:38:55 rurban - fixed the StartLoadDump html argument hack. - - Revision 1.110 2004/06/21 16:22:30 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.109 2004/06/17 11:31:05 rurban - jump back to label after dump/upgrade - - Revision 1.108 2004/06/16 12:43:01 rurban - 4.0.6 cannot use this errorhandler (not found) - - Revision 1.107 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.106 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.105 2004/06/08 19:48:16 rurban - fixed foreign setup: no ugly skipped msg for the GenericPages, load english actionpages if translated not found - - Revision 1.104 2004/06/08 13:51:57 rurban - some comments only - - Revision 1.103 2004/06/08 10:54:46 rurban - better acl dump representation, read back acl and owner - - Revision 1.102 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.101 2004/06/04 20:32:53 rurban - Several locale related improvements suggested by Pierrick Meignen - LDAP fix by John Cole - reenable admin check without ENABLE_PAGEPERM in the admin plugins - - Revision 1.100 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.99 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.98 2004/04/29 23:25:12 rurban - re-ordered locale init (as in 1.3.9) - fixed loadfile with subpages, and merge/restore anyway - (sf.net bug #844188) - - Revision 1.96 2004/04/19 23:13:03 zorloc - Connect the rest of PhpWiki to the IniConfig system. Also the keyword regular expression is not a config setting - - Revision 1.95 2004/04/18 01:11:52 rurban - more numeric pagename fixes. - fixed action=upload with merge conflict warnings. - charset changed from constant to global (dynamic utf-8 switching) - - Revision 1.94 2004/03/14 16:36:37 rurban - dont load backup files - - Revision 1.93 2004/02/26 03:22:05 rurban - also copy css and images with XHTML Dump - - Revision 1.92 2004/02/26 02:25:54 rurban - fix empty and #-anchored links in XHTML Dumps - - Revision 1.91 2004/02/24 17:19:37 rurban - debugging helpers only - - Revision 1.90 2004/02/24 17:09:24 rurban - fixed \r\r\n with dumping on windows - - Revision 1.88 2004/02/22 23:20:31 rurban - fixed DumpHtmlToDir, - enhanced sortby handling in PageList - new button_heading th style (enabled), - added sortby and limit support to the db backends and plugins - for paging support (<> links on long lists) - - Revision 1.87 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.86 2003/12/02 16:18:26 carstenklapp - Minor enhancement: Provide more meaningful filenames for WikiDB zip - dumps & snapshots. - - Revision 1.85 2003/11/30 18:18:13 carstenklapp - Minor code optimization: use include_once instead of require_once - inside functions that might not always called. - - Revision 1.84 2003/11/26 20:47:47 carstenklapp - Redo bugfix: My last refactoring broke merge-edit & overwrite - functionality again, should be fixed now. Sorry. - - Revision 1.83 2003/11/20 22:18:54 carstenklapp - New feature: h1 during merge-edit displays WikiLink to original page. - Internal changes: Replaced some hackish url-generation code in - function SavePage (for pgsrc merge-edit) with appropriate Button() - calls. - - Revision 1.82 2003/11/18 19:48:01 carstenklapp - Fixed missing gettext _() for button name. - - Revision 1.81 2003/11/18 18:28:35 carstenklapp - Bugfix: In the Load File function of PhpWikiAdministration: When doing - a "Merge Edit" or "Restore Anyway", page names containing accented - letters (such as locale/de/pgsrc/G%E4steBuch) would produce a file not - found error (Use FilenameForPage funtion to urlencode page names). - - Revision 1.80 2003/03/07 02:46:57 dairiki - Omit checks for safe_mode before set_time_limit(). Just prefix the - set_time_limit() calls with @ so that they fail silently if not - supported. - - Revision 1.79 2003/02/26 01:56:05 dairiki - Only zip pages with legal pagenames. - - Revision 1.78 2003/02/24 02:05:43 dairiki - Fix "n bytes written" message when dumping HTML. - - Revision 1.77 2003/02/21 04:12:05 dairiki - Minor fixes for new cached markup. - - Revision 1.76 2003/02/16 19:47:17 dairiki - Update WikiDB timestamp when editing or deleting pages. - - Revision 1.75 2003/02/15 03:04:30 dairiki - Fix for WikiUser constructor API change. - - Revision 1.74 2003/02/15 02:18:04 dairiki - When default language was English (at least), pgsrc was being - loaded twice. - - LimitedFileSet: Fix typo/bug. ($include was being ignored.) - - SetupWiki(): Fix bugs in loading of $GenericPages. - - Revision 1.73 2003/01/28 21:09:17 zorloc - The get_cfg_var() function should only be used when one is - interested in the value from php.ini or similar. Use ini_get() - instead to get the effective value of a configuration variable. - -- Martin Geisler - - Revision 1.72 2003/01/03 22:25:53 carstenklapp - Cosmetic fix to "Merge Edit" & "Overwrite" buttons. Added "The PhpWiki - programming team" as author when loading from pgsrc. Source - reformatting. - - Revision 1.71 2003/01/03 02:48:05 carstenklapp - function SavePage: Added loadfile options for overwriting or merge & - compare a loaded pgsrc file with an existing page. - - function LoadAny: Added a general error message when unable to load a - file instead of defaulting to "Bad file type". - - */ - // For emacs users // Local Variables: // mode: php diff --git a/lib/main.php b/lib/main.php index 2d10246a7..7006797f2 100644 --- a/lib/main.php +++ b/lib/main.php @@ -211,7 +211,7 @@ class WikiRequest extends Request { // Do not execute global init code anymore - // Theme callbacks + // WikiTheme callbacks if ($when == 'login') { $WikiTheme->CbUserLogin($this, $this->_user->_userid); if (!$this->_user->hasHomePage()) { // NewUser diff --git a/lib/plugin/FrameInclude.php b/lib/plugin/FrameInclude.php index 1e2ceea74..a2273a7a4 100644 --- a/lib/plugin/FrameInclude.php +++ b/lib/plugin/FrameInclude.php @@ -68,7 +68,7 @@ extends WikiPlugin 'title' => false, 'rows' => '18%,*,15%', // names: top, $name, bottom 'cols' => '20%,*', // names: left, $name - // only useful on Theme "Sidebar" + // only useful on WikiTheme "Sidebar" 'frameborder' => 1, 'marginwidth' => false, 'marginheight' => false, @@ -148,31 +148,6 @@ extends WikiPlugin } }; -// $Log: not supported by cvs2svn $ -// Revision 1.9 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.8 2003/02/26 22:32:06 dairiki -// Wups. Delete disused cruft. -// -// Revision 1.7 2003/02/26 22:27:19 dairiki -// Fix and refactor FrameInclude plugin (more or less). -// -// (This should now generate valid HTML. Woohoo!) -// -// The output when using the Sidebar theme is ugly enough that it should -// be considered broken. (But the Sidebar theme appears pretty broken in -// general right now.) -// -// (Personal comment (not to be taken personally): I must say that I -// remain unconvinced of the usefulness of this plugin.) -// -// Revision 1.6 2003/01/18 21:41:01 carstenklapp -// Code cleanup: -// Reformatting & tabs to spaces; -// Added copyleft, getVersion, getDescription, rcs_id. -// - // For emacs users // Local Variables: // mode: php diff --git a/lib/plugin/ListPages.php b/lib/plugin/ListPages.php index a2322f75d..ddc435593 100644 --- a/lib/plugin/ListPages.php +++ b/lib/plugin/ListPages.php @@ -69,7 +69,7 @@ extends WikiPlugin $args = $this->getArgs($argstr, $request); extract($args); // If the ratings table does not exist, or on dba it will break otherwise. - // Check if Theme isa 'wikilens' + // Check if WikiTheme isa 'wikilens' if ($info == 'pagename' and isa($GLOBALS['WikiTheme'], 'wikilens')) $info .= ",top3recs"; if ($info) diff --git a/lib/plugin/PageHistory.php b/lib/plugin/PageHistory.php index 4945ac4a6..7ef753a29 100644 --- a/lib/plugin/PageHistory.php +++ b/lib/plugin/PageHistory.php @@ -191,7 +191,7 @@ extends _RecentChanges_HtmlFormatter $minor_flag = ''; } $line = HTML::li(array('class' => $class)); - if (isa($WikiTheme,'Theme_MonoBook')) { + if (isa($WikiTheme,'WikiTheme_MonoBook')) { $line->pushContent( $this->diffLink($rev), ' ', $this->pageLink($rev), ' ', @@ -342,62 +342,6 @@ extends WikiPlugin_RecentChanges } }; -// $Log: not supported by cvs2svn $ -// Revision 1.33 2007/07/14 12:04:39 rurban -// fix rss button actions -// -// Revision 1.32 2007/06/02 18:24:47 rurban -// Added MonoBook style -// -// Revision 1.31 2007/05/13 18:13:34 rurban -// fix for recent RecentChanges upgrade: display all versions -// -// Revision 1.30 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.29 2004/05/18 16:23:40 rurban -// rename split_pagename to SplitPagename -// -// Revision 1.28 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.27 2003/02/27 22:48:44 dairiki -// Fixes invalid HTML generated by PageHistory plugin. -// -// (