From 5b55b4fd4cf710524c323dcfdacbcaba22966021 Mon Sep 17 00:00:00 2001 From: vargenau Date: Mon, 14 Jan 2013 19:12:26 +0000 Subject: [PATCH] seperate --> separate git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8713 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- TODO | 2 +- admin/wiki2public.php | 2 +- config/config-dist.ini | 10 +++++----- configurator.php | 8 ++++---- doc/README.phpwiki-auth | 6 +++--- lib/EditToolbar.php | 2 +- lib/InlineParser.php | 2 +- lib/PagePerm.php | 2 +- lib/WikiDB/backend.php | 2 +- lib/WikiDB/backend/dbaBase.php | Bin 33252 -> 33252 bytes lib/WikiDB/backend/dumb/LinkSearchIter.php | 2 +- lib/WikiPlugin.php | 2 +- lib/WikiTheme.php | 6 +++--- lib/WikiUser.php | 4 ++-- lib/WikiUserNew.php | 6 +++--- lib/XmlRpcServer.php | 2 +- lib/pear/Cache/Container/trifile.php | 4 ++-- lib/plugin/FrameInclude.php | 4 ++-- lib/plugin/RecentChanges.php | 2 +- lib/plugin/SemanticSearchAdvanced.php | 2 +- lib/plugin/SystemInfo.php | 2 +- lib/plugin/WikiAdminUtils.php | 4 ++-- lib/plugin/WikiBlog.php | 2 +- lib/upgrade.php | 4 ++-- locale/de/LC_MESSAGES/phpwiki.php | 2 +- locale/de/pgsrc/PhpWikiSystemverwalten | 2 +- locale/fr/LC_MESSAGES/phpwiki.php | 4 ++-- locale/po/de.po | 4 ++-- locale/po/es.po | 4 ++-- locale/po/fr.po | 4 ++-- locale/po/it.po | 4 ++-- locale/po/ja.po | 4 ++-- locale/po/nl.po | 4 ++-- locale/po/phpwiki.pot | 4 ++-- locale/po/sv.po | 4 ++-- locale/po/zh.po | 4 ++-- pgsrc/PhpWikiDebug | 2 +- pgsrc/ReleaseNotes | 2 +- schemas/mssql-initialize.sql | 2 +- schemas/mysql-initialize.sql | 2 +- schemas/sqlsrv-initialize.sql | 6 +++--- tests/makemakebuild.pl | 2 +- tests/unit/test.php | 2 +- themes/default/templates/editpage.tmpl | 2 +- 44 files changed, 73 insertions(+), 73 deletions(-) diff --git a/TODO b/TODO index 0692e2214..e23b3553b 100644 --- a/TODO +++ b/TODO @@ -32,7 +32,7 @@ architecture: 4 And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser. * Fix postgresql stored procedures. -* Move serialized data from page_data / version_data to seperate SQL columns. +* Move serialized data from page_data / version_data to separate SQL columns. * WikiDB hooks. (?) * Content expansion hooks in transformer. (SearchHighlight) * Convert RecentChanges to PageList as source for format options. diff --git a/admin/wiki2public.php b/admin/wiki2public.php index 7212ab047..c80e663ec 100644 --- a/admin/wiki2public.php +++ b/admin/wiki2public.php @@ -1,4 +1,4 @@ categoriesPulldown()); diff --git a/lib/InlineParser.php b/lib/InlineParser.php index 2dd11b337..a54c05b00 100644 --- a/lib/InlineParser.php +++ b/lib/InlineParser.php @@ -490,7 +490,7 @@ function LinkBracketLink($bracketlink) * [File:my_image.gif|what a pic] shows an inlined image linked to the page "what a pic" * * Note that for simplicity we will accept embedded object tags (non-images) - * here also, and seperate them later in LinkImage() + * here also, and separate them later in LinkImage() */ elseif (strstr($link, ':') and ($intermap = getInterwikiMap()) diff --git a/lib/PagePerm.php b/lib/PagePerm.php index e0c86f687..43053c856 100644 --- a/lib/PagePerm.php +++ b/lib/PagePerm.php @@ -437,7 +437,7 @@ class PagePermission or $member->isMember($creator)); } /* Or named groups or usernames. - Note: We don't seperate groups and users here. + Note: We don't separate groups and users here. Users overrides groups with the same name. */ return $user->UserName() === $group or diff --git a/lib/WikiDB/backend.php b/lib/WikiDB/backend.php index 1ca700102..bb1ca6c63 100644 --- a/lib/WikiDB/backend.php +++ b/lib/WikiDB/backend.php @@ -703,7 +703,7 @@ class WikiDB_backend * Iterator returned by backend methods which (possibly) return * multiple records. * - * FIXME: This might be two seperate classes: page_iter and version_iter. + * FIXME: This might be two separate classes: page_iter and version_iter. * For the versions we have WikiDB_backend_dumb_AllRevisionsIter. */ class WikiDB_backend_iterator diff --git a/lib/WikiDB/backend/dbaBase.php b/lib/WikiDB/backend/dbaBase.php index 2f94eca6c891a5f81c12e9049cfd61de6fea7a43..efa337f8a2a32ab7b0fbbc35ed186cd3fa79a456 100644 GIT binary patch delta 16 XcmaFT%=Dz0X@e3AW8!9ImV>nbID7^p delta 16 XcmaFT%=Dz0X@e3AW9nvQmV>nbIFtq_ diff --git a/lib/WikiDB/backend/dumb/LinkSearchIter.php b/lib/WikiDB/backend/dumb/LinkSearchIter.php index 55745fe55..9bff8ff55 100644 --- a/lib/WikiDB/backend/dumb/LinkSearchIter.php +++ b/lib/WikiDB/backend/dumb/LinkSearchIter.php @@ -121,7 +121,7 @@ class WikiDB_backend_dumb_LinkSearchIter foreach ($attribs as $attribute => $value) { if ($this->relation and !$this->relation->match($attribute)) continue; // The logical operator and unit unification (not yet) is encoded into - // a seperate search object. + // a separate search object. if (!$this->search->match($value)) continue; $links[] = array('pagename' => $pagename, 'linkname' => $attribute, diff --git a/lib/WikiPlugin.php b/lib/WikiPlugin.php index 95960d598..19106ae06 100644 --- a/lib/WikiPlugin.php +++ b/lib/WikiPlugin.php @@ -168,7 +168,7 @@ class WikiPlugin $gt_p = "_\\( $opt_ws $qq_p $opt_ws \\)"; $argspec_p = "($arg_p) $opt_ws ($op_p) $opt_ws (?: $qq_p|$q_p|$gt_p|($word_p))"; - // handle plugin-list arguments seperately + // handle plugin-list arguments separately $plugin_p = ''; while (preg_match("/^($arg_p) $opt_ws ($op_p) $opt_ws ($plugin_p) $opt_ws/x", $argstr, $m)) { @ list(, $arg, $op, $plugin_val) = $m; diff --git a/lib/WikiTheme.php b/lib/WikiTheme.php index 97b02ec4c..f379ea69c 100644 --- a/lib/WikiTheme.php +++ b/lib/WikiTheme.php @@ -1234,8 +1234,8 @@ class WikiTheme /** * Add a random header element to head - * TODO: first css, then js. Maybe seperate it into addJSHeaders/addCSSHeaders - * or use an optional type argument, and seperate it within _MoreHeaders[] + * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders + * or use an optional type argument, and separate it within _MoreHeaders[] */ //$GLOBALS['request']->_MoreHeaders = array(); function addMoreHeaders($element) @@ -1507,7 +1507,7 @@ else window.onload = downloadJSAtOnload;'); } // Immediate title search results via XMLHTML(HttpRequest) - // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js seperately. + // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js separately. // Google's or acdropdown is better. function initLiveSearch() { diff --git a/lib/WikiUser.php b/lib/WikiUser.php index ff17c7220..55b5d6b1d 100644 --- a/lib/WikiUser.php +++ b/lib/WikiUser.php @@ -220,7 +220,7 @@ class WikiUser } function PrintLoginForm(&$request, $args, $fail_message = false, - $seperate_page = true) + $separate_page = true) { include_once 'lib/Template.php'; // Call update_locale in case the system's default language is not 'en'. @@ -236,7 +236,7 @@ class WikiUser $login = new Template('login', $request, compact('pagename', 'userid', 'require_level', 'fail_message', 'pass_required')); - if ($seperate_page) { + if ($separate_page) { $request->discardOutput(); $page = $request->getPage($pagename); $revision = $page->getCurrentRevision(); diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php index 2f2de1c39..5c7eb3ca5 100644 --- a/lib/WikiUserNew.php +++ b/lib/WikiUserNew.php @@ -502,7 +502,7 @@ class _WikiUser //Fixme: for _HttpAuthPassUser function PrintLoginForm(&$request, $args, $fail_message = false, - $seperate_page = false) + $separate_page = false) { include_once 'lib/Template.php'; // Call update_locale in case the system's default language is not 'en'. @@ -521,8 +521,8 @@ class _WikiUser compact('pagename', 'userid', 'require_level', 'fail_message', 'pass_required', 'nocache')); // check if the html template was already processed - $seperate_page = $seperate_page ? true : !alreadyTemplateProcessed('html'); - if ($seperate_page) { + $separate_page = $separate_page ? true : !alreadyTemplateProcessed('html'); + if ($separate_page) { $page = $request->getPage($pagename); $revision = $page->getCurrentRevision(); return GeneratePage($login, _("Sign In"), $revision); diff --git a/lib/XmlRpcServer.php b/lib/XmlRpcServer.php index 822624e77..eb3a98c1b 100644 --- a/lib/XmlRpcServer.php +++ b/lib/XmlRpcServer.php @@ -936,7 +936,7 @@ function pingBack($params) * Construct the server instance, and set up the dispatch map, * which maps the XML-RPC methods on to the wiki functions. * Provide the "wiki." prefix to each function. Besides - * the blog - pingback, ... - functions with a seperate namespace. + * the blog - pingback, ... - functions with a separate namespace. */ class XmlRpcServer extends xmlrpc_server { diff --git a/lib/pear/Cache/Container/trifile.php b/lib/pear/Cache/Container/trifile.php index 592625035..c4b470070 100644 --- a/lib/pear/Cache/Container/trifile.php +++ b/lib/pear/Cache/Container/trifile.php @@ -25,7 +25,7 @@ require_once 'Cache/Container/file.php'; * Tri-file cache. * * This cache container stores files with no special encoding to reduce overhead. - * Expiration & user data are stored in seperate files, prefixed with a '.' and + * Expiration & user data are stored in separate files, prefixed with a '.' and * suffixed with '.exp' & '.dat' respectively. * * See http://atomized.org/PEAR/Cache_trifile.html for more information. @@ -157,4 +157,4 @@ class Cache_Container_trifile extends Cache_Container_file } } -?> \ No newline at end of file +?> diff --git a/lib/plugin/FrameInclude.php b/lib/plugin/FrameInclude.php index c95ebbacc..e8cf221d3 100644 --- a/lib/plugin/FrameInclude.php +++ b/lib/plugin/FrameInclude.php @@ -21,7 +21,7 @@ */ /** - * FrameInclude: Display a url or page in a seperate frame inside our body. + * FrameInclude: Display a url or page in a separate frame inside our body. * * Usage: * <> @@ -55,7 +55,7 @@ class WikiPlugin_FrameInclude function getDescription() { - return _("Display a url in a seperate frame inside our body. Only one frame allowed."); + return _("Display a url in a separate frame inside our body. Only one frame allowed."); } function getDefaultArguments() diff --git a/lib/plugin/RecentChanges.php b/lib/plugin/RecentChanges.php index 7ab7f6756..c33fd2b98 100644 --- a/lib/plugin/RecentChanges.php +++ b/lib/plugin/RecentChanges.php @@ -355,7 +355,7 @@ class _RecentChanges_HtmlFormatter $lmt = abs($limit); /** * Depending how this text is split up it can be tricky or - * impossible to translate with good grammar. So the seperate + * impossible to translate with good grammar. So the separate * strings for 1 day and %s days are necessary in this case * for translating to multiple languages, due to differing * overlapping ideal word cutting points. diff --git a/lib/plugin/SemanticSearchAdvanced.php b/lib/plugin/SemanticSearchAdvanced.php index 1c13955f5..2ce0f7d52 100644 --- a/lib/plugin/SemanticSearchAdvanced.php +++ b/lib/plugin/SemanticSearchAdvanced.php @@ -111,7 +111,7 @@ class WikiPlugin_SemanticSearchAdvanced 'autocomplete_list' => 'array:semsearch_relations' ), $args['s']); $submit = Button('submit:semsearch[relations]', _("Search"), false, - array('title' => 'Move to help page. No seperate window')); + array('title' => 'Move to help page. No separate window')); $instructions = _("Search in all specified pages for the expression."); $form = HTML::form(array('action' => $action, 'method' => 'post', diff --git a/lib/plugin/SystemInfo.php b/lib/plugin/SystemInfo.php index 50d9a7747..90b1f75aa 100644 --- a/lib/plugin/SystemInfo.php +++ b/lib/plugin/SystemInfo.php @@ -379,7 +379,7 @@ class WikiPlugin_SystemInfo // Size of databases/files/cvs are possible plus the known size of the app. // Cache this costly operation. // Even if the whole plugin call is stored internally, we cache this - // seperately with a seperate key. + // separately with a separate key. function discspace() { global $DBParams; diff --git a/lib/plugin/WikiAdminUtils.php b/lib/plugin/WikiAdminUtils.php index e6bbb8c1a..361e2303a 100644 --- a/lib/plugin/WikiAdminUtils.php +++ b/lib/plugin/WikiAdminUtils.php @@ -104,7 +104,7 @@ class WikiPlugin_WikiAdminUtils $message = call_user_func(array(&$this, $method), $request, $args); - // display as seperate page or as alert? + // display as separate page or as alert? $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']), $message, array(_("Back") => $args['return_url'])); @@ -231,7 +231,7 @@ class WikiPlugin_WikiAdminUtils return $dbh->_backend->rebuild($args); } - //TODO: We need a seperate plugin for this. + //TODO: We need a separate plugin for this. // Too many options. function _do_access_restrictions(&$request, &$args) { diff --git a/lib/plugin/WikiBlog.php b/lib/plugin/WikiBlog.php index ee6a8249d..92773cbe0 100644 --- a/lib/plugin/WikiBlog.php +++ b/lib/plugin/WikiBlog.php @@ -39,7 +39,7 @@ require_once 'lib/TextSearchQuery.php'; * * HINTS/COMMENTS: * - * To have the blog show up on a seperate page: + * To have the blog show up on a separate page: * On TopPage, use * <> * Create TopPage/Blog with this page as actionpage: diff --git a/lib/upgrade.php b/lib/upgrade.php index 6db95f0c5..ed10dddc7 100644 --- a/lib/upgrade.php +++ b/lib/upgrade.php @@ -806,7 +806,7 @@ CREATE TABLE $log_tbl ( /** * if page.cached_html does not exists: - * put _cached_html from pagedata into a new seperate blob, + * put _cached_html from pagedata into a new separate blob, * not into the huge serialized string. * * It is only rarelely needed: for current page only, if-not-modified, @@ -849,7 +849,7 @@ CREATE TABLE $log_tbl ( } /** - * move _cached_html for all pages from pagedata into a new seperate blob. + * move _cached_html for all pages from pagedata into a new separate blob. * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also. */ function _convert_cached_html() diff --git a/locale/de/LC_MESSAGES/phpwiki.php b/locale/de/LC_MESSAGES/phpwiki.php index 22010e8b2..46c04b329 100644 --- a/locale/de/LC_MESSAGES/phpwiki.php +++ b/locale/de/LC_MESSAGES/phpwiki.php @@ -339,7 +339,7 @@ $locale["Diffing pages"] = "Die Inhalts-Differenz-Seiten dieses Wikis"; $locale["Discussion"] = "Diskussion"; $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten."; $locale["Display a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen."; -$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; +$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; $locale["Display arbitrary SQL result tables."] = "Zeige Tabelle von SQL Abfragen an."; $locale["Display differences between revisions."] = "Zeilenweiser Vergleich der Versionen."; $locale["Don't cache this page."] = "Cache diese Seite nicht."; diff --git a/locale/de/pgsrc/PhpWikiSystemverwalten b/locale/de/pgsrc/PhpWikiSystemverwalten index 5de804600..05fda251a 100644 --- a/locale/de/pgsrc/PhpWikiSystemverwalten +++ b/locale/de/pgsrc/PhpWikiSystemverwalten @@ -223,7 +223,7 @@ might create one.... === Convert cached_html to new SQL column This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the - new page.cached_html field seperately, and now you want to move this data from + new page.cached_html field separately, and now you want to move this data from page.pagedata over to page.cached_html. <> diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index c1f2a9ea3..ae91a25de 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -460,7 +460,7 @@ Because of SQL changes you'd need to ?action=upgrade to update for SQL. Some external libraries are not (Pear_DB odbc, adodb oracle) * fixed sql statements for pagedata where it is not needed, fixing the typical ~PageList memory exhaustion on simple page lists. - cached_html is handled complete seperate now. + cached_html is handled complete separate now. * fixed and improved WikiDB pageid caching. * fixed some ~WikiGroup errors for WIKIPAGE and DB * fixed JS_SEARCHREPLACE diff --git a/schemas/mssql-initialize.sql b/schemas/mssql-initialize.sql index a8cda8a67..086a764fa 100644 --- a/schemas/mssql-initialize.sql +++ b/schemas/mssql-initialize.sql @@ -67,7 +67,7 @@ CREATE TABLE pref ( -- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT ''; -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users'; --- deprecated since 1.3.12. only useful for seperate databases. +-- deprecated since 1.3.12. only useful for separate databases. -- better use the extra pref table where such users can be created easily -- without password. -- CREATE TABLE user ( diff --git a/schemas/mysql-initialize.sql b/schemas/mysql-initialize.sql index ede9b6eb4..44ae869ba 100644 --- a/schemas/mysql-initialize.sql +++ b/schemas/mysql-initialize.sql @@ -82,7 +82,7 @@ CREATE TABLE pref ( -- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT ''; -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users'; --- deprecated since 1.3.12. only useful for seperate databases. +-- deprecated since 1.3.12. only useful for separate databases. -- better use the extra pref table where such users can be created easily -- without password. diff --git a/schemas/sqlsrv-initialize.sql b/schemas/sqlsrv-initialize.sql index 2874b0b4b..3708bea2c 100644 --- a/schemas/sqlsrv-initialize.sql +++ b/schemas/sqlsrv-initialize.sql @@ -1,6 +1,6 @@ -- UNTESTED! --- the CREATE FUNCTION section must be run as a seperate query. cut/paste run before executing the remainder +-- the CREATE FUNCTION section must be run as a separate query. cut/paste run before executing the remainder -- of the contents of this file CREATE FUNCTION hasContent (@ContentField varchar(max)) @@ -13,7 +13,7 @@ IF @ContentField NOT LIKE '' RETURN 0 END --- end seperate section +-- end separate section CREATE TABLE page ( @@ -85,7 +85,7 @@ CREATE TABLE pref ( -- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT ''; -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users'; --- deprecated since 1.3.12. only useful for seperate databases. +-- deprecated since 1.3.12. only useful for separate databases. -- better use the extra pref table where such users can be created easily -- without password. -- CREATE TABLE user ( diff --git a/tests/makemakebuild.pl b/tests/makemakebuild.pl index bd37c23c7..f8b3d45cb 100644 --- a/tests/makemakebuild.pl +++ b/tests/makemakebuild.pl @@ -16,7 +16,7 @@ # fix the url below for your server # run makemakebuild.pl, this creates Makefile (gnu make) and build.xml (ant) # run make, this compiles the classes and runs ant. -# if your classpath is wrong run ant seperately to test. +# if your classpath is wrong run ant separately to test. # run ant for each test. both ant and make can run independently. #my $my_wikiurl = 'http://reini/phpwiki/'; # this will replace steve's url below if defined diff --git a/tests/unit/test.php b/tests/unit/test.php index 6ce9fbef0..be616879d 100644 --- a/tests/unit/test.php +++ b/tests/unit/test.php @@ -98,7 +98,7 @@ if ((int)substr(phpversion(), 1) >= 5) //'PDO_oci', 'PDO_odbc' //TODO: convert cvs test -// For "cvs" see the seperate tests/unit_test_backend_cvs.php (cvs is experimental) +// For "cvs" see the separate tests/unit_test_backend_cvs.php (cvs is experimental) //TODO: read some database values from config.ini, just use the "test_" prefix // "flatfile" testing occurs in "tests/unit/.testbox/flatfile" // "dba" needs the DATABASE_DBA_HANDLER, also in the .textbox directory diff --git a/themes/default/templates/editpage.tmpl b/themes/default/templates/editpage.tmpl index 299aa7a69..bf9f52b7b 100644 --- a/themes/default/templates/editpage.tmpl +++ b/themes/default/templates/editpage.tmpl @@ -77,7 +77,7 @@ isAdmin()) { ?> -    +    -- 2.45.0