From 09083eda6b19f58cdb87b627677b8732c1898ce6 Mon Sep 17 00:00:00 2001 From: rurban Date: Tue, 25 Jan 2005 06:58:23 +0000 Subject: [PATCH] reformatting git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4420 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/PageList.php | 15 +++++++++++---- lib/WikiDB.php | 19 +++++++++++++------ lib/WikiUserNew.php | 7 +++++-- lib/plugin/PluginManager.php | 11 ++++++++--- pgsrc/PhpWikiAdministration | 20 ++++++++++---------- 5 files changed, 47 insertions(+), 25 deletions(-) diff --git a/lib/PageList.php b/lib/PageList.php index 46b407d96..5a99da53c 100644 --- a/lib/PageList.php +++ b/lib/PageList.php @@ -1,4 +1,4 @@ - false, // current user by [] /* for the sort buttons in */ - 'sortby' => '', // same as for WikiDB::getAllPages (unsorted is faster) + 'sortby' => '', // same as for WikiDB::getAllPages + // (unsorted is faster) /* PageList pager options: * These options may also be given to _generate(List|Table) later @@ -804,14 +805,17 @@ class PageList { } // echo implode(":",explodeList("Test*",array("xx","Test1","Test2"))); - function explodePageList($input, $include_empty=false, $sortby=false, $limit=false, $exclude=false) { + function explodePageList($input, $include_empty=false, $sortby=false, + $limit=false, $exclude=false) + { if (empty($input)) return array(); // expand wildcards from list of all pages if (preg_match('/[\?\*]/', $input)) { $dbi = $GLOBALS['request']->getDbh(); // $dbi->titleSearch($input); //TODO: need an SQL optimization here - $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude); + $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, + $exclude); while ($pagehandle = $allPagehandles->next()) { $allPages[] = $pagehandle->getName(); } @@ -1442,6 +1446,9 @@ extends PageList { } // $Log: not supported by cvs2svn $ +// 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) // diff --git a/lib/WikiDB.php b/lib/WikiDB.php index 932973244..7ddc28877 100644 --- a/lib/WikiDB.php +++ b/lib/WikiDB.php @@ -1,5 +1,5 @@ setArg('paging', 'auto'); } } - $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, $exclude); - return new WikiDB_PageIterator($this, $result, array('include_empty' => $include_empty, - 'exclude' => $exclude, - 'limit' => $limit)); + $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, + $exclude); + return new WikiDB_PageIterator($this, $result, + array('include_empty' => $include_empty, + 'exclude' => $exclude, + 'limit' => $limit)); } /** @@ -2135,6 +2139,9 @@ function _sql_debuglog_shutdown_function() { } // $Log: not supported by cvs2svn $ +// Revision 1.122 2005/01/20 10:18:17 rurban +// reformatting +// // Revision 1.121 2005/01/04 20:25:01 rurban // remove old [%pagedata][_cached_html] code // diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php index 95d728853..0b437e629 100644 --- a/lib/WikiUserNew.php +++ b/lib/WikiUserNew.php @@ -1,5 +1,5 @@ {$value}) or $pref->{$value} != $pref->default_value) { if ($name == 'emailVerified') $newvalue = $value; else $newvalue = $pref->sanify($value); - $pref->set($name,$newvalue); + $pref->set($name, $newvalue); } $this->_prefs[$name] =& $pref; return true; @@ -2022,6 +2022,9 @@ extends UserPreferences */ // $Log: not supported by cvs2svn $ +// Revision 1.122 2005/01/08 22:51:56 rurban +// remove deprecated workaround +// // Revision 1.121 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. diff --git a/lib/plugin/PluginManager.php b/lib/plugin/PluginManager.php index ed45835b8..bd20568ad 100644 --- a/lib/plugin/PluginManager.php +++ b/lib/plugin/PluginManager.php @@ -1,5 +1,5 @@ "; // hackish @@ -203,6 +203,11 @@ extends WikiPlugin }; // $Log: not supported by cvs2svn $ +// Revision 1.16 2004/06/04 20:32:54 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.15 2004/05/25 13:17:12 rurban // fixed Fatal error: Call to a member function on a non-object in PluginManager.php on line 222 // diff --git a/pgsrc/PhpWikiAdministration b/pgsrc/PhpWikiAdministration index 48e066546..85b78615c 100644 --- a/pgsrc/PhpWikiAdministration +++ b/pgsrc/PhpWikiAdministration @@ -1,15 +1,15 @@ -Date: Fri, 10 Dec 2004 21:23:59 +0200 -Mime-Version: 1.0 (Produced by PhpWiki 1.3.11pre) -X-Rcs-Id: $Id: PhpWikiAdministration,v 1.38 2004-12-17 16:32:27 rurban Exp $ +Date: Mon, 17 Jan 2005 08:44:07 +0100 +Mime-Version: 1.0 (Produced by PhpWiki 1.3.11) +X-Rcs-Id: $Id: PhpWikiAdministration,v 1.39 2005-01-25 06:58:23 rurban Exp $ Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration; - pgsrc_version="2 $Revision: 1.38 $"; + pgsrc_version="2 $Revision: 1.39 $"; flags=PAGE_LOCKED; markup=2; charset=iso-8859-1 Content-Transfer-Encoding: binary -_*Note:*_ _Most of the actions on this page require administrative +_*Note:*_ _Most of the actions on this page require administrative privileges. They will not work unless you have set an admin username and password in the PhpWiki config file._ @@ -132,11 +132,11 @@ new phpwiki engine update: !!! Format of the files Currently the pages are stored, one per file, as MIME (RFC:2045) -e-mail (RFC:822) messages. The content-type ''application/x-phpwiki'' +e-mail (RFC:822) messages. The content-type _application/x-phpwiki_ is used, and page meta-data is encoded in the content-type parameters. (If the file contains several versions of a page, it will -have type ''multipart/mixed'', and contain several sub-parts, each -with type ''application/x-phpwiki''.) The message body contains the +have type _multipart/mixed_, and contain several sub-parts, each +with type _application/x-phpwiki_.) The message body contains the page text. !! Old Formats @@ -144,13 +144,13 @@ page text. *Serialized Files* The dump to directory command used to dump the pages as PHP - ''serialized()'' strings. For humans, this made the files very hard + _serialized()_ strings. For humans, this made the files very hard to read, and nearly impossible to edit. *Plain Files* Before that the page text was just dumped to a file--this means that - all page meta-data was lost. Note that when loading ''plain files'', + all page meta-data was lost. Note that when loading _plain files_, the page name is deduced from the file name. The upload and load functions will automatically recognize each of -- 2.45.0